diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile index 0196463b756..e88947fb220 100644 --- a/x11/lesstif/Makefile +++ b/x11/lesstif/Makefile @@ -1,52 +1,48 @@ -# OpenBSD makefile for: lesstif -# Version required: 0.82 -# Date created: December 1, 1997 -# Whom: Angelos D. Keromytis +# New ports collection makefile for: lesstif +# Version required: 0.83 +# Date created: December 10, 1996 +# Whom: form@vs.itam.nsc.ru # -# $OpenBSD: Makefile,v 1.5 1998/02/13 15:13:29 niklas Exp $ +# $OpenBSD: Makefile,v 1.6 1998/05/06 06:05:05 form Exp $ +# FreeBSD: Makefile,v 1.17 1998/03/28 14:12:55 steve Exp # -DISTNAME= lesstif-0.82 +DISTNAME= lesstif-0.83 CATEGORIES= x11 -MASTER_SITES= ftp://ftp.lesstif.org/pub/hungry/lesstif/ \ - ftp://ftp.hungry.com/pub/hungry/lesstif/ +MASTER_SITES= ftp://ftp.lesstif.org/pub/hungry/lesstif/srcdist/ \ + ftp://ftp.hungry.com/pub/hungry/lesstif/srcdist/ -MAINTAINER= angelos@openbsd.org +MAINTAINER= form@vs.itam.nsc.ru # see below for shared lib version information MANUAL_PACKAGE_BUILD= do not want to install during interactive build GNU_CONFIGURE= yes +# comment this and remove the strip statement in post-install for debugging +CONFIGURE_ARGS= --disable-debug USE_X11= yes -# change this and remove the strip statement in post-install for debugging -CONFIGURE_ENV= ${SETENV} CCFLAGS="-O -pipe" -# static library on alpha -.ifdef (${MACHINE_ARCH} == "alpha") -CONFIGURE_ARGS= --with-static --without-shared -.endif .if defined(HAVE_MOTIF) IS_INTERACTIVE= yes pre-fetch: - @echo "***********************************************************" - @echo "* W a r n i n g *" - @echo "* This port will overwrite your Motif installation. *" - @echo "***********************************************************" - @echo -n "Is this ok? (y/n) ==> " + @${ECHO} "***********************************************************" + @${ECHO} "* W a r n i n g *" + @${ECHO} "* This port will overwrite your Motif installation. *" + @${ECHO} "***********************************************************" + @${ECHO} -n "Is this ok? (y/n) ==> " @(read ans; \ case x"$$ans" in \ xy*|xY*) \ return 0; \ ;; \ *) \ - echo "Okay, I won't install it then...."; \ - echo "(Don't worry about the following \"*** Error code 1\"s)"; \ + ${ECHO} "Okay, I won't install it then...."; \ + ${ECHO} "(Don't worry about the following \"*** Error code 1\"s)"; \ return 1; \ ;; \ esac) .endif - post-install: ${MKDIR} ${PREFIX}/lib/X11/mwm ${PREFIX}/lib/X11/app-defaults ${INSTALL_DATA} ${WRKSRC}/clients/Motif-1.2/mwm/system.mwmrc \ @@ -54,17 +50,15 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/clients/Motif-1.2/mwm/alt.map ${PREFIX}/lib/X11/mwm ${INSTALL_DATA} ${WRKSRC}/clients/Motif-1.2/mwm/Mwm \ ${PREFIX}/lib/X11/app-defaults/Mwm -.if (${MACHINE_ARCH} != "alpha") - /usr/bin/strip ${PREFIX}/lib/libXm.so.0.1 ${PREFIX}/lib/libMrm.so.0.1 -.endif + /usr/bin/strip ${PREFIX}/lib/libXm.so.1.2 ${PREFIX}/lib/libMrm.so.1.2 ${LDCONFIG} -m ${PREFIX}/lib .include - # Shared lib versions # dist version BSD shared lib version # ------------ ---------------------- # 0.78 0.0 # 0.79 0.1 # 0.80 0.1 +# 0.83 1.2 diff --git a/x11/lesstif/files/md5 b/x11/lesstif/files/md5 index 86cbceef168..8b09af399f5 100644 --- a/x11/lesstif/files/md5 +++ b/x11/lesstif/files/md5 @@ -1 +1 @@ -MD5 (lesstif-0.82.tar.gz) = c612c843030c622fea626a73de340dd0 +MD5 (lesstif-0.83.tar.gz) = e82ef9e2592aecd201546fa000ef9a75 diff --git a/x11/lesstif/patches/patch-ab b/x11/lesstif/patches/patch-ab index e6db65f5f22..229ab4d5ead 100644 --- a/x11/lesstif/patches/patch-ab +++ b/x11/lesstif/patches/patch-ab @@ -1,15 +1,11 @@ ---- lib/config/Makefile.in.orig Mon Apr 28 19:29:10 1997 -+++ lib/config/Makefile.in Fri May 23 01:24:36 1997 -@@ -47,10 +47,10 @@ - install: $(STUFF) - -mkdir -p ${x_config_path} - for i in ${STUFF} ; do \ -- ${INSTALL_PROGRAM} $$i ${x_config_path} ; \ -+ ${BSD_INSTALL_DATA} $$i ${x_config_path} ; \ - done - -mkdir -p ${bin_dir} -- ${INSTALL_PROGRAM} mxmkmf ${bin_dir} -+ ${BSD_INSTALL_SCRIPT} mxmkmf ${bin_dir} +--- lib/config/Makefile.in.orig Sat Mar 14 16:49:51 1998 ++++ lib/config/Makefile.in Tue Mar 17 10:32:07 1998 +@@ -97,7 +97,7 @@ + MAINTAINERCLEANFILES=Makefile.in + bin_SCRIPTS= mxmkmf - clean: - rm -f Imake.tmpl Motif.rules Motif.tmpl mxmkmf +-configdir= $(libdir)/X11/config ++configdir= $(libdir)/X11/lesstif + config_DATA= Imake.tmpl Motif.rules Motif.tmpl + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../include/LTconfig.h diff --git a/x11/lesstif/patches/patch-af b/x11/lesstif/patches/patch-af new file mode 100644 index 00000000000..c75fb25784b --- /dev/null +++ b/x11/lesstif/patches/patch-af @@ -0,0 +1,11 @@ +--- Makefile.in.orig Tue Mar 17 11:30:44 1998 ++++ Makefile.in Tue Mar 17 11:30:29 1998 +@@ -103,7 +103,7 @@ + # Lets put the informational stuff in a sub directory to avoid + # poluting /usr/local for default installs. + # +-rootdir= $(exec_prefix)/LessTif ++rootdir= $(datadir)/doc/LessTif + root_DATA= AUTHORS BUG-REPORTING COPYING COPYING.LIB CREDITS \ + INSTALL KNOWN_BUGS NEWS README RELEASE-POLICY TODO + diff --git a/x11/lesstif/patches/patch-ag b/x11/lesstif/patches/patch-ag new file mode 100644 index 00000000000..56462238e1f --- /dev/null +++ b/x11/lesstif/patches/patch-ag @@ -0,0 +1,11 @@ +--- doc/www.lesstif.org/images/Makefile.in.orig Sat Mar 14 16:50:02 1998 ++++ doc/www.lesstif.org/images/Makefile.in Tue Mar 17 11:36:05 1998 +@@ -102,7 +102,7 @@ + # Lets put the informational stuff in a sub directory to avoid + # poluting /usr/local for default installs. + # +-rootdir= $(exec_prefix)/LessTif/doc/images ++rootdir= $(datadir)/doc/LessTif/doc/images + root_DATA= hungry.gif \ + lesstif-realsmall.gif lesstif-small.gif lesstif.gif \ + ltsunlogo.gif diff --git a/x11/lesstif/patches/patch-ah b/x11/lesstif/patches/patch-ah new file mode 100644 index 00000000000..ae28643f8bf --- /dev/null +++ b/x11/lesstif/patches/patch-ah @@ -0,0 +1,11 @@ +--- doc/Makefile.in.orig Sat Mar 14 16:50:01 1998 ++++ doc/Makefile.in Tue Mar 17 11:35:12 1998 +@@ -98,7 +98,7 @@ + + SUBDIRS = www.lesstif.org lessdox + +-rootdir= $(exec_prefix)/LessTif/doc ++rootdir= $(datadir)/doc/LessTif/doc + root_DATA= INSTALL.html + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../include/LTconfig.h diff --git a/x11/lesstif/patches/patch-ai b/x11/lesstif/patches/patch-ai new file mode 100644 index 00000000000..b296b3d5d74 --- /dev/null +++ b/x11/lesstif/patches/patch-ai @@ -0,0 +1,26 @@ +--- doc/lessdox/clients/Makefile.in.orig Sat Mar 14 16:50:03 1998 ++++ doc/lessdox/clients/Makefile.in Tue Mar 17 11:35:53 1998 +@@ -96,10 +96,10 @@ + MAINTAINERCLEANFILES=Makefile.in + SUFFIXES= .1 .3 .5 .html + +-mandir= $(exec_prefix)/LessTif/doc/man +-man1dir= $(exec_prefix)/LessTif/doc/man/man1 +-man3dir= $(exec_prefix)/LessTif/doc/man/man3 +-man5dir= $(exec_prefix)/LessTif/doc/man/man5 ++mandir= $(datadir)/doc/LessTif/doc/man ++man1dir= $(datadir)/doc/LessTif/doc/man/man1 ++man3dir= $(datadir)/doc/LessTif/doc/man/man3 ++man5dir= $(datadir)/doc/LessTif/doc/man/man5 + + man1_DATA= mwm.1 + man3_DATA= +@@ -114,7 +114,7 @@ + # build them. + # + +-htmldir= $(exec_prefix)/LessTif/doc/html ++htmldir= $(datadir)/doc/LessTif/doc/html + html_DATA= mwm.html mwmrc.html xmbind.html + + @HaveMan2html_TRUE@man1_HTML= ${man1_DATA:.1=.html} diff --git a/x11/lesstif/patches/patch-aj b/x11/lesstif/patches/patch-aj new file mode 100644 index 00000000000..d6bf0079224 --- /dev/null +++ b/x11/lesstif/patches/patch-aj @@ -0,0 +1,11 @@ +--- doc/www.lesstif.org/Makefile.in.orig Sat Mar 14 16:50:02 1998 ++++ doc/www.lesstif.org/Makefile.in Tue Mar 17 11:35:59 1998 +@@ -103,7 +103,7 @@ + # Lets put the informational stuff in a sub directory to avoid + # poluting /usr/local for default installs. + # +-rootdir= $(exec_prefix)/LessTif/doc ++rootdir= $(datadir)/doc/LessTif/doc + root_DATA= COPYING.LIB.html FAQ.html agenda.html bug-reporting.html \ + core.html current.html download.html get.html \ + lesstif.html links.html mailing-lists.html \ diff --git a/x11/lesstif/pkg/PLIST b/x11/lesstif/pkg/PLIST index cc186f59d54..d6706327c54 100644 --- a/x11/lesstif/pkg/PLIST +++ b/x11/lesstif/pkg/PLIST @@ -126,16 +126,63 @@ include/Xm/XmP.h include/Xm/XmStrDefs.h include/Xm/XmosP.h lib/X11/app-defaults/Mwm +lib/X11/lesstif/Imake.tmpl +lib/X11/lesstif/Motif.rules +lib/X11/lesstif/Motif.tmpl +lib/X11/mwm/README lib/X11/mwm/alt.map lib/X11/mwm/system.mwmrc -lib/config/Imake.tmpl -lib/config/Motif.rules -lib/config/Motif.tmpl -lib/libMrm.so.0.1 -lib/libXm.so.0.1 -lib/libltc.a +lib/libMrm.la +lib/libMrm.so.1.2 +lib/libXm.la +lib/libXm.so.1.2 @exec /sbin/ldconfig -m %D/lib +share/doc/LessTif/AUTHORS +share/doc/LessTif/BUG-REPORTING +share/doc/LessTif/COPYING +share/doc/LessTif/COPYING.LIB +share/doc/LessTif/CREDITS +share/doc/LessTif/INSTALL +share/doc/LessTif/KNOWN_BUGS +share/doc/LessTif/NEWS +share/doc/LessTif/README +share/doc/LessTif/RELEASE-POLICY +share/doc/LessTif/TODO +share/doc/LessTif/doc/COPYING.LIB.html +share/doc/LessTif/doc/FAQ.html +share/doc/LessTif/doc/INSTALL.html +share/doc/LessTif/doc/agenda.html +share/doc/LessTif/doc/bug-reporting.html +share/doc/LessTif/doc/core.html +share/doc/LessTif/doc/current.html +share/doc/LessTif/doc/download.html +share/doc/LessTif/doc/get.html +share/doc/LessTif/doc/html/mwm.html +share/doc/LessTif/doc/html/mwmrc.html +share/doc/LessTif/doc/html/xmbind.html +share/doc/LessTif/doc/images/hungry.gif +share/doc/LessTif/doc/images/lesstif-realsmall.gif +share/doc/LessTif/doc/images/lesstif-small.gif +share/doc/LessTif/doc/images/lesstif.gif +share/doc/LessTif/doc/images/ltsunlogo.gif +share/doc/LessTif/doc/lesstif.html +share/doc/LessTif/doc/links.html +share/doc/LessTif/doc/mailing-lists.html +share/doc/LessTif/doc/man/man1/mwm.1 +share/doc/LessTif/doc/man/man5/mwmrc.5 +share/doc/LessTif/doc/platforms.html +share/doc/LessTif/doc/release-policy.html +share/doc/LessTif/doc/versions.html +share/doc/LessTif/doc/working.html @dirrm lib/X11/mwm -@dirrm lib/config +@dirrm lib/X11/lesstif @dirrm include/Xm @dirrm include/Mrm +@dirrm share/doc/LessTif/doc/man/man5 +@dirrm share/doc/LessTif/doc/man/man3 +@dirrm share/doc/LessTif/doc/man/man1 +@dirrm share/doc/LessTif/doc/man +@dirrm share/doc/LessTif/doc/images +@dirrm share/doc/LessTif/doc/html +@dirrm share/doc/LessTif/doc +@dirrm share/doc/LessTif