From 91b9d75e0840629d8cb7059020820f41c20209eb Mon Sep 17 00:00:00 2001 From: jlam Date: Wed, 21 Jun 2000 05:31:43 +0000 Subject: USE_LIBTOOL instead of PKGLIBTOOL. --- x11/lesstif/Makefile | 11 +++++++---- x11/lesstif/files/patch-sum | 7 ++----- x11/lesstif/patches/patch-ac | 42 +++++------------------------------------- x11/lesstif/patches/patch-ao | 29 ----------------------------- x11/lesstif/patches/patch-at | 21 --------------------- x11/lesstif/patches/patch-av | 13 ------------- x11/lesstif/pkg/PLIST | 6 +++++- 7 files changed, 19 insertions(+), 110 deletions(-) delete mode 100644 x11/lesstif/patches/patch-ao delete mode 100644 x11/lesstif/patches/patch-at delete mode 100644 x11/lesstif/patches/patch-av (limited to 'x11') diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile index 79fa6dfbbcc..a3b893f395e 100644 --- a/x11/lesstif/Makefile +++ b/x11/lesstif/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2000/06/01 11:23:46 rh Exp $ +# $NetBSD: Makefile,v 1.50 2000/06/21 05:31:43 jlam Exp $ # FreeBSD Id: Makefile,v 1.13 1997/09/08 08:34:13 tg Exp # @@ -16,10 +16,13 @@ HOMEPAGE= http://www.lesstif.org/ BUILD_DEPENDS+= lynx:../../www/lynx -USE_PKGLIBTOOL= yes -USE_X11BASE= yes +USE_X11BASE= # defined +USE_LIBTOOL= # defined +LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig \ + ${WRKSRC}/Xlt/ltconfig \ + ${WRKSRC}/Xbae/ltconfig -GNU_CONFIGURE= yes +GNU_CONFIGURE= # defined CONFIGURE_ARGS+= --enable-build-12 # needed for www/Mosaic CONFIGURE_ARGS+= --enable-build-20 --enable-default-20 \ --enable-production --disable-debug diff --git a/x11/lesstif/files/patch-sum b/x11/lesstif/files/patch-sum index ba3a7e9150f..6067716f2ba 100644 --- a/x11/lesstif/files/patch-sum +++ b/x11/lesstif/files/patch-sum @@ -1,8 +1,8 @@ -$NetBSD: patch-sum,v 1.12 2000/05/30 07:38:53 tron Exp $ +$NetBSD: patch-sum,v 1.13 2000/06/21 05:31:45 jlam Exp $ MD5 (patch-aa) = dc3d7561b3f2518bd207d776abfa5cfe MD5 (patch-ab) = b1bd93fae6d1c4aaef8d28689a6129f9 -MD5 (patch-ac) = 03c65526b4eec511b33011be4fdef0b6 +MD5 (patch-ac) = 2a32b8550c086d5aab57baeb31557a37 MD5 (patch-ad) = 7ada1aa00d303437903143dd9e03b859 MD5 (patch-ae) = e84801e762360783c3bd3c731e80490c MD5 (patch-af) = 67e67fabe405adcb69b9894fb242c361 @@ -13,11 +13,8 @@ MD5 (patch-ak) = 84c3d99bbd2a79e518b8ec4e49d971cd MD5 (patch-al) = 3a8da44462633b73278f9a287d1e713e MD5 (patch-am) = f399cac161a25dd53a8557a470062f86 MD5 (patch-an) = 5fddd2f301619a4f7839f2d7c3a535ce -MD5 (patch-ao) = 2bba3851ec2d27a67eecf40ef787404c MD5 (patch-ap) = a3d430fe3d5bf982e3109425ed80f3af MD5 (patch-aq) = e070fc7ffcc1538753ced9a45ede4735 MD5 (patch-ar) = e768c238af22b0d47d0a9a103c527719 MD5 (patch-as) = 5671178e8122af44940facfbba30e1a3 -MD5 (patch-at) = a0f2381703e03af04fcb52b702a9034f MD5 (patch-au) = e607aa06d793e8f4b5fc51c691ec112f -MD5 (patch-av) = ec838b5e26a5fa0eca9b37a990cc81d7 diff --git a/x11/lesstif/patches/patch-ac b/x11/lesstif/patches/patch-ac index 8c585371b4d..6ace05d4164 100644 --- a/x11/lesstif/patches/patch-ac +++ b/x11/lesstif/patches/patch-ac @@ -1,40 +1,8 @@ -$NetBSD: patch-ac,v 1.8 2000/05/30 07:38:54 tron Exp $ +$NetBSD: patch-ac,v 1.9 2000/06/21 05:31:46 jlam Exp $ ---- configure.orig Mon May 15 02:49:27 2000 -+++ configure Tue May 30 09:14:23 2000 -@@ -2151,6 +2151,7 @@ - fi - - -+if false; then - # Check for any special flags to pass to ltconfig. - libtool_flags="--cache-file=$cache_file" - test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" -@@ -2321,6 +2322,7 @@ - # Redirect the config.log output again, so that the ltconfig log is not - # clobbered by the next message. - exec 5>>./config.log -+fi - - - if (aclocal --print-ac-dir) /dev/null 2>&1 && test -w `aclocal --print-ac-dir`; then -@@ -2905,6 +2907,7 @@ - echo "$ac_t""$debug_flag $conversions_flag $verbose_flag $production_flag" 1>&6 - - -+if false; then - if ${CONFIG_SHELL-/bin/sh} ./libtool --features | grep "enable shared" > /dev/null 2>&1; then - lt_libtool_shared="yes" - fi -@@ -2932,6 +2935,7 @@ - LibtoolStatic_TRUE='#' - LibtoolStatic_FALSE= - fi -+fi - - - # Extract the first word of "ar", so it can be a program name with args. -@@ -6252,10 +6256,12 @@ +--- configure.orig Sun May 14 20:49:27 2000 ++++ configure Wed Jun 21 00:37:20 2000 +@@ -6252,10 +6252,12 @@ top_srcdir="$ac_dots$ac_given_srcdir" ;; esac @@ -47,7 +15,7 @@ $NetBSD: patch-ac,v 1.8 2000/05/30 07:38:54 tron Exp $ echo creating "$ac_file" rm -f "$ac_file" -@@ -6476,10 +6482,12 @@ +@@ -6476,10 +6478,12 @@ *) # Relative path. ac_sub_cache_file="$ac_dots$cache_file" ;; esac diff --git a/x11/lesstif/patches/patch-ao b/x11/lesstif/patches/patch-ao deleted file mode 100644 index f6e4452e9fd..00000000000 --- a/x11/lesstif/patches/patch-ao +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-ao,v 1.5 2000/05/30 07:38:54 tron Exp $ - ---- lib/Xlt/configure.orig Mon May 15 02:47:21 2000 -+++ lib/Xlt/configure Tue May 30 09:35:32 2000 -@@ -560,7 +560,7 @@ - - - ac_aux_dir= --for ac_dir in . $srcdir/.; do -+for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - if test -f $ac_dir/install-sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" -@@ -2871,6 +2871,7 @@ - fi - - -+if false; then - # Check for any special flags to pass to ltconfig. - libtool_flags="--cache-file=$cache_file" - test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" -@@ -3041,6 +3042,7 @@ - # Redirect the config.log output again, so that the ltconfig log is not - # clobbered by the next message. - exec 5>>./config.log -+fi - - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 - echo "configure:3047: checking whether to enable maintainer-specific portions of Makefiles" >&5 diff --git a/x11/lesstif/patches/patch-at b/x11/lesstif/patches/patch-at deleted file mode 100644 index df2d69b5c4d..00000000000 --- a/x11/lesstif/patches/patch-at +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-at,v 1.4 2000/04/27 13:14:56 tron Exp $ - ---- test/configure.orig Fri Nov 5 21:16:52 1999 -+++ test/configure Wed Nov 24 17:30:55 1999 -@@ -1537,6 +1537,7 @@ - fi - - -+if false; then - # Check for any special flags to pass to ltconfig. - libtool_flags="--cache-file=$cache_file" - test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" -@@ -1694,6 +1695,7 @@ - # Redirect the config.log output again, so that the ltconfig log is not - # clobbered by the next message. - exec 5>>./config.log -+fi - - - version=1.2 - diff --git a/x11/lesstif/patches/patch-av b/x11/lesstif/patches/patch-av deleted file mode 100644 index 0694dccf735..00000000000 --- a/x11/lesstif/patches/patch-av +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-av,v 1.1 2000/04/27 13:14:56 tron Exp $ - ---- lib/Xbae/configure.orig Sat Apr 15 16:40:34 2000 -+++ lib/Xbae/configure Thu Apr 27 13:34:42 2000 -@@ -1231,7 +1231,7 @@ - - - ac_aux_dir= --for ac_dir in . $srcdir/.; do -+for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - if test -f $ac_dir/install-sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" diff --git a/x11/lesstif/pkg/PLIST b/x11/lesstif/pkg/PLIST index 5e26f294a47..618910996f7 100644 --- a/x11/lesstif/pkg/PLIST +++ b/x11/lesstif/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.24 2000/05/25 15:25:44 drochner Exp $ +@comment $NetBSD: PLIST,v 1.25 2000/06/21 05:31:55 jlam Exp $ LessTif/FAQ LessTif/Motif1.2/include/Mrm/MrmAppl.h LessTif/Motif1.2/include/Mrm/MrmDecls.h @@ -124,8 +124,10 @@ LessTif/Motif1.2/include/Xm/XmP.h LessTif/Motif1.2/include/Xm/XmStrDefs.h LessTif/Motif1.2/include/Xm/XmosP.h LessTif/Motif1.2/lib/libMrm.a +LessTif/Motif1.2/lib/libMrm.la LessTif/Motif1.2/lib/libMrm.so.1.2 LessTif/Motif1.2/lib/libXm.a +LessTif/Motif1.2/lib/libXm.la LessTif/Motif1.2/lib/libXm.so.1.2 @dirrm LessTif/Motif1.2/lib @dirrm LessTif/Motif1.2/include/Xm @@ -299,8 +301,10 @@ lib/X11/mwm/README lib/X11/mwm/alt.map lib/X11/mwm/system.mwmrc lib/libMrm.a +lib/libMrm.la lib/libMrm.so.2.0 lib/libXm.a +lib/libXm.la lib/libXm.so.2.0 @dirrm lib/X11/mwm @dirrm lib/X11/lesstif -- cgit v1.2.3