From 936d134660516438278455a79eba33d7e3870ee0 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 17 Jul 1998 17:18:49 +0000 Subject: Update to use pkg version of libtool instead of lesstif's private copy. --- x11/lesstif-current/Makefile | 7 +++++-- x11/lesstif-current/patches/patch-aa | 24 +++++++++++++++++++++--- x11/lesstif-current/pkg/PLIST | 4 +--- x11/lesstif/Makefile | 6 ++++-- x11/lesstif/patches/patch-aa | 23 ++++++++++++++++++++--- x11/lesstif/pkg/PLIST | 4 +--- 6 files changed, 52 insertions(+), 16 deletions(-) diff --git a/x11/lesstif-current/Makefile b/x11/lesstif-current/Makefile index feb4dcb5ce6..7121998a63b 100644 --- a/x11/lesstif-current/Makefile +++ b/x11/lesstif-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 1998/07/15 12:20:05 agc Exp $ +# $NetBSD: Makefile,v 1.10 1998/07/17 17:18:50 tv Exp $ # FreeBSD Id: Makefile,v 1.13 1997/09/08 08:34:13 tg Exp # @@ -9,6 +9,8 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} MAINTAINER= packages@netbsd.org +BUILD_DEPENDS= ${PREFIX}/bin/libtool:../../devel/libtool + CONFLICTS= lesstif-0.82 lesstif-0.83 lesstif-0.84 lesstif-0.85 \ lesstif-0.85.2 lesstif-0.85.3 @@ -16,7 +18,8 @@ MIRROR_DISTFILE= no GNU_CONFIGURE= yes USE_X11= yes # change this for debugging -CONFIGURE_ENV= CCFLAGS="-O -pipe" INSTALL_SCRIPT="${INSTALL_SCRIPT}" +CONFIGURE_ENV= CCFLAGS="-O -pipe" INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ + LIBTOOL=${PREFIX}/bin/libtool pre-fetch: @if [ -d ${X11BASE}/include/Xm ]; then \ diff --git a/x11/lesstif-current/patches/patch-aa b/x11/lesstif-current/patches/patch-aa index 4a50dbdbd8f..d632ec782f9 100644 --- a/x11/lesstif-current/patches/patch-aa +++ b/x11/lesstif-current/patches/patch-aa @@ -1,6 +1,24 @@ ---- configure.orig Sat Mar 14 16:50:38 1998 -+++ configure Sun Mar 22 22:59:29 1998 -@@ -3946,7 +3946,7 @@ +--- configure.orig Sun May 10 07:57:03 1998 ++++ configure Fri Jul 17 13:09:34 1998 +@@ -1190,7 +1190,7 @@ + + + +- ++if false; then + # Always use our own libtool. + LIBTOOL='$(top_builddir)/libtool' + +@@ -1241,7 +1241,7 @@ + ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \ + $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ + || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } +- ++fi + + canonical=$host + configuration=$host_alias +@@ -4001,7 +4001,7 @@ lexicographic_readdir=1 diff --git a/x11/lesstif-current/pkg/PLIST b/x11/lesstif-current/pkg/PLIST index 517be4a3c8b..91651ebae82 100644 --- a/x11/lesstif-current/pkg/PLIST +++ b/x11/lesstif-current/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 1998/07/15 12:20:05 agc Exp $ +@comment $NetBSD: PLIST,v 1.5 1998/07/17 17:18:50 tv Exp $ bin/mwm bin/mxmkmf bin/uil @@ -134,9 +134,7 @@ lib/X11/lesstif/Imake.tmpl lib/X11/lesstif/Motif.rules lib/X11/lesstif/Motif.tmpl lib/libXm.so.1.2 -lib/libXm.la lib/libMrm.so.1.2 -lib/libMrm.la share/lesstif/AUTHORS share/lesstif/BUG-REPORTING share/lesstif/COPYING diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile index a3f9156379a..a4a29d05d73 100644 --- a/x11/lesstif/Makefile +++ b/x11/lesstif/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 1998/07/15 10:51:16 agc Exp $ +# $NetBSD: Makefile,v 1.26 1998/07/17 17:18:49 tv Exp $ # FreeBSD Id: Makefile,v 1.13 1997/09/08 08:34:13 tg Exp # @@ -10,6 +10,8 @@ MASTER_SITES= ftp://linux.gt.ed.net/pub/linux/libs/lesstif/srcdist/ \ MAINTAINER= packages@netbsd.org +BUILD_DEPENDS= ${PREFIX}/bin/libtool:../../devel/libtool + CONFLICTS= lesstif-0.82 lesstif-0.83 lesstif-0.84 lesstif-0.85 \ lesstif-19980510 lesstif-0.85.2 @@ -20,7 +22,7 @@ USE_X11= yes CONFIGURE_ARGS+=--enable-production CONFIGURE_ENV= CCFLAGS="-O -pipe" INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ - VarHaveMan2html=0 + VarHaveMan2html=0 LIBTOOL=${PREFIX}/bin/libtool pre-fetch: @if [ -d ${X11BASE}/include/Xm ]; then \ diff --git a/x11/lesstif/patches/patch-aa b/x11/lesstif/patches/patch-aa index 4a50dbdbd8f..511416cbd8a 100644 --- a/x11/lesstif/patches/patch-aa +++ b/x11/lesstif/patches/patch-aa @@ -1,6 +1,23 @@ ---- configure.orig Sat Mar 14 16:50:38 1998 -+++ configure Sun Mar 22 22:59:29 1998 -@@ -3946,7 +3946,7 @@ +--- configure.orig Thu Jul 2 22:43:41 1998 ++++ configure Fri Jul 17 12:47:52 1998 +@@ -1307,6 +1307,7 @@ + echo "$ac_t""no" 1>&6 + fi + ++if false; then + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' + +@@ -1352,7 +1353,7 @@ + ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \ + $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ + || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } +- ++fi + + version=1.2 + version_suffix="" +@@ -4107,7 +4108,7 @@ lexicographic_readdir=1 diff --git a/x11/lesstif/pkg/PLIST b/x11/lesstif/pkg/PLIST index 4953aa50294..295d36a7d60 100644 --- a/x11/lesstif/pkg/PLIST +++ b/x11/lesstif/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 1998/07/15 10:51:16 agc Exp $ +@comment $NetBSD: PLIST,v 1.12 1998/07/17 17:18:49 tv Exp $ bin/mwm bin/mxmkmf bin/uil @@ -134,9 +134,7 @@ lib/X11/lesstif/Imake.tmpl lib/X11/lesstif/Motif.rules lib/X11/lesstif/Motif.tmpl lib/libXm.so.1.2 -lib/libXm.la lib/libMrm.so.1.2 -lib/libMrm.la share/lesstif/AUTHORS share/lesstif/BUG-REPORTING share/lesstif/COPYING -- cgit v1.2.3