diff options
| author | drochner <drochner> | 2002-12-05 18:49:55 +0000 |
|---|---|---|
| committer | drochner <drochner> | 2002-12-05 18:49:55 +0000 |
| commit | 011ac2e48c0ece3316fcde43cf04557f05cf5e67 (patch) | |
| tree | 81a679b6c41526f9be69b0e98e7605c8b3c1fd26 /x11 | |
| parent | 56e937e61e075cd0063ff0cf0de27b2f163613fe (diff) | |
| download | pkgsrc-011ac2e48c0ece3316fcde43cf04557f05cf5e67.tar.gz | |
Untangle this from the x11/lesstif pkg.
This is, just move the bits which were pulled in from there here,
unchanged.
Diffstat (limited to 'x11')
43 files changed, 1361 insertions, 2 deletions
diff --git a/x11/lesstif12/Makefile b/x11/lesstif12/Makefile index ccee4a8ab66..437d1d82222 100644 --- a/x11/lesstif12/Makefile +++ b/x11/lesstif12/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2002/08/25 18:40:39 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2002/12/05 18:49:55 drochner Exp $ PKGNAME= lesstif12-${LESSTIF_VERSION} COMMENT= API compatible clone of the OSF/Motif toolkit, version 1.2 @@ -9,7 +9,7 @@ CONFLICTS+= lesstif-0.91 lesstif-0.91.[0-3] USE_BUILDLINK2= # defined -.include "../lesstif/Makefile.common" +.include "./Makefile.common" CONFIGURE_ARGS+= --enable-build-12 CONFIGURE_ARGS+= --disable-build-20 diff --git a/x11/lesstif12/Makefile.common b/x11/lesstif12/Makefile.common new file mode 100644 index 00000000000..5a052291749 --- /dev/null +++ b/x11/lesstif12/Makefile.common @@ -0,0 +1,68 @@ +# $NetBSD: Makefile.common,v 1.1 2002/12/05 18:49:56 drochner Exp $ + +DISTNAME= lesstif-${LESSTIF_VERSION} +LESSTIF_VERSION= 0.93.0 +CATEGORIES= x11 +MASTER_SITES= ftp://ftp.hungry.com/pub/hungry/lesstif/srcdist/ \ + ftp://ftp.unicamp.br/pub/X11/lesstif/srcdist/ \ + ftp://ftp.kddlabs.co.jp/X11/lesstif/srcdist/ \ + ftp://linux.mathematik.tu-darmstadt.de/pub/linux/mirrors/misc/lesstif/srcdist/ \ + http://gd.tuwien.ac.at/hci/lesstif/srcdist/ \ + http://www.damtp.cam.ac.uk/mirror/ftp.hungry.com/pub/hungry/lesstif/srcdist/ + +MAINTAINER= jlam@netbsd.org +HOMEPAGE= http://www.lesstif.org/ + +USE_X11BASE= # defined +USE_GMAKE= # defined +USE_LIBTOOL= # defined +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +LIBTOOL_OVERRIDE+= ${WRKSRC}/test/libtool +AUTOMAKE_REQD= 1.4 + +GNU_CONFIGURE= # defined +CONFIGURE_ARGS+= --enable-production --disable-debug --disable-verbose +CONFIGURE_ARGS+= --enable-editres --enable-xdnd + +# The following forces the build process to use sed as the HTML-to-text +# converter. +# +CONFIGURE_ENV+= LYNX_CMD=${WRKDIR}/nonexecutable +CONFIGURE_ENV+= LINKS_CMD=${WRKDIR}/nonexecutable + +post-extract: + cd ${WRKSRC}/lib/config; ${MV} -f host.def LessTif.def + +# Change references to {Core,Object,Shell}.3 to X{Core,Object,Shell}.3 to +# avoid manpage conflicts with other packages. +# +post-patch: + cd ${WRKSRC}/doc/lessdox/widgets; \ + for name in Core Object Shell; do \ + ${MV} -f $${name}.3 X$${name}.3; \ + files=`${GREP} -l "[[:blank:]]$${name} (3)" *.3`; \ + for file in $${files}; do \ + ${MV} -f $${file} $${file}.presubst; \ + ${SED} -e "s|\([[:blank:]]\)$${name} (3)|\1X$${name} (3)|g" \ + $${file}.presubst > $${file}; \ + ${RM} -f $${file}.presubst; \ + done; \ + ${MV} -f Makefile.am Makefile.am.presubst; \ + ${SED} -e "s|\([[:space:]]\)$${name}.3|\1X$${name}.3|g" \ + Makefile.am.presubst > Makefile.am; \ + ${RM} -f Makefile.am.presubst; \ + done + +pre-configure: + ${TOUCH} ${WRKDIR}/nonexecutable + ${CHMOD} a-x ${WRKDIR}/nonexecutable + for dir in . test ; do \ + cd ${WRKSRC}/$${dir}; \ + ${LOCALBASE}/bin/libtoolize --force; \ + ${ACLOCAL}; \ + ${AUTOHEADER}; \ + ${AUTOMAKE} -a --foreign -i; \ + ${AUTOCONF}; \ + done + +.include "../../mk/automake.mk" diff --git a/x11/lesstif12/distinfo b/x11/lesstif12/distinfo new file mode 100644 index 00000000000..d88239dfc54 --- /dev/null +++ b/x11/lesstif12/distinfo @@ -0,0 +1,44 @@ +$NetBSD: distinfo,v 1.3 2002/12/05 18:49:56 drochner Exp $ + +SHA1 (lesstif-0.93.0.tar.gz) = 540420ba640deb1311053fc4ff3244aa340e5815 +Size (lesstif-0.93.0.tar.gz) = 3266130 bytes +SHA1 (patch-aa) = 780482e79c99026663541187829d81f9f67a00c9 +SHA1 (patch-ab) = 2bab59572723690be140b65e20ae4a291bf65e4b +SHA1 (patch-ac) = d3988daba05ab5e05b1af8715c8f7ee509d2862c +SHA1 (patch-ad) = c211de805bc9bc8ce10de4bdb13a6097dde36b0f +SHA1 (patch-ae) = af06af93a639943a41bc7da2c275c137a914ac6c +SHA1 (patch-af) = 1c27702fa2667b9d7558ac1c70d460768b782b86 +SHA1 (patch-ag) = 94fb429d1527eea9756f6b6792a8a000b790cf6f +SHA1 (patch-ah) = bd8f90626944c59cb989d979046eeeabfab8c850 +SHA1 (patch-ai) = 34aa22bb3473e3c3843017a7e5c37cdb785dd1d2 +SHA1 (patch-aj) = f662745caeadd71ec407890626b6099aedababce +SHA1 (patch-ak) = ab4f16fa5282b80072be0f584d007e5718b67980 +SHA1 (patch-al) = 45cf3837df1926b44c856bfacd32f436aae3cf8f +SHA1 (patch-am) = 09b7e8cf6c8f62b69c3a1a958e8b42236a38836e +SHA1 (patch-an) = 2018bda9825cebf8f49c7ffc49e39ba2a356ed6f +SHA1 (patch-ao) = ba2e65ef9de1c7c20ce97354da80dfbb1b46035d +SHA1 (patch-ap) = 19e0ee8e0adb680a7cf21a594e905b3f31383d77 +SHA1 (patch-aq) = 51522310ebb96e5fcb4850082477d87dc756bf3d +SHA1 (patch-ar) = b7a7b175ce537adce6edcde425c1930c34d0fe95 +SHA1 (patch-as) = af297dc810d427de5aef647a22efc5d9ce17cfeb +SHA1 (patch-at) = 19cb649b965400a8ad64513558092038421c3240 +SHA1 (patch-au) = 2704d1ce8fe3852901600a7ab86161d54e72c1a6 +SHA1 (patch-av) = 1c2a902df6b9adb011e58a2e063d45c5e2ef1afb +SHA1 (patch-aw) = 1f24fbead7dc07c39d703c0c4991870aa35c251e +SHA1 (patch-ax) = 02424577854d20a2ef823ba7ecb6ddd1aea20d78 +SHA1 (patch-ay) = 0f646bf398bf22abab94abd7f80c3a2f41ce775c +SHA1 (patch-az) = 39fd7b9e4564e33b2a6f76c99a2bf6634fb4f3dd +SHA1 (patch-ba) = 76804f01a9a3beb3fbd96594f6a9ff703e732bac +SHA1 (patch-bb) = 591cac605be367542bebe993fb12684d3c10b7bb +SHA1 (patch-bc) = e350ba49b87873f1e338418d23b23d3662cbff76 +SHA1 (patch-bd) = 34d4a6842c1f0b862268ccbcea7b22313e497c32 +SHA1 (patch-be) = db1f3ae2cf28263225ad44b0b7bbeaf4e2abdc20 +SHA1 (patch-bf) = 68f34fa8b332425125265bf8b7308ff8d86dadad +SHA1 (patch-bg) = 667f2501a03fae0a973c67c9633fec672d31bc50 +SHA1 (patch-bh) = a450768a40294ad72a28a1e0450a47bd36493fe3 +SHA1 (patch-bi) = ab92bd20fbd15caa8ea5dd22436e55b79e3e8534 +SHA1 (patch-bj) = 992b72c4831c3f1a73725182330176328294964f +SHA1 (patch-bk) = 253e6fa818a80228228e35eb3156068284991e41 +SHA1 (patch-bl) = 8338187e4a3caccd0475a1e2249eb104c05b8a92 +SHA1 (patch-bm) = 66bcdf4338dd08d3ab3d0c7c9b57df6b30e25494 +SHA1 (patch-bn) = 265a2768af3f8177317d71b3cc7ec7f5a2fdce13 diff --git a/x11/lesstif12/patches/patch-aa b/x11/lesstif12/patches/patch-aa new file mode 100644 index 00000000000..1b4ed48681c --- /dev/null +++ b/x11/lesstif12/patches/patch-aa @@ -0,0 +1,52 @@ +$NetBSD: patch-aa,v 1.1 2002/12/05 18:49:57 drochner Exp $ + +--- Makefile.am.orig Mon Jul 2 11:40:03 2001 ++++ Makefile.am Wed Sep 19 17:58:44 2001 +@@ -7,7 +7,11 @@ + missing mkinstalldirs \ + FAQ Install release-notes.html release-notes.txt + ++if Version_1_2 ++SUBDIRS = . include lib ++else + SUBDIRS = . include scripts lib clients doc @BuildTestDir@ ++endif + + DIST_SUBDIRS = include scripts lib clients doc test + +@@ -19,15 +23,18 @@ + # Lets put the informational stuff in a sub directory to avoid + # poluting /usr/local for default installs. + # +-rootdir= $(prefix)/LessTif ++if Version_2_0 ++rootdir= $(docdir) + root_DATA= AUTHORS BUG-REPORTING COPYING COPYING.LIB CREDITS \ + FAQ Install KNOWN_BUGS \ + README RELEASE-POLICY release-notes.txt ++endif + + EXTRA_DIST= acconfig.h configure \ + BUG-REPORTING CREDITS FAQ Install KNOWN_BUGS RELEASE-POLICY \ + NOTES + ++if Version_2_0 + @MAINT@changelog: + @MAINT@ @ (cd $(srcdir); cvs -Q -z9 log -rrelease_@MAJOR_VERSION@_@MINOR_VERSION@_@PICO_VERSION@: \ + @MAINT@ acconfig.h acinclude.m4 configure.in Makefile.am \ +@@ -40,7 +47,6 @@ + @MAINT@ doc/lessdox ) \ + @MAINT@ | $(srcdir)/scripts/parselog release_@MAJOR_VERSION@_@MINOR_VERSION@_@PICO_VERSION@ >$(srcdir)/ChangeLog + +-htmldir= $(prefix)/LessTif/doc + html_DATA= release-notes.html + + all-local: BUG-REPORTING FAQ Install +@@ -64,6 +70,7 @@ + + #install-data-hook: + # ${INSTALL_DATA} $(srcdir)/NOTES $(DESTDIR)$(htmldir)/release-notes.html ++endif + + + # diff --git a/x11/lesstif12/patches/patch-ab b/x11/lesstif12/patches/patch-ab new file mode 100644 index 00000000000..a4423d63591 --- /dev/null +++ b/x11/lesstif12/patches/patch-ab @@ -0,0 +1,43 @@ +$NetBSD: patch-ab,v 1.1 2002/12/05 18:49:58 drochner Exp $ + +--- clients/Motif-1.2/mwm/Makefile.am.orig Tue May 1 08:37:19 2001 ++++ clients/Motif-1.2/mwm/Makefile.am +@@ -4,8 +4,8 @@ + + if Version_1_2 + bin_PROGRAMS= mwm +-endif + bindir = $(exec_prefix)/LessTif/Motif1.2/bin ++endif + + MAINTAINERCLEANFILES=Makefile.in mwmlex.c mwmparse.c mwmparse.h + +@@ -17,6 +17,7 @@ + Additional_Src = gethostname.c + endif + ++if Version_1_2 + mwm_SOURCES= colormaps.c cursors.c decorate.c defaults.c desktop.c \ + events.c functions.c icons.c menus.c misc.c move.c \ + mwm.c mwm.h mwmparse.y mwmlex.l mwmstrings.h \ +@@ -39,6 +40,7 @@ + + mwmddir= $(libdir)/X11/mwm + mwmd_DATA= system.mwmrc alt.map README ++endif + + EXTRA_DIST= Mwm.ad Mwm.mlm system.mwmrc alt.map README gethostname.c + +@@ -50,12 +52,6 @@ + mwmlex.o: mwmparse.h + + YFLAGS= -d +- +-install-data-hook: +-if DefaultVersion12 +- -rm -f $(DESTDIR)$(exec_prefix)/bin/$(bin_PROGRAMS) +- (cd $(DESTDIR)$(exec_prefix)/bin && $(LN_S) ../LessTif/Motif1.2/bin/$(bin_PROGRAMS) .) +-endif + + install-data-local: + if DefaultVersion12 diff --git a/x11/lesstif12/patches/patch-ac b/x11/lesstif12/patches/patch-ac new file mode 100644 index 00000000000..687317ac984 --- /dev/null +++ b/x11/lesstif12/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.1 2002/12/05 18:49:58 drochner Exp $ + +--- clients/Motif-1.2/mwm/system.mwmrc.orig Wed Jun 13 22:39:25 2001 ++++ clients/Motif-1.2/mwm/system.mwmrc Wed Sep 19 17:45:08 2001 +@@ -5,7 +5,7 @@ + Menu DefaultRootMenu + { + "Root Menu" f.title +- "New Window" f.exec "xterm -e /bin/bash &" ++ "New Window" f.exec "xterm &" + "Shuffle Up" f.circle_up + "Shuffle Down" f.circle_down + "Refresh" f.refresh diff --git a/x11/lesstif12/patches/patch-ad b/x11/lesstif12/patches/patch-ad new file mode 100644 index 00000000000..daf05dc2724 --- /dev/null +++ b/x11/lesstif12/patches/patch-ad @@ -0,0 +1,24 @@ +$NetBSD: patch-ad,v 1.1 2002/12/05 18:49:58 drochner Exp $ + +--- clients/Motif-1.2/uil/Makefile.am.orig Tue May 1 08:37:20 2001 ++++ clients/Motif-1.2/uil/Makefile.am +@@ -5,8 +5,8 @@ + if Version_1_2 + bin_PROGRAMS= uil + noinst_PROGRAMS = newuil +-endif + bindir = $(exec_prefix)/LessTif/Motif1.2/bin ++endif + + MAINTAINERCLEANFILES=Makefile.in lex.c yacc.c yacc.h + +@@ -35,9 +35,3 @@ + lex.o: yacc.h + + YFLAGS= -d +- +-install-data-hook: +-if DefaultVersion12 +- -rm -f $(DESTDIR)$(exec_prefix)/bin/$(bin_PROGRAMS) +- (cd $(DESTDIR)$(exec_prefix)/bin && $(LN_S) ../LessTif/Motif1.2/bin/$(bin_PROGRAMS) .) +-endif diff --git a/x11/lesstif12/patches/patch-ae b/x11/lesstif12/patches/patch-ae new file mode 100644 index 00000000000..318857753a5 --- /dev/null +++ b/x11/lesstif12/patches/patch-ae @@ -0,0 +1,24 @@ +$NetBSD: patch-ae,v 1.1 2002/12/05 18:49:58 drochner Exp $ + +--- clients/Motif-1.2/xmbind/Makefile.am.orig Tue Jul 10 11:16:03 2001 ++++ clients/Motif-1.2/xmbind/Makefile.am Wed Sep 19 17:46:42 2001 +@@ -4,8 +4,8 @@ + + if Version_1_2 + bin_PROGRAMS= xmbind +-endif + bindir = $(exec_prefix)/LessTif/Motif1.2/bin ++endif + + MAINTAINERCLEANFILES=Makefile.in + +@@ -17,9 +17,3 @@ + $(XPLIB) $(X_LIBS) -lXt $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS) + + xmbind_SOURCES= xmbind.c +- +-install-data-hook: +-if DefaultVersion12 +- -rm -f $(DESTDIR)$(exec_prefix)/bin/$(bin_PROGRAMS) +- (cd $(DESTDIR)$(exec_prefix)/bin && $(LN_S) ../LessTif/Motif1.2/bin/$(bin_PROGRAMS) .) +-endif diff --git a/x11/lesstif12/patches/patch-af b/x11/lesstif12/patches/patch-af new file mode 100644 index 00000000000..1f741e6a170 --- /dev/null +++ b/x11/lesstif12/patches/patch-af @@ -0,0 +1,47 @@ +$NetBSD: patch-af,v 1.1 2002/12/05 18:49:59 drochner Exp $ + +--- clients/Motif-2.0/mwm/Makefile.am.orig Tue May 1 08:37:20 2001 ++++ clients/Motif-2.0/mwm/Makefile.am +@@ -4,8 +4,12 @@ + + if Version_2_0 + bin_PROGRAMS= mwm +-endif ++if DefaultVersion20 ++bindir = $(exec_prefix)/bin ++else + bindir = $(exec_prefix)/LessTif/Motif2.0/bin ++endif ++endif + + MAINTAINERCLEANFILES=Makefile.in mwmlex.c mwmparse.c mwmparse.h + +@@ -34,6 +38,7 @@ + # non-local stuff + BUILT_SOURCES = $(HDRS_1_2) $(SRCS_1_2) $(mwmd_DATA) Mwm.ad + ++if Version_2_0 + mwm_SOURCES = $(HDRS_1_2) $(SRCS_1_2) $(HDRS_2_0) $(SRCS_2_0) + + $(SRCS_1_2) $(HDRS_1_2): +@@ -63,6 +68,7 @@ + + mwmddir= $(libdir)/X11/mwm + mwmd_DATA= system.mwmrc alt.map README ++endif + + + $(mwmd_DATA) Mwm.ad: +@@ -78,12 +84,6 @@ + rm $$i; \ + fi ; \ + done +- +-install-data-hook: +-if DefaultVersion20 +- -rm -f $(DESTDIR)$(exec_prefix)/bin/$(bin_PROGRAMS) +- (cd $(DESTDIR)$(exec_prefix)/bin && $(LN_S) ../LessTif/Motif2.0/bin/$(bin_PROGRAMS) .) +-endif + + install-data-local: + if DefaultVersion20 diff --git a/x11/lesstif12/patches/patch-ag b/x11/lesstif12/patches/patch-ag new file mode 100644 index 00000000000..f799b1b0875 --- /dev/null +++ b/x11/lesstif12/patches/patch-ag @@ -0,0 +1,29 @@ +$NetBSD: patch-ag,v 1.1 2002/12/05 18:49:59 drochner Exp $ + +--- clients/Motif-2.0/uil/Makefile.am.orig Tue May 1 08:37:20 2001 ++++ clients/Motif-2.0/uil/Makefile.am +@@ -5,9 +5,13 @@ + if Version_2_0 + bin_PROGRAMS= uil + noinst_PROGRAMS = newuil ++if DefaultVersion20 ++bindir = $(exec_prefix)/bin ++else ++bindir = $(exec_prefix)/LessTif/Motif2.0/bin ++endif + endif + +-bindir = $(exec_prefix)/LessTif/Motif2.0/bin + + MAINTAINERCLEANFILES=Makefile.in lex.c yacc.c yacc.h + +@@ -65,9 +69,3 @@ + rm $$i; \ + fi ; \ + done +- +-install-data-hook: +-if DefaultVersion20 +- -rm -f $(DESTDIR)$(exec_prefix)/bin/$(bin_PROGRAMS) +- (cd $(DESTDIR)$(exec_prefix)/bin && $(LN_S) ../LessTif/Motif2.0/bin/$(bin_PROGRAMS) .) +-endif diff --git a/x11/lesstif12/patches/patch-ah b/x11/lesstif12/patches/patch-ah new file mode 100644 index 00000000000..b21f97d794c --- /dev/null +++ b/x11/lesstif12/patches/patch-ah @@ -0,0 +1,28 @@ +$NetBSD: patch-ah,v 1.1 2002/12/05 18:49:59 drochner Exp $ + +--- clients/Motif-2.0/xmbind/Makefile.am.orig Tue May 1 08:37:20 2001 ++++ clients/Motif-2.0/xmbind/Makefile.am +@@ -4,8 +4,12 @@ + + if Version_2_0 + bin_PROGRAMS= xmbind +-endif ++if DefaultVersion20 ++bindir = $(exec_prefix)/bin ++else + bindir = $(exec_prefix)/LessTif/Motif2.0/bin ++endif ++endif + + MAINTAINERCLEANFILES=Makefile.in + +@@ -45,9 +49,3 @@ + rm $$i; \ + fi ; \ + done +- +-install-data-hook: +-if DefaultVersion20 +- -rm -f $(DESTDIR)$(exec_prefix)/bin/$(bin_PROGRAMS) +- (cd $(DESTDIR)$(exec_prefix)/bin && $(LN_S) ../LessTif/Motif2.0/bin/$(bin_PROGRAMS) .) +-endif diff --git a/x11/lesstif12/patches/patch-ai b/x11/lesstif12/patches/patch-ai new file mode 100644 index 00000000000..96ad207b48d --- /dev/null +++ b/x11/lesstif12/patches/patch-ai @@ -0,0 +1,47 @@ +$NetBSD: patch-ai,v 1.1 2002/12/05 18:50:00 drochner Exp $ + +--- clients/Motif-2.1/mwm/Makefile.am.orig Tue May 1 08:37:20 2001 ++++ clients/Motif-2.1/mwm/Makefile.am +@@ -4,8 +4,12 @@ + + if Version_2_1 + bin_PROGRAMS= mwm +-endif ++if DefaultVersion21 ++bindir = $(exec_prefix)/bin ++else + bindir = $(exec_prefix)/LessTif/Motif2.1/bin ++endif ++endif + + MAINTAINERCLEANFILES=Makefile.in mwmlex.c mwmparse.c mwmparse.h + +@@ -40,6 +44,7 @@ + # non-local stuff + BUILT_SOURCES = $(HDRS_1_2) $(SRCS_1_2) $(HDRS_2_0) $(SRCS_2_0) $(mwmd_DATA) Mwm.ad + ++if Version_2_1 + mwm_SOURCES = $(HDRS_1_2) $(SRCS_1_2) $(HDRS_2_0) $(SRCS_2_0) $(HDRS_2_1) $(SRCS_2_1) + + $(SRCS_1_2) $(HDRS_1_2): +@@ -76,6 +81,7 @@ + + mwmddir= $(libdir)/X11/mwm + mwmd_DATA= system.mwmrc alt.map README ++endif + + + $(mwmd_DATA) Mwm.ad: +@@ -91,12 +97,6 @@ + rm $$i; \ + fi ; \ + done +- +-install-data-hook: +-if DefaultVersion21 +- -rm -f $(DESTDIR)$(exec_prefix)/bin/$(bin_PROGRAMS) +- (cd $(DESTDIR)$(exec_prefix)/bin && $(LN_S) ../LessTif/Motif2.1/bin/$(bin_PROGRAMS) .) +-endif + + install-data-local: + if DefaultVersion21 diff --git a/x11/lesstif12/patches/patch-aj b/x11/lesstif12/patches/patch-aj new file mode 100644 index 00000000000..10c9476df9b --- /dev/null +++ b/x11/lesstif12/patches/patch-aj @@ -0,0 +1,29 @@ +$NetBSD: patch-aj,v 1.1 2002/12/05 18:50:00 drochner Exp $ + +--- clients/Motif-2.1/uil/Makefile.am.orig Tue May 1 08:37:20 2001 ++++ clients/Motif-2.1/uil/Makefile.am +@@ -5,8 +5,12 @@ + if Version_2_1 + bin_PROGRAMS= uil + noinst_PROGRAMS = newuil +-endif ++if DefaultVersion21 ++bindir = $(exec_prefix)/bin ++else + bindir = $(exec_prefix)/LessTif/Motif2.1/bin ++endif ++endif + + MAINTAINERCLEANFILES=Makefile.in lex.c yacc.c yacc.h + +@@ -75,10 +79,3 @@ + rm $$i; \ + fi ; \ + done +- +-install-data-hook: +-if DefaultVersion21 +- -rm -f $(DESTDIR)$(exec_prefix)/bin/$(bin_PROGRAMS) +- (cd $(DESTDIR)$(exec_prefix)/bin && $(LN_S) ../LessTif/Motif2.1/bin/$(bin_PROGRAMS) .) +-endif +- diff --git a/x11/lesstif12/patches/patch-ak b/x11/lesstif12/patches/patch-ak new file mode 100644 index 00000000000..4fe26adc411 --- /dev/null +++ b/x11/lesstif12/patches/patch-ak @@ -0,0 +1,29 @@ +$NetBSD: patch-ak,v 1.1 2002/12/05 18:50:00 drochner Exp $ + +--- clients/Motif-2.1/xmbind/Makefile.am.orig Tue May 1 08:37:20 2001 ++++ clients/Motif-2.1/xmbind/Makefile.am +@@ -4,8 +4,12 @@ + + if Version_2_1 + bin_PROGRAMS= xmbind +-endif ++if DefaultVersion21 ++bindir = $(exec_prefix)/bin ++else + bindir = $(exec_prefix)/LessTif/Motif2.1/bin ++endif ++endif + + MAINTAINERCLEANFILES=Makefile.in + +@@ -57,10 +61,3 @@ + rm $$i; \ + fi ; \ + done +- +-install-data-hook: +-if DefaultVersion21 +- -rm -f $(DESTDIR)$(exec_prefix)/bin/$(bin_PROGRAMS) +- (cd $(DESTDIR)$(exec_prefix)/bin && $(LN_S) ../LessTif/Motif2.1/bin/$(bin_PROGRAMS) .) +-endif +- diff --git a/x11/lesstif12/patches/patch-al b/x11/lesstif12/patches/patch-al new file mode 100644 index 00000000000..5fa05685366 --- /dev/null +++ b/x11/lesstif12/patches/patch-al @@ -0,0 +1,16 @@ +$NetBSD: patch-al,v 1.1 2002/12/05 18:50:00 drochner Exp $ + +--- configure.in.orig Sat Jun 2 08:39:46 2001 ++++ configure.in +@@ -710,6 +710,11 @@ + dnl AC_SUBST(libdir) + AC_SUBST(bindir) + ++docdir='${prefix}/share/doc/lesstif' ++htmldir='${prefix}/share/doc/html/lesstif' ++AC_SUBST(docdir) ++AC_SUBST(htmldir) ++ + dnl We might have a bit too much redundant data here, but who cares ... + dnl AC_SUBST(version) + AC_SUBST(version_suffix) diff --git a/x11/lesstif12/patches/patch-am b/x11/lesstif12/patches/patch-am new file mode 100644 index 00000000000..69fad625704 --- /dev/null +++ b/x11/lesstif12/patches/patch-am @@ -0,0 +1,13 @@ +$NetBSD: patch-am,v 1.1 2002/12/05 18:50:01 drochner Exp $ + +--- doc/Makefile.am.orig Tue May 1 08:37:20 2001 ++++ doc/Makefile.am +@@ -6,7 +6,7 @@ + + SUBDIRS = www.lesstif.org lessdox + +-rootdir= $(prefix)/LessTif/doc ++rootdir= $(htmldir) + root_DATA= All.html Clipboard.txt DragAndDrop.txt Form.txt \ + GeoUtils.txt Geometry.html SyntheticResources.txt \ + UIL.txt XmStrings.txt thread.html diff --git a/x11/lesstif12/patches/patch-an b/x11/lesstif12/patches/patch-an new file mode 100644 index 00000000000..086615cb971 --- /dev/null +++ b/x11/lesstif12/patches/patch-an @@ -0,0 +1,21 @@ +$NetBSD: patch-an,v 1.1 2002/12/05 18:50:01 drochner Exp $ + +--- doc/lessdox/clients/Makefile.am.orig Tue May 1 08:37:20 2001 ++++ doc/lessdox/clients/Makefile.am +@@ -6,7 +6,6 @@ + EXTRA_DIST = $(man1_DATA) $(man3_DATA) $(man5_DATA) + SUFFIXES= .1 .3 .5 .html + +-mandir= $(prefix)/LessTif/doc/man + man1dir= $(prefix)/man/man1 + man3dir= $(prefix)/man/man3 + man5dir= $(prefix)/man/man5 +@@ -15,8 +14,6 @@ + man3_DATA= + man5_DATA= mwmrc.5 VirtualBindings.5 + +- +-htmldir= $(prefix)/LessTif/doc/html + + html_DATA= mwm.html mwmrc.html xmbind.html lesstif.html uil.html \ + xlt.html xbae.html VirtualBindings.html diff --git a/x11/lesstif12/patches/patch-ao b/x11/lesstif12/patches/patch-ao new file mode 100644 index 00000000000..c7ed8866e56 --- /dev/null +++ b/x11/lesstif12/patches/patch-ao @@ -0,0 +1,21 @@ +$NetBSD: patch-ao,v 1.1 2002/12/05 18:50:01 drochner Exp $ + +--- doc/lessdox/functions/Makefile.am.orig Tue May 1 08:37:20 2001 ++++ doc/lessdox/functions/Makefile.am +@@ -6,7 +6,6 @@ + EXTRA_DIST = $(man1_DATA) $(man3_DATA) $(man5_DATA) + SUFFIXES= .1 .3 .5 .html + +-mandir= $(prefix)/LessTif/doc/man + man1dir= $(prefix)/man/man1 + man3dir= $(prefix)/man/man3 + man5dir= $(prefix)/man/man5 +@@ -15,8 +14,6 @@ + man3_DATA= + man5_DATA= + +- +-htmldir= $(prefix)/LessTif/doc/html + + html_DATA= ${man1_DATA:.1=.html} ${man3_DATA:.3=.html} \ + ${man5_DATA:.5=.html} diff --git a/x11/lesstif12/patches/patch-ap b/x11/lesstif12/patches/patch-ap new file mode 100644 index 00000000000..aec8ef6dec9 --- /dev/null +++ b/x11/lesstif12/patches/patch-ap @@ -0,0 +1,32 @@ +$NetBSD: patch-ap,v 1.1 2002/12/05 18:50:01 drochner Exp $ + +--- doc/lessdox/widgets/Makefile.am.orig Fri Mar 30 02:49:10 2001 ++++ doc/lessdox/widgets/Makefile.am +@@ -6,7 +6,6 @@ + EXTRA_DIST = $(man1_DATA) $(man3_DATA) $(man5_DATA) + SUFFIXES= .1 .3 .5 .html + +-mandir= $(prefix)/LessTif/doc/man + man1dir= $(prefix)/man/man1 + man3dir= $(prefix)/man/man3 + man5dir= $(prefix)/man/man5 +@@ -40,8 +39,6 @@ + + man5_DATA= + +-htmldir= $(prefix)/LessTif/doc/html +- + html_DATA= ${man1_DATA:.1=.html} ${man3_DATA:.3=.html} \ + ${man5_DATA:.5=.html} + +@@ -61,10 +58,3 @@ + + .5.html: + $(MAN2HTML) -f <$(srcdir)/$*.5 >$*.html +- +-# +-# This installs an extra symbolic link to make the HTML links work right +-# in both the http://www.lesstif.org and the locally installed case. +-# +-install-data-hook: +- if [ ! -h $(DESTDIR)$(prefix)/LessTif/doc/Lessdox ]; then mkdir -p $(DESTDIR)$(prefix)/LessTif/doc && cd $(DESTDIR)$(prefix)/LessTif/doc && $(LN_S) html Lessdox; fi diff --git a/x11/lesstif12/patches/patch-aq b/x11/lesstif12/patches/patch-aq new file mode 100644 index 00000000000..285c90eb12d --- /dev/null +++ b/x11/lesstif12/patches/patch-aq @@ -0,0 +1,14 @@ +$NetBSD: patch-aq,v 1.1 2002/12/05 18:50:02 drochner Exp $ + +--- doc/www.lesstif.org/Makefile.am.orig Mon Jul 2 11:40:03 2001 ++++ doc/www.lesstif.org/Makefile.am Wed Sep 19 17:47:46 2001 +@@ -13,8 +13,7 @@ + # Lets put the informational stuff in a sub directory to avoid + # polluting /usr/local for default installs. + # +-docdir= $(prefix)/LessTif/doc +-doc_DATA= \ ++html_DATA= \ + Advocacy.html contents.html misc_frame.html \ + BUG-HUNTING.html core.html news.html \ + COPYING.LIB.html cvs.html news_frame.html \ diff --git a/x11/lesstif12/patches/patch-ar b/x11/lesstif12/patches/patch-ar new file mode 100644 index 00000000000..d20cdf0a870 --- /dev/null +++ b/x11/lesstif12/patches/patch-ar @@ -0,0 +1,13 @@ +$NetBSD: patch-ar,v 1.1 2002/12/05 18:50:02 drochner Exp $ + +--- doc/www.lesstif.org/images/Makefile.am.orig Tue May 1 08:37:20 2001 ++++ doc/www.lesstif.org/images/Makefile.am +@@ -10,7 +10,7 @@ + # Lets put the informational stuff in a sub directory to avoid + # poluting /usr/local for default installs. + # +-rootdir= $(prefix)/LessTif/doc/images ++rootdir= $(htmldir)/images + root_DATA= hungry.png \ + lesstif-realsmall.png lesstif-small.png lesstif.png \ + ltsunlogo.png lesstif.jpg ltsunlogo.jpg \ diff --git a/x11/lesstif12/patches/patch-as b/x11/lesstif12/patches/patch-as new file mode 100644 index 00000000000..64d9f677feb --- /dev/null +++ b/x11/lesstif12/patches/patch-as @@ -0,0 +1,29 @@ +$NetBSD: patch-as,v 1.1 2002/12/05 18:50:02 drochner Exp $ + +--- include/Motif-1.2/Mrm/Makefile.am.orig Wed Oct 11 15:36:14 2000 ++++ include/Motif-1.2/Mrm/Makefile.am +@@ -6,6 +6,7 @@ + h= MrmAppl.h MrmDecls.h MrmPrivate.h MrmPublic.h + EXTRA_DIST= $(h) + ++if Version_1_2 + # + # Install headers + # +@@ -14,16 +15,6 @@ + # + mrmdir = $(prefix)/LessTif/Motif1.2/include/Mrm + +-if Version_1_2 +- + mrm_HEADERS= $(h) + + endif +-install-data-hook: +-if Version_1_2 +-if DefaultVersion12 +- if [ -d $(DESTDIR)$(prefix)/include/Mrm ]; then rm -rf $(DESTDIR)$(prefix)/include/Mrm; else rm -f $(DESTDIR)$(prefix)/include/Mrm; fi +- (mkdir -p $(DESTDIR)$(prefix)/include && cd $(DESTDIR)$(prefix)/include && $(LN_S) ../LessTif/Motif1.2/include/Mrm Mrm) +-endif +-endif +- diff --git a/x11/lesstif12/patches/patch-at b/x11/lesstif12/patches/patch-at new file mode 100644 index 00000000000..53fd3085846 --- /dev/null +++ b/x11/lesstif12/patches/patch-at @@ -0,0 +1,40 @@ +$NetBSD: patch-at,v 1.1 2002/12/05 18:50:03 drochner Exp $ + +--- include/Motif-1.2/Xm/Makefile.am.orig Wed Oct 11 15:36:18 2000 ++++ include/Motif-1.2/Xm/Makefile.am +@@ -73,6 +73,7 @@ + + EXTRA_DIST= $(xm_both_h) + ++if Version_1_2 + # + # Install headers + # +@@ -81,8 +82,6 @@ + # + xmdir= $(prefix)/LessTif/Motif1.2/include/Xm + +-if Version_1_2 +- + xm_HEADERS = $(xm_both_h) + # + # Note Xm.h is built by configure, therefore it's not necessarily in +@@ -90,18 +89,4 @@ + # tree which may be elsewhere. + # + xm_DATA = Xm.h +- +-else +-# +-# Not Version_1_2 +-# +-xm_HEADERS = $(xm_12_h) +- +-endif +-install-data-hook: +-if Version_1_2 +-if DefaultVersion12 +- if [ -d $(DESTDIR)$(prefix)/include/Xm ]; then rm -rf $(DESTDIR)$(prefix)/include/Xm; else rm -f $(DESTDIR)$(prefix)/include/Xm; fi +- (mkdir -p $(DESTDIR)$(prefix)/include && cd $(DESTDIR)$(prefix)/include && $(LN_S) ../LessTif/Motif1.2/include/Xm Xm) +-endif + endif diff --git a/x11/lesstif12/patches/patch-au b/x11/lesstif12/patches/patch-au new file mode 100644 index 00000000000..df03d0255fd --- /dev/null +++ b/x11/lesstif12/patches/patch-au @@ -0,0 +1,29 @@ +$NetBSD: patch-au,v 1.1 2002/12/05 18:50:03 drochner Exp $ + +--- include/Motif-1.2/uil/Makefile.am.orig Wed Oct 25 06:16:07 2000 ++++ include/Motif-1.2/uil/Makefile.am +@@ -6,6 +6,7 @@ + h= Uil.h UilDBDef.h UilDef.h UilSymDef.h UilSymGl.h + EXTRA_DIST= $(h) + ++if Version_1_2 + # + # Install headers + # +@@ -14,16 +15,6 @@ + # + uildir = $(prefix)/LessTif/Motif1.2/include/uil + +-if Version_1_2 +- + uil_HEADERS= $(h) + + endif +-install-data-hook: +-if Version_1_2 +-if DefaultVersion12 +- if [ -d $(DESTDIR)$(prefix)/include/uil ]; then rm -rf $(DESTDIR)$(prefix)/include/uil; else rm -f $(DESTDIR)$(prefix)/include/uil; fi +- (mkdir -p $(DESTDIR)$(prefix)/include && cd $(DESTDIR)$(prefix)/include && $(LN_S) ../LessTif/Motif1.2/include/uil uil) +-endif +-endif +- diff --git a/x11/lesstif12/patches/patch-av b/x11/lesstif12/patches/patch-av new file mode 100644 index 00000000000..6e6ecd91e28 --- /dev/null +++ b/x11/lesstif12/patches/patch-av @@ -0,0 +1,28 @@ +$NetBSD: patch-av,v 1.1 2002/12/05 18:50:03 drochner Exp $ + +--- include/Motif-2.0/Mrm/Makefile.am.orig Sun Jan 2 08:22:55 2000 ++++ include/Motif-2.0/Mrm/Makefile.am +@@ -11,7 +11,11 @@ + # Lets put the headers in a sub directory to avoid + # poluting /usr/local with more directories for default installs. + # ++if DefaultVersion20 ++mrmdir = $(prefix)/include/Mrm ++else + mrmdir = $(prefix)/LessTif/Motif2.0/include/Mrm ++endif + + HEADERS1_2 = MrmAppl.h MrmDecls.h MrmPrivate.h MrmPublic.h + +@@ -30,11 +34,3 @@ + done + + endif +-install-data-hook: +-if Version_2_0 +-if DefaultVersion20 +- if [ -d $(DESTDIR)$(prefix)/include/Mrm ]; then rm -rf $(DESTDIR)$(prefix)/include/Mrm; else rm -f $(DESTDIR)$(prefix)/include/Mrm; fi +- (mkdir -p $(DESTDIR)$(prefix)/include && cd $(DESTDIR)$(prefix)/include && $(LN_S) ../LessTif/Motif2.0/include/Mrm Mrm) +-endif +-endif +- diff --git a/x11/lesstif12/patches/patch-aw b/x11/lesstif12/patches/patch-aw new file mode 100644 index 00000000000..a61e5bd78d9 --- /dev/null +++ b/x11/lesstif12/patches/patch-aw @@ -0,0 +1,26 @@ +$NetBSD: patch-aw,v 1.1 2002/12/05 18:50:04 drochner Exp $ + +--- include/Motif-2.0/Xm/Makefile.am.orig Tue Dec 5 11:19:25 2000 ++++ include/Motif-2.0/Xm/Makefile.am +@@ -9,7 +9,11 @@ + # Lets put the headers in a sub directory to avoid + # poluting /usr/local with more directories for default installs. + # ++if DefaultVersion20 ++xmdir= $(prefix)/include/Xm ++else + xmdir= $(prefix)/LessTif/Motif2.0/include/Xm ++endif + + HEADERS1_2 = \ + ArrowB.h ArrowBG.h AtomMgr.h \ +@@ -68,9 +72,3 @@ + rm $$i; \ + fi ; \ + done +- +-install-data-hook: +-if DefaultVersion20 +- if [ -d $(DESTDIR)$(prefix)/include/Xm ]; then rm -rf $(DESTDIR)$(prefix)/include/Xm; else rm -f $(DESTDIR)$(prefix)/include/Xm; fi +- (mkdir -p $(DESTDIR)$(prefix)/include && cd $(DESTDIR)$(prefix)/include && $(LN_S) ../LessTif/Motif2.0/include/Xm Xm) +-endif diff --git a/x11/lesstif12/patches/patch-ax b/x11/lesstif12/patches/patch-ax new file mode 100644 index 00000000000..9d5ec163e1e --- /dev/null +++ b/x11/lesstif12/patches/patch-ax @@ -0,0 +1,28 @@ +$NetBSD: patch-ax,v 1.1 2002/12/05 18:50:04 drochner Exp $ + +--- include/Motif-2.0/uil/Makefile.am.orig Wed Oct 25 06:16:07 2000 ++++ include/Motif-2.0/uil/Makefile.am +@@ -11,7 +11,11 @@ + # Lets put the headers in a sub directory to avoid + # poluting /usr/local with more directories for default installs. + # ++if DefaultVersion20 ++uildir = $(prefix)/include/uil ++else + uildir = $(prefix)/LessTif/Motif2.0/include/uil ++endif + + HEADERS1_2 = Uil.h UilDBDef.h UilDef.h UilSymDef.h UilSymGl.h + +@@ -29,11 +33,4 @@ + fi ; \ + done + +-endif +-install-data-hook: +-if Version_2_0 +-if DefaultVersion20 +- if [ -d $(DESTDIR)$(prefix)/include/uil ]; then rm -rf $(DESTDIR)$(prefix)/include/uil; else rm -f $(DESTDIR)$(prefix)/include/uil; fi +- (mkdir -p $(DESTDIR)$(prefix)/include && cd $(DESTDIR)$(prefix)/include && $(LN_S) ../LessTif/Motif2.0/include/uil uil) +-endif + endif diff --git a/x11/lesstif12/patches/patch-ay b/x11/lesstif12/patches/patch-ay new file mode 100644 index 00000000000..e7f9c89120e --- /dev/null +++ b/x11/lesstif12/patches/patch-ay @@ -0,0 +1,29 @@ +$NetBSD: patch-ay,v 1.1 2002/12/05 18:50:04 drochner Exp $ + +--- include/Motif-2.1/Mrm/Makefile.am.orig Mon Nov 27 05:36:00 2000 ++++ include/Motif-2.1/Mrm/Makefile.am +@@ -10,7 +10,11 @@ + # Lets put the headers in a sub directory to avoid + # poluting /usr/local with more directories for default installs. + # ++if DefaultVersion21 ++mrmdir = $(prefix)/include/Mrm ++else + mrmdir = $(prefix)/LessTif/Motif2.1/include/Mrm ++endif + + HEADERS1_2 = MrmAppl.h MrmDecls.h MrmPrivate.h MrmPublic.h + HEADERS2_0 = +@@ -33,12 +37,3 @@ + done + + endif +-# +-# +-install-data-hook: +-if Version_2_1 +-if DefaultVersion21 +- if [ -d $(DESTDIR)$(prefix)/include/Mrm ]; then rm -rf $(DESTDIR)$(prefix)/include/Mrm; else rm -f $(DESTDIR)$(prefix)/include/Mrm; fi +- (mkdir -p $(DESTDIR)$(prefix)/include && cd $(DESTDIR)$(prefix)/include && $(LN_S) ../LessTif/Motif2.1/include/Mrm Mrm) +-endif +-endif diff --git a/x11/lesstif12/patches/patch-az b/x11/lesstif12/patches/patch-az new file mode 100644 index 00000000000..c96e5192fad --- /dev/null +++ b/x11/lesstif12/patches/patch-az @@ -0,0 +1,26 @@ +$NetBSD: patch-az,v 1.1 2002/12/05 18:50:04 drochner Exp $ + +--- include/Motif-2.1/Xm/Makefile.am.orig Sat Dec 23 05:46:22 2000 ++++ include/Motif-2.1/Xm/Makefile.am +@@ -9,7 +9,11 @@ + # Lets put the headers in a sub directory to avoid + # poluting /usr/local with more directories for default installs. + # ++if DefaultVersion21 ++xmdir= $(prefix)/include/Xm ++else + xmdir= $(prefix)/LessTif/Motif2.1/include/Xm ++endif + + HEADERS1_2 = \ + ArrowB.h ArrowBG.h AtomMgr.h \ +@@ -73,9 +77,3 @@ + rm $$i; \ + fi ; \ + done +- +-install-data-hook: +-if DefaultVersion21 +- if [ -d $(DESTDIR)$(prefix)/include/Xm ]; then rm -rf $(DESTDIR)$(prefix)/include/Xm; else rm -f $(DESTDIR)$(prefix)/include/Xm; fi +- (mkdir -p $(DESTDIR)$(prefix)/include && cd $(DESTDIR)$(prefix)/include && $(LN_S) ../LessTif/Motif2.1/include/Xm Xm) +-endif diff --git a/x11/lesstif12/patches/patch-ba b/x11/lesstif12/patches/patch-ba new file mode 100644 index 00000000000..c1c3bee32cc --- /dev/null +++ b/x11/lesstif12/patches/patch-ba @@ -0,0 +1,28 @@ +$NetBSD: patch-ba,v 1.1 2002/12/05 18:50:05 drochner Exp $ + +--- include/Motif-2.1/uil/Makefile.am.orig Wed Dec 6 08:26:37 2000 ++++ include/Motif-2.1/uil/Makefile.am +@@ -11,7 +11,11 @@ + # Lets put the headers in a sub directory to avoid + # poluting /usr/local with more directories for default installs. + # ++if DefaultVersion21 ++uildir = $(prefix)/include/uil ++else + uildir = $(prefix)/LessTif/Motif2.1/include/uil ++endif + + HEADERS1_2 = Uil.h UilDBDef.h UilDef.h UilSymDef.h UilSymGl.h + HEADERS2_0 = +@@ -34,11 +38,4 @@ + fi ; \ + done + +-endif +-install-data-hook: +-if Version_2_1 +-if DefaultVersion21 +- if [ -d $(DESTDIR)$(prefix)/include/uil ]; then rm -rf $(DESTDIR)$(prefix)/include/uil; else rm -f $(DESTDIR)$(prefix)/include/uil; fi +- (mkdir -p $(DESTDIR)$(prefix)/include && cd $(DESTDIR)$(prefix)/include && $(LN_S) ../LessTif/Motif2.1/include/uil uil) +-endif + endif diff --git a/x11/lesstif12/patches/patch-bb b/x11/lesstif12/patches/patch-bb new file mode 100644 index 00000000000..f97b3912426 --- /dev/null +++ b/x11/lesstif12/patches/patch-bb @@ -0,0 +1,58 @@ +$NetBSD: patch-bb,v 1.1 2002/12/05 18:50:05 drochner Exp $ + +--- lib/Dt/Makefile.am.orig Wed May 9 16:41:21 2001 ++++ lib/Dt/Makefile.am +@@ -5,7 +5,13 @@ + MAINTAINERCLEANFILES=Makefile.in + + libDtPrint_la_LDFLAGS= -version-info 1:0 ++if Version_2_1 ++if DefaultVersion21 ++libdir = $(exec_prefix)/lib ++else + libdir = $(exec_prefix)/LessTif/Motif2.1/lib ++endif ++endif + + if BuildLibDtPrint + +@@ -15,7 +21,13 @@ + # libDtPrint_la_LIBADD = @X_LIBS@ -lXt $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS) + + ++if Version_2_1 ++if DefaultVersion21 ++includedir= $(prefix)/include/Dt ++else + includedir= $(prefix)/LessTif/Motif2.1/include/Dt ++endif ++endif + include_DATA= Print.h + + INCLUDES= -I$(top_srcdir)/lib \ +@@ -37,25 +49,3 @@ + + EXTRA_DIST = Print.h DtPrintSetupBoxP.h \ + DtPrintSetupBox.c DtPrintSetupData.c +- +-install-data-hook: libDtPrint.la +-if BuildLibDtPrint +-if LibtoolShared +- -rm -f $(DESTDIR)$(exec_prefix)/lib/libDtPrint.so.1* +- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libDtPrint.so.1* .) +-endif +-if DefaultVersion21 +- -rm -f $(DESTDIR)$(exec_prefix)/lib/libDtPrint.la +- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libDtPrint.la .) +- if [ -d $(DESTDIR)$(prefix)/include/Dt ]; then rm -rf $(DESTDIR)$(prefix)/include/Dt; else rm -f $(DESTDIR)$(prefix)/include/Dt; fi +- (mkdir -p $(DESTDIR)$(prefix)/include && cd $(DESTDIR)$(prefix)/include && $(LN_S) ../LessTif/Motif2.1/include/Dt Dt) +-if LibtoolShared +- -rm -f $(DESTDIR)$(exec_prefix)/lib/libDtPrint.so +- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libDtPrint.so .) +-endif +-if LibtoolStatic +- -rm -f $(DESTDIR)$(exec_prefix)/lib/libDtPrint.a +- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libDtPrint.a .) +-endif +-endif +-endif diff --git a/x11/lesstif12/patches/patch-bc b/x11/lesstif12/patches/patch-bc new file mode 100644 index 00000000000..4335093ba8e --- /dev/null +++ b/x11/lesstif12/patches/patch-bc @@ -0,0 +1,26 @@ +$NetBSD: patch-bc,v 1.1 2002/12/05 18:50:05 drochner Exp $ + +--- lib/Makefile.am.orig Wed Jul 18 17:31:21 2001 ++++ lib/Makefile.am Wed Sep 19 17:51:34 2001 +@@ -4,13 +4,19 @@ + + MAINTAINERCLEANFILES=Makefile.in + +-SUBDIRS= config \ ++if Version_1_2 ++CONFIGDIR= ++else ++CONFIGDIR= config ++endif ++ ++SUBDIRS= $(CONFIGDIR) \ + Xm Mrm Uil \ + Xm-2.0 Mrm-2.0 Uil-2.0 \ + Xm-2.1 Mrm-2.1 Uil-2.1 \ + Dt + +-DIST_SUBDIRS= config \ ++DIST_SUBDIRS= $(CONFIGDIR) \ + Xm Mrm Uil \ + Xm-2.0 Mrm-2.0 Uil-2.0 \ + Xm-2.1 Mrm-2.1 Uil-2.1 \ diff --git a/x11/lesstif12/patches/patch-bd b/x11/lesstif12/patches/patch-bd new file mode 100644 index 00000000000..beb3faa9cfa --- /dev/null +++ b/x11/lesstif12/patches/patch-bd @@ -0,0 +1,43 @@ +$NetBSD: patch-bd,v 1.1 2002/12/05 18:50:06 drochner Exp $ + +--- lib/Mrm-2.0/Makefile.am.orig Wed May 9 16:41:21 2001 ++++ lib/Mrm-2.0/Makefile.am +@@ -4,7 +4,13 @@ + MAINTAINERCLEANFILES=Makefile.in + + libMrm_la_LDFLAGS= -version-info 2:0 ++if Version_2_0 ++if DefaultVersion20 ++libdir = $(exec_prefix)/lib ++else + libdir = $(exec_prefix)/LessTif/Motif2.0/lib ++endif ++endif + + # + # Sources in this directory +@@ -68,24 +74,4 @@ + rm $$i; \ + fi ; \ + done +-endif +- +-install-data-hook: libMrm.la +-if Version_2_0 +-if LibtoolShared +- -rm -f $(DESTDIR)$(exec_prefix)/lib/libMrm.so.2* +- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libMrm.so.2* .) +-endif +-if DefaultVersion20 +- -rm -f $(DESTDIR)$(exec_prefix)/lib/libMrm.la +- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libMrm.la .) +-if LibtoolShared +- -rm -f $(DESTDIR)$(exec_prefix)/lib/libMrm.so +- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libMrm.so .) +-endif +-if LibtoolStatic +- -rm -f $(DESTDIR)$(exec_prefix)/lib/libMrm.a +- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libMrm.a .) +-endif +-endif + endif diff --git a/x11/lesstif12/patches/patch-be b/x11/lesstif12/patches/patch-be new file mode 100644 index 00000000000..199d67c2cb3 --- /dev/null +++ b/x11/lesstif12/patches/patch-be @@ -0,0 +1,43 @@ +$NetBSD: patch-be,v 1.1 2002/12/05 18:50:06 drochner Exp $ + +--- lib/Mrm-2.1/Makefile.am.orig Wed May 9 16:41:21 2001 ++++ lib/Mrm-2.1/Makefile.am +@@ -4,7 +4,13 @@ + MAINTAINERCLEANFILES=Makefile.in + + libMrm_la_LDFLAGS= -version-info 2:1 ++if Version_2_1 ++if DefaultVersion21 ++libdir = $(exec_prefix)/lib ++else + libdir = $(exec_prefix)/LessTif/Motif2.1/lib ++endif ++endif + + # + # Sources in this directory +@@ -80,24 +86,4 @@ + rm $$i; \ + fi ; \ + done +-endif +- +-install-data-hook: libMrm.la +-if Version_2_1 +-if LibtoolShared +- -rm -f $(DESTDIR)$(exec_prefix)/lib/libMrm.so.2* +- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libMrm.so.2* .) +-endif +-if DefaultVersion21 +- -rm -f $(DESTDIR)$(exec_prefix)/lib/libMrm.la +- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libMrm.la .) +-if LibtoolShared +- -rm -f $(DESTDIR)$(exec_prefix)/lib/libMrm.so +- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libMrm.so .) +-endif +-if LibtoolStatic +- -rm -f $(DESTDIR)$(exec_prefix)/lib/libMrm.a +- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libMrm.a .) +-endif +-endif + endif diff --git a/x11/lesstif12/patches/patch-bf b/x11/lesstif12/patches/patch-bf new file mode 100644 index 00000000000..dfefffe55d2 --- /dev/null +++ b/x11/lesstif12/patches/patch-bf @@ -0,0 +1,38 @@ +$NetBSD: patch-bf,v 1.1 2002/12/05 18:50:06 drochner Exp $ + +--- lib/Mrm/Makefile.am.orig Wed May 9 16:38:00 2001 ++++ lib/Mrm/Makefile.am +@@ -4,7 +4,9 @@ + MAINTAINERCLEANFILES=Makefile.in + + libMrm_la_LDFLAGS= -version-info 1:2 ++if Version_1_2 + libdir = $(exec_prefix)/LessTif/Motif1.2/lib ++endif + + EXTRA_DIST= Mrm.c lookup.c misc.c \ + lookup.h misc.h uil.h +@@ -27,23 +29,4 @@ + libMrm_la_SOURCES= Mrm.c lookup.c misc.c \ + lookup.h misc.h uil.h + +-endif +-install-data-hook: libMrm.la +-if Version_1_2 +-if LibtoolShared +- -rm -f $(DESTDIR)$(exec_prefix)/lib/libMrm.so.1* +- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libMrm.so.1* .) +-endif +-if DefaultVersion12 +- -rm -f $(DESTDIR)$(exec_prefix)/lib/libMrm.la +- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libMrm.la .) +-if LibtoolShared +- -rm -f $(DESTDIR)$(exec_prefix)/lib/libMrm.so +- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libMrm.so .) +-endif +-if LibtoolStatic +- -rm -f $(DESTDIR)$(exec_prefix)/lib/libMrm.a +- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libMrm.a .) +-endif +-endif + endif diff --git a/x11/lesstif12/patches/patch-bg b/x11/lesstif12/patches/patch-bg new file mode 100644 index 00000000000..dfff0860ee2 --- /dev/null +++ b/x11/lesstif12/patches/patch-bg @@ -0,0 +1,43 @@ +$NetBSD: patch-bg,v 1.1 2002/12/05 18:50:06 drochner Exp $ + +--- lib/Uil-2.0/Makefile.am.orig Wed May 9 16:41:21 2001 ++++ lib/Uil-2.0/Makefile.am +@@ -4,7 +4,13 @@ + MAINTAINERCLEANFILES=Makefile.in + + libUil_la_LDFLAGS= -version-info 2:0 ++if Version_2_0 ++if DefaultVersion20 ++libdir = $(exec_prefix)/lib ++else + libdir = $(exec_prefix)/LessTif/Motif2.0/lib ++endif ++endif + + # + # Sources in this directory +@@ -58,24 +64,4 @@ + rm $$i; \ + fi ; \ + done +-endif +- +-install-data-hook: libUil.la +-if Version_2_0 +-if LibtoolShared +- -rm -f $(DESTDIR)$(exec_prefix)/lib/libUil.so.2* +- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libUil.so.2* .) +-endif +-if DefaultVersion20 +- -rm -f $(DESTDIR)$(exec_prefix)/lib/libUil.la +- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libUil.la .) +-if LibtoolShared +- -rm -f $(DESTDIR)$(exec_prefix)/lib/libUil.so +- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libUil.so .) +-endif +-if LibtoolStatic +- -rm -f $(DESTDIR)$(exec_prefix)/lib/libUil.a +- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libUil.a .) +-endif +-endif + endif diff --git a/x11/lesstif12/patches/patch-bh b/x11/lesstif12/patches/patch-bh new file mode 100644 index 00000000000..5140dfd12b6 --- /dev/null +++ b/x11/lesstif12/patches/patch-bh @@ -0,0 +1,43 @@ +$NetBSD: patch-bh,v 1.1 2002/12/05 18:50:07 drochner Exp $ + +--- lib/Uil-2.1/Makefile.am.orig Wed May 9 16:41:21 2001 ++++ lib/Uil-2.1/Makefile.am +@@ -5,7 +5,13 @@ + MAINTAINERCLEANFILES=Makefile.in + + libUil_la_LDFLAGS= -version-info 2:1 ++if Version_2_1 ++if DefaultVersion21 ++libdir = $(exec_prefix)/lib ++else + libdir = $(exec_prefix)/LessTif/Motif2.1/lib ++endif ++endif + + # + # Sources in this directory +@@ -70,24 +76,4 @@ + rm $$i; \ + fi ; \ + done +-endif +- +-install-data-hook: libUil.la +-if Version_2_1 +-if LibtoolShared +- -rm -f $(DESTDIR)$(exec_prefix)/lib/libUil.so.2* +- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libUil.so.2* .) +-endif +-if DefaultVersion21 +- -rm -f $(DESTDIR)$(exec_prefix)/lib/libUil.la +- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libUil.la .) +-if LibtoolShared +- -rm -f $(DESTDIR)$(exec_prefix)/lib/libUil.so +- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libUil.so .) +-endif +-if LibtoolStatic +- -rm -f $(DESTDIR)$(exec_prefix)/lib/libUil.a +- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libUil.a .) +-endif +-endif + endif diff --git a/x11/lesstif12/patches/patch-bi b/x11/lesstif12/patches/patch-bi new file mode 100644 index 00000000000..a9999457c96 --- /dev/null +++ b/x11/lesstif12/patches/patch-bi @@ -0,0 +1,38 @@ +$NetBSD: patch-bi,v 1.1 2002/12/05 18:50:07 drochner Exp $ + +--- lib/Uil/Makefile.am.orig Wed May 9 16:39:14 2001 ++++ lib/Uil/Makefile.am +@@ -4,7 +4,9 @@ + MAINTAINERCLEANFILES=Makefile.in + + libUil_la_LDFLAGS= -version-info 1:2 ++if Version_1_2 + libdir = $(exec_prefix)/LessTif/Motif1.2/lib ++endif + + EXTRA_DIST= Uil.c UilData.c uillex.c uilparse.c uilsym.c + +@@ -24,23 +26,4 @@ + libUil_la_SOURCES= Uil.c UilData.c uillex.c uilparse.c uilsym.c + + +-endif +-install-data-hook: libUil.la +-if Version_1_2 +-if LibtoolShared +- -rm -f $(DESTDIR)$(exec_prefix)/lib/libUil.so.1* +- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libUil.so.1* .) +-endif +-if DefaultVersion12 +- -rm -f $(DESTDIR)$(exec_prefix)/lib/libUil.la +- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libUil.la .) +-if LibtoolShared +- -rm -f $(DESTDIR)$(exec_prefix)/lib/libUil.so +- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libUil.so .) +-endif +-if LibtoolStatic +- -rm -f $(DESTDIR)$(exec_prefix)/lib/libUil.a +- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libUil.a .) +-endif +-endif + endif diff --git a/x11/lesstif12/patches/patch-bj b/x11/lesstif12/patches/patch-bj new file mode 100644 index 00000000000..c3aa6a2af27 --- /dev/null +++ b/x11/lesstif12/patches/patch-bj @@ -0,0 +1,43 @@ +$NetBSD: patch-bj,v 1.1 2002/12/05 18:50:07 drochner Exp $ + +--- lib/Xm-2.0/Makefile.am.orig Sat May 12 06:35:15 2001 ++++ lib/Xm-2.0/Makefile.am +@@ -4,7 +4,13 @@ + MAINTAINERCLEANFILES=Makefile.in + + libXm_la_LDFLAGS= -version-info 2:0 ++if Version_2_0 ++if DefaultVersion20 ++libdir = $(exec_prefix)/lib ++else + libdir = $(exec_prefix)/LessTif/Motif2.0/lib ++endif ++endif + + # + # Sources in this directory +@@ -91,24 +97,4 @@ + rm $$i; \ + fi ; \ + done +-endif +- +-install-data-hook: libXm.la +-if Version_2_0 +-if LibtoolShared +- -rm -f $(DESTDIR)$(exec_prefix)/lib/libXm.so.2* +- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libXm.so.2* .) +-endif +-if DefaultVersion20 +- -rm -f $(DESTDIR)$(exec_prefix)/lib/libXm.la +- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libXm.la .) +-if LibtoolShared +- -rm -f $(DESTDIR)$(exec_prefix)/lib/libXm.so +- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libXm.so .) +-endif +-if LibtoolStatic +- -rm -f $(DESTDIR)$(exec_prefix)/lib/libXm.a +- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libXm.a .) +-endif +-endif + endif diff --git a/x11/lesstif12/patches/patch-bk b/x11/lesstif12/patches/patch-bk new file mode 100644 index 00000000000..d89572c61e8 --- /dev/null +++ b/x11/lesstif12/patches/patch-bk @@ -0,0 +1,43 @@ +$NetBSD: patch-bk,v 1.1 2002/12/05 18:50:08 drochner Exp $ + +--- lib/Xm-2.1/Makefile.am.orig Sat May 12 06:35:15 2001 ++++ lib/Xm-2.1/Makefile.am +@@ -3,7 +3,13 @@ + # + MAINTAINERCLEANFILES=Makefile.in + ++if Version_2_1 ++if DefaultVersion21 ++libdir = $(exec_prefix)/lib ++else + libdir = $(exec_prefix)/LessTif/Motif2.1/lib ++endif ++endif + libXm_la_LDFLAGS= -version-info 2:1 $(X_LIBS) + + # +@@ -105,24 +111,4 @@ + rm $$i; \ + fi ; \ + done +-endif +- +-install-data-hook: libXm.la +-if Version_2_1 +-if LibtoolShared +- -rm -f $(DESTDIR)$(exec_prefix)/lib/libXm.so.2* +- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libXm.so.2* .) +-endif +-if DefaultVersion21 +- -rm -f $(DESTDIR)$(exec_prefix)/lib/libXm.la +- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libXm.la .) +-if LibtoolShared +- -rm -f $(DESTDIR)$(exec_prefix)/lib/libXm.so +- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libXm.so .) +-endif +-if LibtoolStatic +- -rm -f $(DESTDIR)$(exec_prefix)/lib/libXm.a +- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libXm.a .) +-endif +-endif + endif diff --git a/x11/lesstif12/patches/patch-bl b/x11/lesstif12/patches/patch-bl new file mode 100644 index 00000000000..84fb8133547 --- /dev/null +++ b/x11/lesstif12/patches/patch-bl @@ -0,0 +1,38 @@ +$NetBSD: patch-bl,v 1.1 2002/12/05 18:50:08 drochner Exp $ + +--- lib/Xm/Makefile.am.orig Sat May 12 06:35:15 2001 ++++ lib/Xm/Makefile.am +@@ -30,7 +30,9 @@ + endif + + libXm_la_LDFLAGS= -version-info 1:2 ++if Version_1_2 + libdir = $(exec_prefix)/LessTif/Motif1.2/lib ++endif + + if Version_1_2 + +@@ -52,23 +54,4 @@ + + libXm_la_SOURCES= $(src) $(XDND_SRCS) + +-endif +-install-data-hook: libXm.la +-if Version_1_2 +-if LibtoolShared +- -rm -f $(DESTDIR)$(exec_prefix)/lib/libXm.so.1* +- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libXm.so.1* .) +-endif +-if DefaultVersion12 +- -rm -f $(DESTDIR)$(exec_prefix)/lib/libXm.la +- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libXm.la .) +-if LibtoolShared +- -rm -f $(DESTDIR)$(exec_prefix)/lib/libXm.so +- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libXm.so .) +-endif +-if LibtoolStatic +- -rm -f $(DESTDIR)$(exec_prefix)/lib/libXm.a +- (cd $(DESTDIR)$(exec_prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libXm.a .) +-endif +-endif + endif diff --git a/x11/lesstif12/patches/patch-bm b/x11/lesstif12/patches/patch-bm new file mode 100644 index 00000000000..4de0f72a082 --- /dev/null +++ b/x11/lesstif12/patches/patch-bm @@ -0,0 +1,17 @@ +$NetBSD: patch-bm,v 1.1 2002/12/05 18:50:09 drochner Exp $ + +--- lib/config/Makefile.am.orig Wed Aug 30 09:45:04 2000 ++++ lib/config/Makefile.am +@@ -6,10 +6,10 @@ + + configdir= $(libdir)/X11/config + +-EXTRA_DIST = LessTif.rules LessTif.tmpl host.def Imake.tmpl ++EXTRA_DIST = LessTif.rules LessTif.tmpl LessTif.def Imake.tmpl + + if XIsR6 +-config_DATA= LessTif.rules LessTif.tmpl host.def ++config_DATA= LessTif.rules LessTif.tmpl LessTif.def + else + # so being R5 + config_DATA= Imake.tmpl LessTif.rules LessTif.tmpl diff --git a/x11/lesstif12/patches/patch-bn b/x11/lesstif12/patches/patch-bn new file mode 100644 index 00000000000..ef6a3c6812e --- /dev/null +++ b/x11/lesstif12/patches/patch-bn @@ -0,0 +1,16 @@ +$NetBSD: patch-bn,v 1.1 2002/12/05 18:50:09 drochner Exp $ + +--- scripts/autoconf/Makefile.am.orig Sun Sep 12 07:13:53 1999 ++++ scripts/autoconf/Makefile.am +@@ -5,10 +5,6 @@ + + EXTRA_DIST= ac_find_motif.m4 + +-aclocaldir = @ACLOCALDIR@ +- +-if Aclocal ++aclocaldir = ${prefix}/share/aclocal + + aclocal_DATA = ac_find_motif.m4 +- +-endif |