diff options
| author | jlam <jlam> | 2001-06-30 19:08:21 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2001-06-30 19:08:21 +0000 |
| commit | 18a27525e70bb293431f7d66b91152464dd91498 (patch) | |
| tree | 14500fc61e697f795ae42b50eb1cda1be128fcf7 /x11 | |
| parent | 748105d018e0ace90809bc7737e193d0bbf350c5 (diff) | |
| download | pkgsrc-18a27525e70bb293431f7d66b91152464dd91498.tar.gz | |
Update lesstif and lesstif12 to 0.92.32. Changes from version 0.92.26
include:
Small code fixes to help building on some systems
Use new libtool version 1.4 and automake 1.4-p1
Install more machine-indepedent files in $(prefix)
Diffstat (limited to 'x11')
45 files changed, 573 insertions, 491 deletions
diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile index 020d5326ecb..9f83346c595 100644 --- a/x11/lesstif/Makefile +++ b/x11/lesstif/Makefile @@ -1,31 +1,31 @@ -# $NetBSD: Makefile,v 1.54 2001/02/17 17:06:35 wiz Exp $ -# FreeBSD Id: Makefile,v 1.13 1997/09/08 08:34:13 tg Exp -# +# $NetBSD: Makefile,v 1.55 2001/06/30 19:08:21 jlam Exp $ -COMMENT= API compatible clone of the OSF/Motif toolkit +.include "../../x11/lesstif/Makefile.common" + +COMMENT= API compatible clone of the OSF/Motif toolkit CONFIGURE_ARGS+= --disable-build-12 CONFIGURE_ARGS+= --enable-build-20 +CONFIGURE_ARGS+= --disable-build-21 CONFIGURE_ARGS+= --enable-default-20 DEINSTALL_FILE= ${WRKDIR}/DEINSTALL INSTALL_FILE= ${WRKDIR}/INSTALL +FILES_SUBST= LOCALBASE=${LOCALBASE} +FILES_SUBST+= CP=${CP:Q} +FILES_SUBST+= GREP=${GREP:Q} +FILES_SUBST+= LN=${LN:Q} +FILES_SUBST+= RM=${RM:Q} +FILES_SUBST+= RMDIR=${RMDIR:Q} +FILES_SUBST+= TRUE=${TRUE:Q} +FILES_SUBST_SED= ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/} + pre-install: - ${SED} -e "s,@LOCALBASE@,${LOCALBASE},g" \ - -e "s,@CP@,${CP},g" \ - -e "s,@GREP@,${GREP},g" \ - -e "s,@RM@,${RM},g" \ - -e "s,@RMDIR@,${RMDIR},g" \ - -e "s,@TRUE@,${TRUE},g" \ - < ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} - ${SED} -e "s,@LOCALBASE@,${LOCALBASE},g" \ - -e "s,@CP@,${CP},g" \ - -e "s,@GREP@,${GREP},g" \ - -e "s,@LN@,${LN},g" \ - < ${PKGDIR}/INSTALL > ${INSTALL_FILE} + ${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} + ${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE} post-install: PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL -.include "../../x11/lesstif/Makefile.common" +.include "../../mk/bsd.pkg.mk" diff --git a/x11/lesstif/Makefile.common b/x11/lesstif/Makefile.common index ffad00672c0..af1c0412724 100644 --- a/x11/lesstif/Makefile.common +++ b/x11/lesstif/Makefile.common @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.common,v 1.9 2001/05/12 04:32:34 jlam Exp $ +# $NetBSD: Makefile.common,v 1.10 2001/06/30 19:08:21 jlam Exp $ DISTNAME= lesstif-${LESSTIF_VERSION} -LESSTIF_VERSION= 0.92.26 +LESSTIF_VERSION= 0.92.32 CATEGORIES= x11 MASTER_SITES= ftp://ftp.hungry.com/pub/hungry/lesstif/srcdist/ \ ftp://ftp.unicamp.br/pub/X11/lesstif/srcdist/ \ @@ -18,12 +18,14 @@ CONFLICTS+= openmotif-[0-9]* BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf BUILD_DEPENDS+= automake-1.4:../../devel/automake +USE_BUILDLINK_ONLY= # defined USE_X11BASE= # defined USE_GMAKE= # defined USE_LIBTOOL= # defined -LTCONFIG_OVERRIDE+= ${WRKSRC}/ltconfig -LTCONFIG_OVERRIDE+= ${WRKSRC}/Xlt/ltconfig -LTCONFIG_OVERRIDE+= ${WRKSRC}/Xbae/ltconfig +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +LIBTOOL_OVERRIDE+= ${WRKSRC}/Xbae/libtool +LIBTOOL_OVERRIDE+= ${WRKSRC}/Xlt/libtool +LIBTOOL_OVERRIDE+= ${WRKSRC}/test/libtool GNU_CONFIGURE= # defined CONFIGURE_ARGS+= --enable-production --disable-debug --disable-verbose @@ -39,18 +41,36 @@ DISTINFO_FILE= ${.CURDIR}/../../x11/lesstif/distinfo PATCHDIR= ${.CURDIR}/../../x11/lesstif/patches post-extract: - cd ${WRKSRC}/lib/config; ${MV} host.def LessTif.def + 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 . lib/Xlt lib/Xbae test ; do \ - cd ${WRKSRC}/$$dir \ - && ${LOCALBASE}/bin/libtoolize --force \ - && ${LOCALBASE}/bin/aclocal \ - && ${LOCALBASE}/bin/autoheader \ - && ${LOCALBASE}/bin/automake -a -i \ - && ${LOCALBASE}/bin/autoconf; \ + for dir in . lib/Xbae lib/Xlt test ; do \ + cd ${WRKSRC}/$${dir}; \ + ${LOCALBASE}/bin/libtoolize --force; \ + ${LOCALBASE}/bin/aclocal; \ + ${LOCALBASE}/bin/autoheader; \ + ${LOCALBASE}/bin/automake -a --foreign -i; \ + ${LOCALBASE}/bin/autoconf; \ done - -.include "../../mk/bsd.pkg.mk" diff --git a/x11/lesstif/distinfo b/x11/lesstif/distinfo index 11f906a5284..52d6c8f4cb9 100644 --- a/x11/lesstif/distinfo +++ b/x11/lesstif/distinfo @@ -1,44 +1,44 @@ -$NetBSD: distinfo,v 1.2 2001/05/21 05:27:59 tron Exp $ +$NetBSD: distinfo,v 1.3 2001/06/30 19:08:21 jlam Exp $ -SHA1 (lesstif-0.92.26.tar.gz) = e25dddd6fbea3501469449f0df2f6916aeed58d5 -Size (lesstif-0.92.26.tar.gz) = 4038456 bytes -SHA1 (patch-aa) = b228b0230dbbd00018ea26e22aa045a5fe13be80 -SHA1 (patch-ab) = 3f207332a018bed858b7c77362b69fba18b681fa +SHA1 (lesstif-0.92.32.tar.gz) = c44a01ac3d1837d4dc02067824e1371c156a2922 +Size (lesstif-0.92.32.tar.gz) = 4278704 bytes +SHA1 (patch-aa) = f1033a1fd3f365879e70161f2d7a5125f23ebd65 +SHA1 (patch-ab) = 2bab59572723690be140b65e20ae4a291bf65e4b SHA1 (patch-ac) = 834109cc4e49713c5a39586968ce2def35507fb2 -SHA1 (patch-ad) = 586eb3b83365d6f27915eb6bb87a55b010d4322e -SHA1 (patch-ae) = 7ecfb23a05fd6d828eda0ce026de63481b726280 -SHA1 (patch-af) = 57d083d3f77d5518399d7b0621e7da93a4570c51 -SHA1 (patch-ag) = 0e11c93c8d700ef9e5da52f5602eb1c14882697d -SHA1 (patch-ah) = 9e9f80ffdd7180a21fbd166c3a3f4f3dfba0310c -SHA1 (patch-ai) = ad879586845c30c30a1f0146d8a5eca7856e0c33 -SHA1 (patch-aj) = ecc5c6f37cae8189eb71c522a07c4e2bde901390 -SHA1 (patch-ak) = 49b6b1ceff9c9be44f5b2f6eb999068db9f59d7c -SHA1 (patch-al) = 835e663d0895a6fa751de6de5148dc5cb160fcc3 -SHA1 (patch-am) = bd584b9ad3432da5cf708bd3604668aaa130c297 -SHA1 (patch-an) = e1cca38f4c1cc902fbd9a6c226f37e5963ed9523 -SHA1 (patch-ao) = 5c4eb58e1b51b6bb82598af16b5888ae7359a358 -SHA1 (patch-ap) = 2400673e5c36746667c2e5b117d4904764f3b5a4 -SHA1 (patch-aq) = 90c1845d113bd178ddf80d253006956dd1ec6eed -SHA1 (patch-ar) = 717b019d0ec3160b646c0ec0d0300d1047c3dd65 +SHA1 (patch-ad) = c211de805bc9bc8ce10de4bdb13a6097dde36b0f +SHA1 (patch-ae) = 69156439c0cc057b89711012a6bdc297b41ee6f3 +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) = 0f6b7edb3149ab27b74e6c13c9251182e510cccd +SHA1 (patch-ar) = b7a7b175ce537adce6edcde425c1930c34d0fe95 SHA1 (patch-as) = af297dc810d427de5aef647a22efc5d9ce17cfeb -SHA1 (patch-at) = d3de0d31f12733a10691ebf5a5ec6e7bd0d7c237 +SHA1 (patch-at) = 19cb649b965400a8ad64513558092038421c3240 SHA1 (patch-au) = 2704d1ce8fe3852901600a7ab86161d54e72c1a6 -SHA1 (patch-av) = b0584ace40801fef76ecfba258a7e2a92220cb4a -SHA1 (patch-aw) = db11e21b7bf10f1f86e34cc96caa728cfa9eb818 -SHA1 (patch-ax) = b2e3a19e35c0043c37ec69b1f6a5bc006688e526 -SHA1 (patch-ay) = d1d7c07cf0cd3299557fb2c3bccaaf9ec6bb9360 -SHA1 (patch-az) = ab92d02f6f6573fb39f688070d08fea2cddcfb01 -SHA1 (patch-ba) = 29bb50d244c91879ce79cbc74ae183243c60525e -SHA1 (patch-bb) = 8f1c103f3f2a2ac7750588636e020085ba18c547 -SHA1 (patch-bc) = c1283b67a78f96f249f825c668ed07b80b3cd8a9 -SHA1 (patch-bd) = 22f4460ceace5c7f32205deaa2a17c4ec8305916 -SHA1 (patch-be) = 6265b1d6ead2bc3de4f6fd44d13d74ff0dde7c0a -SHA1 (patch-bf) = 3da4936f899e604a6a9e01019323bac93225331e -SHA1 (patch-bg) = 8e02c33c38fb3041af633d64ea436d4918b1285a -SHA1 (patch-bh) = 07ff45a768308d09e71e990c93df37fc583d1599 -SHA1 (patch-bi) = 7899f712bc7c516080e158199b8c0256c71cc963 -SHA1 (patch-bj) = 0e14edc5387a028c0204c0a7c9c1879a6b27f2ab -SHA1 (patch-bk) = 609496fb527e0fe3c0519cda838e29c076ba3808 -SHA1 (patch-bl) = 6149c9940d97ffd3575d7147d1a06aca5dfd6cfc +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) = 1b5f7aa969db7abd12844b36fa5dd531aed53cbe +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/lesstif/patches/patch-aa b/x11/lesstif/patches/patch-aa index 330417f515c..b772000706b 100644 --- a/x11/lesstif/patches/patch-aa +++ b/x11/lesstif/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.17 2001/03/28 14:57:55 drochner Exp $ +$NetBSD: patch-aa,v 1.18 2001/06/30 19:08:22 jlam Exp $ ---- Makefile.am.orig Fri Dec 22 13:25:49 2000 -+++ Makefile.am Wed Mar 28 13:44:48 2001 -@@ -3,25 +3,32 @@ +--- Makefile.am.orig Sat Jun 2 08:28:36 2001 ++++ Makefile.am +@@ -3,7 +3,11 @@ # MAINTAINERCLEANFILES=Makefile.in configure libtool config.guess config.sub ltconfig ltmain.sh aclocal.m4 config.h.in install-sh missing mkinstalldirs release-notes.html release-notes.txt @@ -14,36 +14,29 @@ $NetBSD: patch-aa,v 1.17 2001/03/28 14:57:55 drochner Exp $ DIST_SUBDIRS = include scripts lib clients doc test - AUTOMAKE_OPTIONS = 1.4 - -+EXTRA_DIST= acconfig.h configure \ -+ BUG-REPORTING CREDITS KNOWN_BUGS RELEASE-POLICY NOTES -+ - # - # Install some information files - # +@@ -15,13 +19,16 @@ # Lets put the informational stuff in a sub directory to avoid # poluting /usr/local for default installs. # --rootdir= $(exec_prefix)/LessTif -+# Only install the documentation if installing 2.0-compatible libraries. -+# +-rootdir= $(prefix)/LessTif +if Version_2_0 +rootdir= $(docdir) root_DATA= AUTHORS BUG-REPORTING COPYING COPYING.LIB CREDITS \ KNOWN_BUGS README RELEASE-POLICY release-notes.txt ++endif + + EXTRA_DIST= acconfig.h configure \ + BUG-REPORTING CREDITS KNOWN_BUGS RELEASE-POLICY NOTES --EXTRA_DIST= acconfig.h configure \ -- BUG-REPORTING CREDITS KNOWN_BUGS RELEASE-POLICY NOTES -- ++if Version_2_0 @MAINT@changelog: - @MAINT@ @ cvs -Q -z9 log -rrelease_@MAJOR_VERSION@_@MINOR_VERSION@_@PICO_VERSION@: \ + @MAINT@ @ (cd $(srcdir); cvs -Q -z9 log -rrelease_@MAJOR_VERSION@_@MINOR_VERSION@_@PICO_VERSION@: \ @MAINT@ acconfig.h acinclude.m4 configure.in Makefile.am \ @@ -34,7 +41,6 @@ - @MAINT@ doc/lessdox \ - @MAINT@ | $(srcdir)/scripts/parselog >ChangeLog + @MAINT@ doc/lessdox ) \ + @MAINT@ | $(srcdir)/scripts/parselog release_@MAJOR_VERSION@_@MINOR_VERSION@_@PICO_VERSION@ >$(srcdir)/ChangeLog --htmldir= $(exec_prefix)/LessTif/doc +-htmldir= $(prefix)/LessTif/doc html_DATA= release-notes.html all-local: BUG-REPORTING diff --git a/x11/lesstif/patches/patch-ab b/x11/lesstif/patches/patch-ab index b38c142b367..97c97db941b 100644 --- a/x11/lesstif/patches/patch-ab +++ b/x11/lesstif/patches/patch-ab @@ -1,14 +1,14 @@ -$NetBSD: patch-ab,v 1.13 2001/03/28 14:57:55 drochner Exp $ +$NetBSD: patch-ab,v 1.14 2001/06/30 19:08:22 jlam Exp $ ---- clients/Motif-1.2/mwm/Makefile.am.orig Mon Jan 1 19:05:42 2001 -+++ clients/Motif-1.2/mwm/Makefile.am Wed Mar 28 13:49:40 2001 +--- 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 -+bindir= $(prefix)/LessTif/Motif1.2/bin - endif --bindir = $(prefix)/LessTif/Motif1.2/bin +-endif + bindir = $(exec_prefix)/LessTif/Motif1.2/bin ++endif MAINTAINERCLEANFILES=Makefile.in mwmlex.c mwmparse.c mwmparse.h @@ -35,8 +35,8 @@ $NetBSD: patch-ab,v 1.13 2001/03/28 14:57:55 drochner Exp $ - -install-data-hook: -if DefaultVersion12 -- -rm -f $(DESTDIR)$(prefix)/bin/$(bin_PROGRAMS) -- (cd $(DESTDIR)$(prefix)/bin && $(LN_S) ../LessTif/Motif1.2/bin/$(bin_PROGRAMS) .) +- -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: diff --git a/x11/lesstif/patches/patch-ac b/x11/lesstif/patches/patch-ac index f669a76fa89..6b26b60792e 100644 --- a/x11/lesstif/patches/patch-ac +++ b/x11/lesstif/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.12 2000/12/22 17:26:18 jlam Exp $ +$NetBSD: patch-ac,v 1.13 2001/06/30 19:08:22 jlam Exp $ --- clients/Motif-1.2/mwm/system.mwmrc.orig Sun Jan 16 06:06:11 2000 +++ clients/Motif-1.2/mwm/system.mwmrc diff --git a/x11/lesstif/patches/patch-ad b/x11/lesstif/patches/patch-ad index 17cc75dc2dd..6395ba060e9 100644 --- a/x11/lesstif/patches/patch-ad +++ b/x11/lesstif/patches/patch-ad @@ -1,14 +1,14 @@ -$NetBSD: patch-ad,v 1.15 2000/12/22 17:26:19 jlam Exp $ +$NetBSD: patch-ad,v 1.16 2001/06/30 19:08:23 jlam Exp $ ---- clients/Motif-1.2/uil/Makefile.am.orig Sat Dec 9 12:11:14 2000 +--- 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 -+bindir= $(prefix)/LessTif/Motif1.2/bin - endif --bindir = $(prefix)/LessTif/Motif1.2/bin +-endif + bindir = $(exec_prefix)/LessTif/Motif1.2/bin ++endif MAINTAINERCLEANFILES=Makefile.in lex.c yacc.c yacc.h @@ -19,6 +19,6 @@ $NetBSD: patch-ad,v 1.15 2000/12/22 17:26:19 jlam Exp $ - -install-data-hook: -if DefaultVersion12 -- -rm -f $(DESTDIR)$(prefix)/bin/$(bin_PROGRAMS) -- (cd $(DESTDIR)$(prefix)/bin && $(LN_S) ../LessTif/Motif1.2/bin/$(bin_PROGRAMS) .) +- -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/lesstif/patches/patch-ae b/x11/lesstif/patches/patch-ae index 6db1c13b582..3e4dd446c14 100644 --- a/x11/lesstif/patches/patch-ae +++ b/x11/lesstif/patches/patch-ae @@ -1,14 +1,14 @@ -$NetBSD: patch-ae,v 1.15 2000/12/22 17:26:19 jlam Exp $ +$NetBSD: patch-ae,v 1.16 2001/06/30 19:08:23 jlam Exp $ ---- clients/Motif-1.2/xmbind/Makefile.am.orig Fri Nov 24 09:58:21 2000 +--- clients/Motif-1.2/xmbind/Makefile.am.orig Tue May 1 08:37:20 2001 +++ clients/Motif-1.2/xmbind/Makefile.am @@ -4,8 +4,8 @@ if Version_1_2 bin_PROGRAMS= xmbind -+bindir= $(prefix)/LessTif/Motif1.2/bin - endif --bindir = $(prefix)/LessTif/Motif1.2/bin +-endif + bindir = $(exec_prefix)/LessTif/Motif1.2/bin ++endif MAINTAINERCLEANFILES=Makefile.in @@ -19,6 +19,6 @@ $NetBSD: patch-ae,v 1.15 2000/12/22 17:26:19 jlam Exp $ - -install-data-hook: -if DefaultVersion12 -- -rm -f $(DESTDIR)$(prefix)/bin/$(bin_PROGRAMS) -- (cd $(DESTDIR)$(prefix)/bin && $(LN_S) ../LessTif/Motif1.2/bin/$(bin_PROGRAMS) .) +- -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/lesstif/patches/patch-af b/x11/lesstif/patches/patch-af index 66ec0ac579f..2414daedafa 100644 --- a/x11/lesstif/patches/patch-af +++ b/x11/lesstif/patches/patch-af @@ -1,6 +1,6 @@ -$NetBSD: patch-af,v 1.13 2000/12/22 17:26:19 jlam Exp $ +$NetBSD: patch-af,v 1.14 2001/06/30 19:08:23 jlam Exp $ ---- clients/Motif-2.0/mwm/Makefile.am.orig Tue Dec 19 05:47:42 2000 +--- 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 @@ @@ -8,20 +8,23 @@ $NetBSD: patch-af,v 1.13 2000/12/22 17:26:19 jlam Exp $ bin_PROGRAMS= mwm -endif +if DefaultVersion20 -+bindir = $(prefix)/bin ++bindir = $(exec_prefix)/bin +else - bindir = $(prefix)/LessTif/Motif2.0/bin + bindir = $(exec_prefix)/LessTif/Motif2.0/bin +endif +endif MAINTAINERCLEANFILES=Makefile.in mwmlex.c mwmparse.c mwmparse.h -@@ -59,10 +63,12 @@ - LDADD= ../../../lib/Xm-2.0/libXm.la \ - $(X_LIBS) -lXt $(X_PRE_LIBS) -lXext -lX11 $(X_EXTRA_LIBS) +@@ -34,6 +38,7 @@ + # non-local stuff + BUILT_SOURCES = $(HDRS_1_2) $(SRCS_1_2) $(mwmd_DATA) Mwm.ad +if Version_2_0 - appdir= $(libdir)/X11/app-defaults + 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 @@ -36,8 +39,8 @@ $NetBSD: patch-af,v 1.13 2000/12/22 17:26:19 jlam Exp $ - -install-data-hook: -if DefaultVersion20 -- -rm -f $(DESTDIR)$(prefix)/bin/$(bin_PROGRAMS) -- (cd $(DESTDIR)$(prefix)/bin && $(LN_S) ../LessTif/Motif2.0/bin/$(bin_PROGRAMS) .) +- -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: diff --git a/x11/lesstif/patches/patch-ag b/x11/lesstif/patches/patch-ag index d435d3e2c45..1edd053b8c0 100644 --- a/x11/lesstif/patches/patch-ag +++ b/x11/lesstif/patches/patch-ag @@ -1,19 +1,19 @@ -$NetBSD: patch-ag,v 1.12 2000/12/22 17:26:19 jlam Exp $ +$NetBSD: patch-ag,v 1.13 2001/06/30 19:08:23 jlam Exp $ ---- clients/Motif-2.0/uil/Makefile.am.orig Thu Dec 7 04:12:29 2000 +--- 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 --endif - +if DefaultVersion20 -+bindir = $(prefix)/bin ++bindir = $(exec_prefix)/bin +else - bindir = $(prefix)/LessTif/Motif2.0/bin -+endif ++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 @@ -24,6 +24,6 @@ $NetBSD: patch-ag,v 1.12 2000/12/22 17:26:19 jlam Exp $ - -install-data-hook: -if DefaultVersion20 -- -rm -f $(DESTDIR)$(prefix)/bin/$(bin_PROGRAMS) -- (cd $(DESTDIR)$(prefix)/bin && $(LN_S) ../LessTif/Motif2.0/bin/$(bin_PROGRAMS) .) +- -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/lesstif/patches/patch-ah b/x11/lesstif/patches/patch-ah index b378c352a87..e55519dd5fd 100644 --- a/x11/lesstif/patches/patch-ah +++ b/x11/lesstif/patches/patch-ah @@ -1,6 +1,6 @@ -$NetBSD: patch-ah,v 1.13 2000/12/22 17:26:19 jlam Exp $ +$NetBSD: patch-ah,v 1.14 2001/06/30 19:08:23 jlam Exp $ ---- clients/Motif-2.0/xmbind/Makefile.am.orig Fri Nov 24 09:58:21 2000 +--- 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 @@ @@ -8,9 +8,9 @@ $NetBSD: patch-ah,v 1.13 2000/12/22 17:26:19 jlam Exp $ bin_PROGRAMS= xmbind -endif +if DefaultVersion20 -+bindir = $(prefix)/bin ++bindir = $(exec_prefix)/bin +else - bindir = $(prefix)/LessTif/Motif2.0/bin + bindir = $(exec_prefix)/LessTif/Motif2.0/bin +endif +endif @@ -23,6 +23,6 @@ $NetBSD: patch-ah,v 1.13 2000/12/22 17:26:19 jlam Exp $ - -install-data-hook: -if DefaultVersion20 -- -rm -f $(DESTDIR)$(prefix)/bin/$(bin_PROGRAMS) -- (cd $(DESTDIR)$(prefix)/bin && $(LN_S) ../LessTif/Motif2.0/bin/$(bin_PROGRAMS) .) +- -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/lesstif/patches/patch-ai b/x11/lesstif/patches/patch-ai index 3e7ae5989b4..5f380b8901d 100644 --- a/x11/lesstif/patches/patch-ai +++ b/x11/lesstif/patches/patch-ai @@ -1,6 +1,6 @@ -$NetBSD: patch-ai,v 1.15 2000/12/22 17:26:19 jlam Exp $ +$NetBSD: patch-ai,v 1.16 2001/06/30 19:08:23 jlam Exp $ ---- clients/Motif-2.1/mwm/Makefile.am.orig Tue Dec 19 05:47:42 2000 +--- 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 @@ @@ -8,20 +8,23 @@ $NetBSD: patch-ai,v 1.15 2000/12/22 17:26:19 jlam Exp $ bin_PROGRAMS= mwm -endif +if DefaultVersion21 -+bindir = $(prefix)/bin ++bindir = $(exec_prefix)/bin +else - bindir = $(prefix)/LessTif/Motif2.1/bin + bindir = $(exec_prefix)/LessTif/Motif2.1/bin +endif +endif MAINTAINERCLEANFILES=Makefile.in mwmlex.c mwmparse.c mwmparse.h -@@ -72,10 +76,12 @@ - LDADD= ../../../lib/Xm-2.1/libXm.la \ - $(X_LIBS) $(LIBXP) -lXt $(X_PRE_LIBS) -lXext -lX11 ${X_EXTRA_LIBS} +@@ -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 - appdir= $(libdir)/X11/app-defaults + 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 @@ -36,8 +39,8 @@ $NetBSD: patch-ai,v 1.15 2000/12/22 17:26:19 jlam Exp $ - -install-data-hook: -if DefaultVersion21 -- -rm -f $(DESTDIR)$(prefix)/bin/$(bin_PROGRAMS) -- (cd $(DESTDIR)$(prefix)/bin && $(LN_S) ../LessTif/Motif2.1/bin/$(bin_PROGRAMS) .) +- -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: diff --git a/x11/lesstif/patches/patch-aj b/x11/lesstif/patches/patch-aj index cbe5f261109..8c6b7a32aaf 100644 --- a/x11/lesstif/patches/patch-aj +++ b/x11/lesstif/patches/patch-aj @@ -1,6 +1,6 @@ -$NetBSD: patch-aj,v 1.11 2000/12/22 17:26:19 jlam Exp $ +$NetBSD: patch-aj,v 1.12 2001/06/30 19:08:24 jlam Exp $ ---- clients/Motif-2.1/uil/Makefile.am.orig Thu Dec 7 04:12:29 2000 +--- 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 @@ -8,9 +8,9 @@ $NetBSD: patch-aj,v 1.11 2000/12/22 17:26:19 jlam Exp $ noinst_PROGRAMS = newuil -endif +if DefaultVersion21 -+bindir = $(prefix)/bin ++bindir = $(exec_prefix)/bin +else - bindir = $(prefix)/LessTif/Motif2.1/bin + bindir = $(exec_prefix)/LessTif/Motif2.1/bin +endif +endif @@ -23,7 +23,7 @@ $NetBSD: patch-aj,v 1.11 2000/12/22 17:26:19 jlam Exp $ - -install-data-hook: -if DefaultVersion21 -- -rm -f $(DESTDIR)$(prefix)/bin/$(bin_PROGRAMS) -- (cd $(DESTDIR)$(prefix)/bin && $(LN_S) ../LessTif/Motif2.1/bin/$(bin_PROGRAMS) .) +- -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/lesstif/patches/patch-ak b/x11/lesstif/patches/patch-ak index 696d57930df..5b01bf63fa4 100644 --- a/x11/lesstif/patches/patch-ak +++ b/x11/lesstif/patches/patch-ak @@ -1,6 +1,6 @@ -$NetBSD: patch-ak,v 1.11 2000/12/22 17:26:19 jlam Exp $ +$NetBSD: patch-ak,v 1.12 2001/06/30 19:08:24 jlam Exp $ ---- clients/Motif-2.1/xmbind/Makefile.am.orig Fri Nov 24 09:58:22 2000 +--- 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 @@ @@ -8,9 +8,9 @@ $NetBSD: patch-ak,v 1.11 2000/12/22 17:26:19 jlam Exp $ bin_PROGRAMS= xmbind -endif +if DefaultVersion21 -+bindir = $(prefix)/bin ++bindir = $(exec_prefix)/bin +else - bindir = $(prefix)/LessTif/Motif2.1/bin + bindir = $(exec_prefix)/LessTif/Motif2.1/bin +endif +endif @@ -23,7 +23,7 @@ $NetBSD: patch-ak,v 1.11 2000/12/22 17:26:19 jlam Exp $ - -install-data-hook: -if DefaultVersion21 -- -rm -f $(DESTDIR)$(prefix)/bin/$(bin_PROGRAMS) -- (cd $(DESTDIR)$(prefix)/bin && $(LN_S) ../LessTif/Motif2.1/bin/$(bin_PROGRAMS) .) +- -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/lesstif/patches/patch-al b/x11/lesstif/patches/patch-al index 614a846928d..efaabcbfb94 100644 --- a/x11/lesstif/patches/patch-al +++ b/x11/lesstif/patches/patch-al @@ -1,21 +1,15 @@ -$NetBSD: patch-al,v 1.10 2000/12/22 17:26:19 jlam Exp $ +$NetBSD: patch-al,v 1.11 2001/06/30 19:08:24 jlam Exp $ ---- configure.in.orig Thu Dec 21 07:37:01 2000 +--- configure.in.orig Sat Jun 2 08:39:46 2001 +++ configure.in -@@ -656,6 +656,17 @@ +@@ -710,6 +710,11 @@ dnl AC_SUBST(libdir) AC_SUBST(bindir) +docdir='${prefix}/share/doc/lesstif' +htmldir='${prefix}/share/doc/html/lesstif' -+man1dir='${mandir}/man1' -+man3dir='${mandir}/man3' -+man5dir='${mandir}/man5' +AC_SUBST(docdir) +AC_SUBST(htmldir) -+AC_SUBST(man1dir) -+AC_SUBST(man3dir) -+AC_SUBST(man5dir) + dnl We might have a bit too much redundant data here, but who cares ... dnl AC_SUBST(version) diff --git a/x11/lesstif/patches/patch-am b/x11/lesstif/patches/patch-am index 29663dee8c0..550db644a9e 100644 --- a/x11/lesstif/patches/patch-am +++ b/x11/lesstif/patches/patch-am @@ -1,13 +1,13 @@ -$NetBSD: patch-am,v 1.9 2000/12/22 17:26:19 jlam Exp $ +$NetBSD: patch-am,v 1.10 2001/06/30 19:08:24 jlam Exp $ ---- doc/Makefile.am.orig Fri Jan 7 11:57:44 2000 +--- doc/Makefile.am.orig Tue May 1 08:37:20 2001 +++ doc/Makefile.am @@ -6,7 +6,7 @@ SUBDIRS = www.lesstif.org lessdox --rootdir= $(exec_prefix)/LessTif/doc +-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 INSTALL.html + UIL.txt XmStrings.txt thread.html diff --git a/x11/lesstif/patches/patch-an b/x11/lesstif/patches/patch-an index 3b0b32ce855..3975d7cccbe 100644 --- a/x11/lesstif/patches/patch-an +++ b/x11/lesstif/patches/patch-an @@ -1,22 +1,21 @@ -$NetBSD: patch-an,v 1.12 2001/03/28 14:57:55 drochner Exp $ +$NetBSD: patch-an,v 1.13 2001/06/30 19:08:24 jlam Exp $ ---- doc/lessdox/clients/Makefile.am.orig Fri Jan 19 13:47:10 2001 -+++ doc/lessdox/clients/Makefile.am Wed Mar 28 13:54:39 2001 -@@ -6,17 +6,10 @@ +--- 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= $(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 -- - man1_DATA= mwm.1 xmbind.1 lesstif.1 uil.1 xbae.1 xlt.1 +-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= $(exec_prefix)/LessTif/doc/html +-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/lesstif/patches/patch-ao b/x11/lesstif/patches/patch-ao index 4ea928007e3..1d5b07e17db 100644 --- a/x11/lesstif/patches/patch-ao +++ b/x11/lesstif/patches/patch-ao @@ -1,22 +1,21 @@ -$NetBSD: patch-ao,v 1.9 2000/12/22 17:26:19 jlam Exp $ +$NetBSD: patch-ao,v 1.10 2001/06/30 19:08:24 jlam Exp $ ---- doc/lessdox/functions/Makefile.am.orig Wed Dec 20 04:34:35 2000 +--- doc/lessdox/functions/Makefile.am.orig Tue May 1 08:37:20 2001 +++ doc/lessdox/functions/Makefile.am -@@ -6,17 +6,10 @@ +@@ -6,7 +6,6 @@ EXTRA_DIST = $(man1_DATA) $(man3_DATA) $(man5_DATA) 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 -- - man1_DATA= +-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= $(exec_prefix)/LessTif/doc/html +-htmldir= $(prefix)/LessTif/doc/html html_DATA= ${man1_DATA:.1=.html} ${man3_DATA:.3=.html} \ ${man5_DATA:.5=.html} diff --git a/x11/lesstif/patches/patch-ap b/x11/lesstif/patches/patch-ap index 052f1412de6..e8d1160da94 100644 --- a/x11/lesstif/patches/patch-ap +++ b/x11/lesstif/patches/patch-ap @@ -1,20 +1,16 @@ -$NetBSD: patch-ap,v 1.8 2000/12/22 17:26:19 jlam Exp $ +$NetBSD: patch-ap,v 1.9 2001/06/30 19:08:24 jlam Exp $ ---- doc/lessdox/widgets/Makefile.am.orig Wed Dec 20 04:34:35 2000 +--- doc/lessdox/widgets/Makefile.am.orig Fri Mar 30 02:49:10 2001 +++ doc/lessdox/widgets/Makefile.am -@@ -6,11 +6,6 @@ +@@ -6,7 +6,6 @@ EXTRA_DIST = $(man1_DATA) $(man3_DATA) $(man5_DATA) SUFFIXES= .1 .3 .5 .html -mandir= $(prefix)/LessTif/doc/man --man1dir= $(prefix)/LessTif/doc/man/man1 --man3dir= $(prefix)/LessTif/doc/man/man3 --man5dir= $(prefix)/LessTif/doc/man/man5 -- - man1_DATA= - man3_DATA= \ - XmClipboard.3 LessTifInternals.3 \ -@@ -45,8 +40,6 @@ + man1dir= $(prefix)/man/man1 + man3dir= $(prefix)/man/man3 + man5dir= $(prefix)/man/man5 +@@ -40,8 +39,6 @@ man5_DATA= @@ -23,11 +19,14 @@ $NetBSD: patch-ap,v 1.8 2000/12/22 17:26:19 jlam Exp $ html_DATA= ${man1_DATA:.1=.html} ${man3_DATA:.3=.html} \ ${man5_DATA:.5=.html} -@@ -71,5 +64,5 @@ - # 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. - # +@@ -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 -+#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/lesstif/patches/patch-aq b/x11/lesstif/patches/patch-aq index 744c2801c22..fd082ec53bd 100644 --- a/x11/lesstif/patches/patch-aq +++ b/x11/lesstif/patches/patch-aq @@ -1,30 +1,30 @@ -$NetBSD: patch-aq,v 1.10 2001/03/28 14:57:55 drochner Exp $ +$NetBSD: patch-aq,v 1.11 2001/06/30 19:08:24 jlam Exp $ ---- doc/www.lesstif.org/Makefile.am.orig Sat Mar 10 02:54:19 2001 -+++ doc/www.lesstif.org/Makefile.am Wed Mar 28 14:16:48 2001 +--- doc/www.lesstif.org/Makefile.am.orig Wed May 9 08:38:22 2001 ++++ doc/www.lesstif.org/Makefile.am @@ -13,8 +13,7 @@ # Lets put the informational stuff in a sub directory to avoid # polluting /usr/local for default installs. # --docdir= $(exec_prefix)/LessTif/doc --doc_DATA= Advocacy.html BUG-HUNTING.html COPYING.LIB.html FAQ.html \ -+html_DATA= Advocacy.html BUG-HUNTING.html COPYING.LIB.html FAQ.html \ - INSTALL.html PROGRAMMING_TIPS.html Xbae.html Xlt.html \ - apps.html bugs.html cdrom.html core.html \ - cvs.html download.html feedback.html future.html \ -@@ -25,7 +24,7 @@ - versions.html web_button.html +-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 \ +@@ -31,7 +30,7 @@ + bugs_frame.html lists.html \ + cdrom.html mirrors.html - --rootdir= $(exec_prefix)/LessTif +-rootdir= $(prefix)/LessTif +rootdir= $(docdir) root_DATA= Install all-local: FAQ -@@ -37,5 +36,5 @@ +@@ -43,5 +42,5 @@ $(HTML2TEXT) $(srcdir)/INSTALL.html >$@ --root2dir= $(exec_prefix)/LessTif +-root2dir= $(prefix)/LessTif +root2dir= $(docdir) root2_DATA= FAQ diff --git a/x11/lesstif/patches/patch-ar b/x11/lesstif/patches/patch-ar index 014a811b0c4..e57c50f9866 100644 --- a/x11/lesstif/patches/patch-ar +++ b/x11/lesstif/patches/patch-ar @@ -1,12 +1,12 @@ -$NetBSD: patch-ar,v 1.7 2000/12/22 17:26:19 jlam Exp $ +$NetBSD: patch-ar,v 1.8 2001/06/30 19:08:25 jlam Exp $ ---- doc/www.lesstif.org/images/Makefile.am.orig Tue Jul 11 12:26:18 2000 +--- 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= $(exec_prefix)/LessTif/doc/images +-rootdir= $(prefix)/LessTif/doc/images +rootdir= $(htmldir)/images root_DATA= hungry.png \ lesstif-realsmall.png lesstif-small.png lesstif.png \ diff --git a/x11/lesstif/patches/patch-as b/x11/lesstif/patches/patch-as index 0d5886388f9..c8be3043789 100644 --- a/x11/lesstif/patches/patch-as +++ b/x11/lesstif/patches/patch-as @@ -1,4 +1,4 @@ -$NetBSD: patch-as,v 1.7 2000/12/22 17:26:19 jlam Exp $ +$NetBSD: patch-as,v 1.8 2001/06/30 19:08:25 jlam Exp $ --- include/Motif-1.2/Mrm/Makefile.am.orig Wed Oct 11 15:36:14 2000 +++ include/Motif-1.2/Mrm/Makefile.am diff --git a/x11/lesstif/patches/patch-at b/x11/lesstif/patches/patch-at index 1f398696959..1b87bf45335 100644 --- a/x11/lesstif/patches/patch-at +++ b/x11/lesstif/patches/patch-at @@ -1,4 +1,4 @@ -$NetBSD: patch-at,v 1.8 2000/12/22 17:26:19 jlam Exp $ +$NetBSD: patch-at,v 1.9 2001/06/30 19:08:25 jlam Exp $ --- include/Motif-1.2/Xm/Makefile.am.orig Wed Oct 11 15:36:18 2000 +++ include/Motif-1.2/Xm/Makefile.am @@ -19,10 +19,11 @@ $NetBSD: patch-at,v 1.8 2000/12/22 17:26:19 jlam Exp $ xm_HEADERS = $(xm_both_h) # # Note Xm.h is built by configure, therefore it's not necessarily in -@@ -91,17 +90,4 @@ +@@ -90,18 +89,4 @@ + # tree which may be elsewhere. # xm_DATA = Xm.h - +- -else -# -# Not Version_1_2 diff --git a/x11/lesstif/patches/patch-au b/x11/lesstif/patches/patch-au index 2d2f19ca9cc..48622390212 100644 --- a/x11/lesstif/patches/patch-au +++ b/x11/lesstif/patches/patch-au @@ -1,4 +1,4 @@ -$NetBSD: patch-au,v 1.6 2000/12/22 17:26:19 jlam Exp $ +$NetBSD: patch-au,v 1.7 2001/06/30 19:08:25 jlam Exp $ --- include/Motif-1.2/uil/Makefile.am.orig Wed Oct 25 06:16:07 2000 +++ include/Motif-1.2/uil/Makefile.am diff --git a/x11/lesstif/patches/patch-av b/x11/lesstif/patches/patch-av index 3696ae90974..53d272b6ed3 100644 --- a/x11/lesstif/patches/patch-av +++ b/x11/lesstif/patches/patch-av @@ -1,17 +1,13 @@ -$NetBSD: patch-av,v 1.3 2000/12/22 17:26:19 jlam Exp $ +$NetBSD: patch-av,v 1.4 2001/06/30 19:08:25 jlam Exp $ --- include/Motif-2.0/Mrm/Makefile.am.orig Sun Jan 2 08:22:55 2000 +++ include/Motif-2.0/Mrm/Makefile.am -@@ -8,10 +8,14 @@ - # - # Install headers - # --# Lets put the headers in a sub directory to avoid -+# Let's put the headers in a sub directory if not a default install. +@@ -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 = $(includedir)/Mrm ++mrmdir = $(prefix)/include/Mrm +else mrmdir = $(prefix)/LessTif/Motif2.0/include/Mrm +endif diff --git a/x11/lesstif/patches/patch-aw b/x11/lesstif/patches/patch-aw index bb407b2c781..e6012918fad 100644 --- a/x11/lesstif/patches/patch-aw +++ b/x11/lesstif/patches/patch-aw @@ -1,24 +1,20 @@ -$NetBSD: patch-aw,v 1.1 2000/12/22 17:26:20 jlam Exp $ +$NetBSD: patch-aw,v 1.2 2001/06/30 19:08:25 jlam Exp $ --- include/Motif-2.0/Xm/Makefile.am.orig Tue Dec 5 11:19:25 2000 +++ include/Motif-2.0/Xm/Makefile.am -@@ -6,10 +6,13 @@ - # - # Install headers - # --# Lets put the headers in a sub directory to avoid --# poluting /usr/local with more directories for default installs. -+# Let's put the headers in a sub directory if not a default install. +@@ -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= $(includedir)/Xm ++xmdir= $(prefix)/include/Xm +else xmdir= $(prefix)/LessTif/Motif2.0/include/Xm +endif HEADERS1_2 = \ ArrowB.h ArrowBG.h AtomMgr.h \ -@@ -68,9 +71,3 @@ +@@ -68,9 +72,3 @@ rm $$i; \ fi ; \ done diff --git a/x11/lesstif/patches/patch-ax b/x11/lesstif/patches/patch-ax index 9b6f27ce60b..2881498f6ff 100644 --- a/x11/lesstif/patches/patch-ax +++ b/x11/lesstif/patches/patch-ax @@ -1,24 +1,20 @@ -$NetBSD: patch-ax,v 1.1 2000/12/22 17:26:20 jlam Exp $ +$NetBSD: patch-ax,v 1.2 2001/06/30 19:08:25 jlam Exp $ --- include/Motif-2.0/uil/Makefile.am.orig Wed Oct 25 06:16:07 2000 +++ include/Motif-2.0/uil/Makefile.am -@@ -8,10 +8,13 @@ - # - # Install headers - # --# Lets put the headers in a sub directory to avoid --# poluting /usr/local with more directories for default installs. -+# Let's put the headers in a sub directory if not a default install. +@@ -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 = $(includedir)/uil ++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 +32,4 @@ +@@ -29,11 +33,4 @@ fi ; \ done diff --git a/x11/lesstif/patches/patch-ay b/x11/lesstif/patches/patch-ay index 42e00c7d252..b3dc5aca462 100644 --- a/x11/lesstif/patches/patch-ay +++ b/x11/lesstif/patches/patch-ay @@ -1,24 +1,20 @@ -$NetBSD: patch-ay,v 1.1 2000/12/22 17:26:20 jlam Exp $ +$NetBSD: patch-ay,v 1.2 2001/06/30 19:08:25 jlam Exp $ --- include/Motif-2.1/Mrm/Makefile.am.orig Mon Nov 27 05:36:00 2000 +++ include/Motif-2.1/Mrm/Makefile.am -@@ -7,10 +7,13 @@ - # - # Install headers - # --# Lets put the headers in a sub directory to avoid --# poluting /usr/local with more directories for default installs. -+# Let's put the headers in a sub directory if not a default install. +@@ -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 = $(includedir)/Mrm ++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 +36,3 @@ +@@ -33,12 +37,3 @@ done endif diff --git a/x11/lesstif/patches/patch-az b/x11/lesstif/patches/patch-az index 0f6a0a0d8e1..96d74bbbc59 100644 --- a/x11/lesstif/patches/patch-az +++ b/x11/lesstif/patches/patch-az @@ -1,24 +1,20 @@ -$NetBSD: patch-az,v 1.1 2000/12/22 17:26:20 jlam Exp $ +$NetBSD: patch-az,v 1.2 2001/06/30 19:08:26 jlam Exp $ ---- include/Motif-2.1/Xm/Makefile.am.orig Thu Dec 14 16:30:23 2000 +--- include/Motif-2.1/Xm/Makefile.am.orig Sat Dec 23 05:46:22 2000 +++ include/Motif-2.1/Xm/Makefile.am -@@ -6,10 +6,13 @@ - # - # Install headers - # --# Lets put the headers in a sub directory to avoid --# poluting /usr/local with more directories for default installs. -+# Let's put the headers in a sub directory if not a default install. +@@ -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= $(includedir)/Xm ++xmdir= $(prefix)/include/Xm +else xmdir= $(prefix)/LessTif/Motif2.1/include/Xm +endif HEADERS1_2 = \ ArrowB.h ArrowBG.h AtomMgr.h \ -@@ -73,9 +76,3 @@ +@@ -73,9 +77,3 @@ rm $$i; \ fi ; \ done diff --git a/x11/lesstif/patches/patch-ba b/x11/lesstif/patches/patch-ba index 101da3564ae..1a1ccada552 100644 --- a/x11/lesstif/patches/patch-ba +++ b/x11/lesstif/patches/patch-ba @@ -1,24 +1,20 @@ -$NetBSD: patch-ba,v 1.1 2000/12/22 17:26:20 jlam Exp $ +$NetBSD: patch-ba,v 1.2 2001/06/30 19:08:26 jlam Exp $ --- include/Motif-2.1/uil/Makefile.am.orig Wed Dec 6 08:26:37 2000 +++ include/Motif-2.1/uil/Makefile.am -@@ -8,10 +8,13 @@ - # - # Install headers - # --# Lets put the headers in a sub directory to avoid --# poluting /usr/local with more directories for default installs. -+# Let's put the headers in a sub directory if not a default install. +@@ -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 = $(includedir)/uil ++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 +37,4 @@ +@@ -34,11 +38,4 @@ fi ; \ done diff --git a/x11/lesstif/patches/patch-bb b/x11/lesstif/patches/patch-bb index 968db648bd0..526430a8ab9 100644 --- a/x11/lesstif/patches/patch-bb +++ b/x11/lesstif/patches/patch-bb @@ -1,16 +1,58 @@ -$NetBSD: patch-bb,v 1.2 2001/03/28 14:57:55 drochner Exp $ +$NetBSD: patch-bb,v 1.3 2001/06/30 19:08:26 jlam Exp $ ---- lib/Dt/Makefile.am.orig Thu Mar 8 09:25:02 2001 -+++ lib/Dt/Makefile.am Wed Mar 28 14:22:55 2001 -@@ -8,7 +8,11 @@ +--- 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 -+libdir = $(prefix)/lib ++includedir= $(prefix)/include/Dt +else - libdir = $(prefix)/LessTif/Motif2.1/lib + includedir= $(prefix)/LessTif/Motif2.1/include/Dt +endif - lib_LTLIBRARIES= libDtPrint.la ++endif + include_DATA= Print.h + + INCLUDES= -I$(top_srcdir)/lib \ +@@ -37,25 +49,3 @@ - # libDtPrint_la_LIBADD = ../../lib/Xm-2.1/libXm.la + 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/lesstif/patches/patch-bc b/x11/lesstif/patches/patch-bc index d578634e0c0..4a8d1488b76 100644 --- a/x11/lesstif/patches/patch-bc +++ b/x11/lesstif/patches/patch-bc @@ -1,7 +1,7 @@ -$NetBSD: patch-bc,v 1.2 2001/03/28 14:57:55 drochner Exp $ +$NetBSD: patch-bc,v 1.3 2001/06/30 19:08:26 jlam Exp $ ---- lib/Makefile.am.orig Tue Jan 16 13:18:52 2001 -+++ lib/Makefile.am Wed Mar 28 14:31:30 2001 +--- lib/Makefile.am.orig Tue Jan 16 07:18:52 2001 ++++ lib/Makefile.am @@ -4,14 +4,20 @@ MAINTAINERCLEANFILES=Makefile.in diff --git a/x11/lesstif/patches/patch-bd b/x11/lesstif/patches/patch-bd index 4ed016431b3..24939c93290 100644 --- a/x11/lesstif/patches/patch-bd +++ b/x11/lesstif/patches/patch-bd @@ -1,41 +1,43 @@ -$NetBSD: patch-bd,v 1.1 2000/12/22 17:26:20 jlam Exp $ +$NetBSD: patch-bd,v 1.2 2001/06/30 19:08:26 jlam Exp $ ---- lib/Mrm-2.0/Makefile.am.orig Wed Aug 30 12:15:19 2000 +--- lib/Mrm-2.0/Makefile.am.orig Wed May 9 16:41:21 2001 +++ lib/Mrm-2.0/Makefile.am -@@ -45,7 +45,11 @@ - -DX_LIB_PATH=\"@x_libraries@\" \ - -DLESSTIFHOME=\"@prefix@\" +@@ -4,7 +4,13 @@ + MAINTAINERCLEANFILES=Makefile.in + libMrm_la_LDFLAGS= -version-info 2:0 ++if Version_2_0 +if DefaultVersion20 -+libdir = $(prefix)/lib ++libdir = $(exec_prefix)/lib +else - libdir = $(prefix)/LessTif/Motif2.0/lib + libdir = $(exec_prefix)/LessTif/Motif2.0/lib ++endif +endif - lib_LTLIBRARIES= libMrm.la - -@@ -67,24 +71,4 @@ + # + # Sources in this directory +@@ -68,24 +74,4 @@ rm $$i; \ fi ; \ done -endif - --install-data-hook: +-install-data-hook: libMrm.la -if Version_2_0 -if LibtoolShared -- -rm -f $(DESTDIR)$(prefix)/lib/libMrm.so.2* -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libMrm.so.2* .) +- -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)$(prefix)/lib/libMrm.la -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libMrm.la .) +- -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)$(prefix)/lib/libMrm.so -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libMrm.so .) +- -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)$(prefix)/lib/libMrm.a -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libMrm.a .) +- -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/lesstif/patches/patch-be b/x11/lesstif/patches/patch-be index 7ec494c0104..7bf771161c0 100644 --- a/x11/lesstif/patches/patch-be +++ b/x11/lesstif/patches/patch-be @@ -1,41 +1,43 @@ -$NetBSD: patch-be,v 1.1 2000/12/22 17:26:21 jlam Exp $ +$NetBSD: patch-be,v 1.2 2001/06/30 19:08:26 jlam Exp $ ---- lib/Mrm-2.1/Makefile.am.orig Wed Dec 6 10:37:47 2000 +--- lib/Mrm-2.1/Makefile.am.orig Wed May 9 16:41:21 2001 +++ lib/Mrm-2.1/Makefile.am -@@ -52,7 +52,11 @@ - -DX_LIB_PATH=\"@x_libraries@\" \ - -DLESSTIFHOME=\"@prefix@\" +@@ -4,7 +4,13 @@ + MAINTAINERCLEANFILES=Makefile.in + libMrm_la_LDFLAGS= -version-info 2:1 ++if Version_2_1 +if DefaultVersion21 -+libdir = $(prefix)/lib ++libdir = $(exec_prefix)/lib +else - libdir = $(prefix)/LessTif/Motif2.1/lib + libdir = $(exec_prefix)/LessTif/Motif2.1/lib ++endif +endif - lib_LTLIBRARIES= libMrm.la - -@@ -78,24 +82,4 @@ + # + # Sources in this directory +@@ -80,24 +86,4 @@ rm $$i; \ fi ; \ done -endif - --install-data-hook: +-install-data-hook: libMrm.la -if Version_2_1 -if LibtoolShared -- -rm -f $(DESTDIR)$(prefix)/lib/libMrm.so.2* -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libMrm.so.2* .) +- -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)$(prefix)/lib/libMrm.la -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libMrm.la .) +- -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)$(prefix)/lib/libMrm.so -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libMrm.so .) +- -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)$(prefix)/lib/libMrm.a -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libMrm.a .) +- -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/lesstif/patches/patch-bf b/x11/lesstif/patches/patch-bf index 31124b6429e..da078e0e3e7 100644 --- a/x11/lesstif/patches/patch-bf +++ b/x11/lesstif/patches/patch-bf @@ -1,27 +1,38 @@ -$NetBSD: patch-bf,v 1.1 2000/12/22 17:26:21 jlam Exp $ +$NetBSD: patch-bf,v 1.2 2001/06/30 19:08:26 jlam Exp $ ---- lib/Mrm/Makefile.am.orig Sun Oct 8 02:02:21 2000 +--- lib/Mrm/Makefile.am.orig Wed May 9 16:38:00 2001 +++ lib/Mrm/Makefile.am -@@ -25,22 +25,3 @@ +@@ -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: +-endif +-install-data-hook: libMrm.la -if Version_1_2 -if LibtoolShared -- -rm -f $(DESTDIR)$(prefix)/lib/libMrm.so.1* -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libMrm.so.1* .) +- -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)$(prefix)/lib/libMrm.la -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libMrm.la .) +- -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)$(prefix)/lib/libMrm.so -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libMrm.so .) +- -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)$(prefix)/lib/libMrm.a -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libMrm.a .) --endif +- -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/lesstif/patches/patch-bg b/x11/lesstif/patches/patch-bg index 598963bbea4..cfac42e97f1 100644 --- a/x11/lesstif/patches/patch-bg +++ b/x11/lesstif/patches/patch-bg @@ -1,41 +1,43 @@ -$NetBSD: patch-bg,v 1.2 2001/03/28 14:57:55 drochner Exp $ +$NetBSD: patch-bg,v 1.3 2001/06/30 19:08:27 jlam Exp $ ---- lib/Uil-2.0/Makefile.am.orig Tue Jan 16 23:22:14 2001 -+++ lib/Uil-2.0/Makefile.am Wed Mar 28 14:40:59 2001 -@@ -38,7 +38,11 @@ - -I$(top_srcdir)/lib/Uil \ - $(X_CFLAGS) +--- 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 = $(prefix)/lib ++libdir = $(exec_prefix)/lib +else - libdir = $(prefix)/LessTif/Motif2.0/lib + libdir = $(exec_prefix)/LessTif/Motif2.0/lib ++endif +endif - lib_LTLIBRARIES= libUil.la - -@@ -59,24 +63,4 @@ + # + # Sources in this directory +@@ -58,24 +64,4 @@ rm $$i; \ fi ; \ done -endif - --install-data-hook: +-install-data-hook: libUil.la -if Version_2_0 -if LibtoolShared -- -rm -f $(DESTDIR)$(prefix)/lib/libUil.so.2* -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libUil.so.2* .) +- -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)$(prefix)/lib/libUil.la -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libUil.la .) +- -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)$(prefix)/lib/libUil.so -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libUil.so .) +- -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)$(prefix)/lib/libUil.a -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libUil.a .) +- -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/lesstif/patches/patch-bh b/x11/lesstif/patches/patch-bh index 9a6f10c05f8..aba6c6efd43 100644 --- a/x11/lesstif/patches/patch-bh +++ b/x11/lesstif/patches/patch-bh @@ -1,41 +1,43 @@ -$NetBSD: patch-bh,v 1.2 2001/03/28 14:57:55 drochner Exp $ +$NetBSD: patch-bh,v 1.3 2001/06/30 19:08:27 jlam Exp $ ---- lib/Uil-2.1/Makefile.am.orig Tue Jan 16 23:22:14 2001 -+++ lib/Uil-2.1/Makefile.am Wed Mar 28 14:46:24 2001 -@@ -45,7 +45,11 @@ - -I$(top_srcdir)/lib/Uil \ - $(X_CFLAGS) +--- 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 = $(prefix)/lib ++libdir = $(exec_prefix)/lib +else - libdir = $(prefix)/LessTif/Motif2.1/lib + libdir = $(exec_prefix)/LessTif/Motif2.1/lib ++endif +endif - lib_LTLIBRARIES= libUil.la - -@@ -71,24 +75,4 @@ + # + # Sources in this directory +@@ -70,24 +76,4 @@ rm $$i; \ fi ; \ done -endif - --install-data-hook: +-install-data-hook: libUil.la -if Version_2_1 -if LibtoolShared -- -rm -f $(DESTDIR)$(prefix)/lib/libUil.so.2* -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libUil.so.2* .) +- -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)$(prefix)/lib/libUil.la -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libUil.la .) +- -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)$(prefix)/lib/libUil.so -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libUil.so .) +- -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)$(prefix)/lib/libUil.a -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libUil.a .) +- -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/lesstif/patches/patch-bi b/x11/lesstif/patches/patch-bi index 539743aeb73..5a0ff166ada 100644 --- a/x11/lesstif/patches/patch-bi +++ b/x11/lesstif/patches/patch-bi @@ -1,27 +1,38 @@ -$NetBSD: patch-bi,v 1.1 2000/12/22 17:26:21 jlam Exp $ +$NetBSD: patch-bi,v 1.2 2001/06/30 19:08:27 jlam Exp $ ---- lib/Uil/Makefile.am.orig Fri Oct 27 04:47:11 2000 +--- lib/Uil/Makefile.am.orig Wed May 9 16:39:14 2001 +++ lib/Uil/Makefile.am -@@ -25,22 +25,3 @@ +@@ -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 - endif --install-data-hook: + 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)$(prefix)/lib/libUil.so.1* -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libUil.so.1* .) +- -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)$(prefix)/lib/libUil.la -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libUil.la .) +- -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)$(prefix)/lib/libUil.so -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libUil.so .) +- -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)$(prefix)/lib/libUil.a -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libUil.a .) --endif +- -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/lesstif/patches/patch-bj b/x11/lesstif/patches/patch-bj index d2a4998d59d..2b46e05d598 100644 --- a/x11/lesstif/patches/patch-bj +++ b/x11/lesstif/patches/patch-bj @@ -1,45 +1,43 @@ -$NetBSD: patch-bj,v 1.1 2000/12/22 17:26:21 jlam Exp $ +$NetBSD: patch-bj,v 1.2 2001/06/30 19:08:27 jlam Exp $ ---- lib/Xm-2.0/Makefile.am.orig Thu Nov 2 16:32:08 2000 +--- lib/Xm-2.0/Makefile.am.orig Sat May 12 06:35:15 2001 +++ lib/Xm-2.0/Makefile.am -@@ -66,10 +66,13 @@ - # - # Install headers - # --# Lets put the headers in a sub directory to avoid --# poluting /usr/local with more directories for default installs. -+# Let's put the headers in a sub directory if not a default install. - # +@@ -4,7 +4,13 @@ + MAINTAINERCLEANFILES=Makefile.in + + libXm_la_LDFLAGS= -version-info 2:0 ++if Version_2_0 +if DefaultVersion20 -+libdir = $(prefix)/lib ++libdir = $(exec_prefix)/lib +else - libdir = $(prefix)/LessTif/Motif2.0/lib + libdir = $(exec_prefix)/LessTif/Motif2.0/lib ++endif +endif - lib_LTLIBRARIES= libXm.la - -@@ -87,24 +90,4 @@ + # + # Sources in this directory +@@ -91,24 +97,4 @@ rm $$i; \ fi ; \ done -endif - --install-data-hook: +-install-data-hook: libXm.la -if Version_2_0 -if LibtoolShared -- -rm -f $(DESTDIR)$(prefix)/lib/libXm.so.2* -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libXm.so.2* .) +- -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)$(prefix)/lib/libXm.la -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libXm.la .) +- -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)$(prefix)/lib/libXm.so -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libXm.so .) +- -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)$(prefix)/lib/libXm.a -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libXm.a .) +- -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/lesstif/patches/patch-bk b/x11/lesstif/patches/patch-bk index b68c52698fe..35a77f158ae 100644 --- a/x11/lesstif/patches/patch-bk +++ b/x11/lesstif/patches/patch-bk @@ -1,45 +1,43 @@ -$NetBSD: patch-bk,v 1.1 2000/12/22 17:26:21 jlam Exp $ +$NetBSD: patch-bk,v 1.2 2001/06/30 19:08:27 jlam Exp $ ---- lib/Xm-2.1/Makefile.am.orig Sun Nov 19 08:06:40 2000 +--- lib/Xm-2.1/Makefile.am.orig Sat May 12 06:35:15 2001 +++ lib/Xm-2.1/Makefile.am -@@ -88,10 +88,13 @@ - # - # Install headers - # --# Lets put the headers in a sub directory to avoid --# poluting /usr/local with more directories for default installs. -+# Let's put the headers in a sub directory if not a default install. +@@ -3,7 +3,13 @@ # + MAINTAINERCLEANFILES=Makefile.in + ++if Version_2_1 +if DefaultVersion21 -+libdir = $(prefix)/lib ++libdir = $(exec_prefix)/lib +else - libdir = $(prefix)/LessTif/Motif2.1/lib + libdir = $(exec_prefix)/LessTif/Motif2.1/lib +endif ++endif + libXm_la_LDFLAGS= -version-info 2:1 $(X_LIBS) - lib_LTLIBRARIES= libXm.la - -@@ -114,24 +117,4 @@ + # +@@ -105,24 +111,4 @@ rm $$i; \ fi ; \ done -endif - --install-data-hook: +-install-data-hook: libXm.la -if Version_2_1 -if LibtoolShared -- -rm -f $(DESTDIR)$(prefix)/lib/libXm.so.2* -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libXm.so.2* .) +- -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)$(prefix)/lib/libXm.la -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libXm.la .) +- -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)$(prefix)/lib/libXm.so -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libXm.so .) +- -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)$(prefix)/lib/libXm.a -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.1/lib/libXm.a .) +- -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/lesstif/patches/patch-bl b/x11/lesstif/patches/patch-bl index 20039752e79..b85a25cb5cf 100644 --- a/x11/lesstif/patches/patch-bl +++ b/x11/lesstif/patches/patch-bl @@ -1,27 +1,38 @@ -$NetBSD: patch-bl,v 1.1 2000/12/22 17:26:21 jlam Exp $ +$NetBSD: patch-bl,v 1.2 2001/06/30 19:08:27 jlam Exp $ ---- lib/Xm/Makefile.am.orig Sun Oct 8 02:02:21 2000 +--- lib/Xm/Makefile.am.orig Sat May 12 06:35:15 2001 +++ lib/Xm/Makefile.am -@@ -56,22 +56,3 @@ +@@ -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: +-endif +-install-data-hook: libXm.la -if Version_1_2 -if LibtoolShared -- -rm -f $(DESTDIR)$(prefix)/lib/libXm.so.1* -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libXm.so.1* .) +- -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)$(prefix)/lib/libXm.la -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libXm.la .) +- -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)$(prefix)/lib/libXm.so -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libXm.so .) +- -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)$(prefix)/lib/libXm.a -- (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libXm.a .) --endif +- -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/lesstif/patches/patch-bm b/x11/lesstif/patches/patch-bm index e823852021a..64d8a8c0474 100644 --- a/x11/lesstif/patches/patch-bm +++ b/x11/lesstif/patches/patch-bm @@ -1,4 +1,4 @@ -$NetBSD: patch-bm,v 1.1 2000/12/22 17:26:21 jlam Exp $ +$NetBSD: patch-bm,v 1.2 2001/06/30 19:08:27 jlam Exp $ --- lib/config/Makefile.am.orig Wed Aug 30 09:45:04 2000 +++ lib/config/Makefile.am diff --git a/x11/lesstif/patches/patch-bn b/x11/lesstif/patches/patch-bn index 6b9cc3cdb62..53aff488aa8 100644 --- a/x11/lesstif/patches/patch-bn +++ b/x11/lesstif/patches/patch-bn @@ -1,4 +1,4 @@ -$NetBSD: patch-bn,v 1.1 2000/12/22 17:26:22 jlam Exp $ +$NetBSD: patch-bn,v 1.2 2001/06/30 19:08:28 jlam Exp $ --- scripts/autoconf/Makefile.am.orig Sun Sep 12 07:13:53 1999 +++ scripts/autoconf/Makefile.am diff --git a/x11/lesstif/pkg/PLIST b/x11/lesstif/pkg/PLIST index 4dc1f5f41c0..a8e25916254 100644 --- a/x11/lesstif/pkg/PLIST +++ b/x11/lesstif/pkg/PLIST @@ -1,4 +1,3 @@ -@comment $NetBSD: PLIST,v 1.30 2001/03/28 14:57:56 drochner Exp $ bin/mwm bin/mxmkmf bin/uil @@ -192,6 +191,7 @@ lib/libXm.so lib/libXm.so.2 lib/libXm.so.2.0 man/man1/lesstif.1 +man/man1/ltversion.1 man/man1/mwm.1 man/man1/uil.1 man/man1/xbae.1 @@ -200,17 +200,17 @@ man/man1/xmbind.1 man/man3/ApplicationShell.3 man/man3/Composite.3 man/man3/Constraint.3 -man/man3/Core.3 -man/man3/Object.3 -man/man3/OverrideShell.3 man/man3/LessTifInternals.3 +man/man3/OverrideShell.3 man/man3/Rect.3 -man/man3/Shell.3 man/man3/TopLevelShell.3 man/man3/TransientShell.3 man/man3/UnNamedObj.3 man/man3/VendorShell.3 man/man3/WmShell.3 +man/man3/XCore.3 +man/man3/XObject.3 +man/man3/XShell.3 man/man3/XmArrowButton.3 man/man3/XmArrowButtonGadget.3 man/man3/XmBulletinBoard.3 @@ -278,7 +278,6 @@ share/doc/html/lesstif/COPYING.LIB.html share/doc/html/lesstif/Clipboard.txt share/doc/html/lesstif/Composite.html share/doc/html/lesstif/Constraint.html -share/doc/html/lesstif/Core.html share/doc/html/lesstif/DragAndDrop.txt share/doc/html/lesstif/FAQ.html share/doc/html/lesstif/Form.txt @@ -286,11 +285,9 @@ share/doc/html/lesstif/GeoUtils.txt share/doc/html/lesstif/Geometry.html share/doc/html/lesstif/INSTALL.html share/doc/html/lesstif/LessTifInternals.html -share/doc/html/lesstif/Object.html share/doc/html/lesstif/OverrideShell.html share/doc/html/lesstif/PROGRAMMING_TIPS.html share/doc/html/lesstif/Rect.html -share/doc/html/lesstif/Shell.html share/doc/html/lesstif/SyntheticResources.txt share/doc/html/lesstif/TopLevelShell.html share/doc/html/lesstif/TransientShell.html @@ -299,6 +296,9 @@ share/doc/html/lesstif/UnNamedObj.html share/doc/html/lesstif/VendorShell.html share/doc/html/lesstif/VirtualBindings.html share/doc/html/lesstif/WmShell.html +share/doc/html/lesstif/XCore.html +share/doc/html/lesstif/XObject.html +share/doc/html/lesstif/XShell.html share/doc/html/lesstif/Xbae.html share/doc/html/lesstif/Xlt.html share/doc/html/lesstif/XmArrowButton.html @@ -358,14 +358,22 @@ share/doc/html/lesstif/XmToggleButton.html share/doc/html/lesstif/XmToggleButtonGadget.html share/doc/html/lesstif/XmVendorShell.html share/doc/html/lesstif/XmWorld.html +share/doc/html/lesstif/XpREADME.html +share/doc/html/lesstif/XprtConfig.html +share/doc/html/lesstif/about.html share/doc/html/lesstif/apps.html share/doc/html/lesstif/bugs.html +share/doc/html/lesstif/bugs_frame.html share/doc/html/lesstif/cdrom.html +share/doc/html/lesstif/contents.html share/doc/html/lesstif/core.html share/doc/html/lesstif/cvs.html +share/doc/html/lesstif/doc_frame.html share/doc/html/lesstif/download.html share/doc/html/lesstif/feedback.html +share/doc/html/lesstif/frames.html share/doc/html/lesstif/future.html +share/doc/html/lesstif/get_frame.html share/doc/html/lesstif/help.html share/doc/html/lesstif/images/hungry.png share/doc/html/lesstif/images/lesstif-realsmall.png @@ -384,15 +392,21 @@ share/doc/html/lesstif/lesstif.html share/doc/html/lesstif/links.html share/doc/html/lesstif/lists.html share/doc/html/lesstif/mirrors.html +share/doc/html/lesstif/misc_frame.html share/doc/html/lesstif/mwm.html share/doc/html/lesstif/mwmrc.html +share/doc/html/lesstif/news.html +share/doc/html/lesstif/news_frame.html share/doc/html/lesstif/platforms.html +share/doc/html/lesstif/printing.html +share/doc/html/lesstif/related_frame.html share/doc/html/lesstif/release-notes.html share/doc/html/lesstif/release-policy.html share/doc/html/lesstif/test_policy.html share/doc/html/lesstif/test_summary.html share/doc/html/lesstif/testers.html share/doc/html/lesstif/thread.html +share/doc/html/lesstif/titlebar.html share/doc/html/lesstif/uil.html share/doc/html/lesstif/versions.html share/doc/html/lesstif/web_button.html diff --git a/x11/lesstif12/Makefile b/x11/lesstif12/Makefile index 5a3c483f226..47dc9826052 100644 --- a/x11/lesstif12/Makefile +++ b/x11/lesstif12/Makefile @@ -1,16 +1,18 @@ -# $NetBSD: Makefile,v 1.6 2001/02/17 17:06:35 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2001/06/30 19:08:22 jlam Exp $ -PKGNAME= lesstif12-${LESSTIF_VERSION} +.include "../../x11/lesstif/Makefile.common" -COMMENT= API compatible clone of the OSF/Motif toolkit, version 1.2 +PKGNAME= lesstif12-${LESSTIF_VERSION} +COMMENT= API compatible clone of the OSF/Motif toolkit, version 1.2 -CONFLICTS+= lesstif-0.[0-8]* -CONFLICTS+= lesstif-0.90* -CONFLICTS+= lesstif-0.91 lesstif-0.91.[0-3] -CONFLICTS+= openmotif-* +CONFLICTS+= lesstif-0.[0-8]* +CONFLICTS+= lesstif-0.90* +CONFLICTS+= lesstif-0.91 lesstif-0.91.[0-3] +CONFLICTS+= openmotif-* CONFIGURE_ARGS+= --enable-build-12 CONFIGURE_ARGS+= --disable-build-20 +CONFIGURE_ARGS+= --disable-build-21 CONFIGURE_ARGS+= --enable-default-12 # We don't install any documentation, but the installation process creates @@ -19,4 +21,4 @@ CONFIGURE_ARGS+= --enable-default-12 post-install: ${RMDIR} -p ${PREFIX}/share/doc/html/lesstif 2> /dev/null || ${TRUE} -.include "../../x11/lesstif/Makefile.common" +.include "../../mk/bsd.pkg.mk" |