[pkgsrc/trunk]: pkgsrc/sysutils Convert to bl3.

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e0f081a7e5cb
branches:  trunk
changeset: 474704:e0f081a7e5cb
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue May 04 08:08:19 2004 +0000

description:
Convert to bl3.

diffstat:

 sysutils/gmc/Makefile        |   4 ++--
 sysutils/mc/Makefile.common  |   8 ++++----
 sysutils/mc/distinfo         |   4 ++--
 sysutils/mc/patches/patch-aa |  28 ++++++++++++++++++++++------
 4 files changed, 30 insertions(+), 14 deletions(-)

diffs (115 lines):

diff -r 9d99a0a21bef -r e0f081a7e5cb sysutils/gmc/Makefile
--- a/sysutils/gmc/Makefile     Tue May 04 06:56:38 2004 +0000
+++ b/sysutils/gmc/Makefile     Tue May 04 08:08:19 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2004/04/14 16:15:27 jmmv Exp $
+# $NetBSD: Makefile,v 1.38 2004/05/04 08:08:19 wiz Exp $
 
 PKGNAME=               g${DISTNAME}
 PKGREVISION=           9
@@ -15,5 +15,5 @@
 post-install:
        ${RMDIR} ${PREFIX}/share/gnome/help/gmc/C/figs
 
-.include "../../x11/gnome-core/buildlink2.mk"
+.include "../../x11/gnome-core/buildlink3.mk"
 .include "../../sysutils/mc/Makefile.common"
diff -r 9d99a0a21bef -r e0f081a7e5cb sysutils/mc/Makefile.common
--- a/sysutils/mc/Makefile.common       Tue May 04 06:56:38 2004 +0000
+++ b/sysutils/mc/Makefile.common       Tue May 04 08:08:19 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2004/04/24 22:46:11 jlam Exp $
+# $NetBSD: Makefile.common,v 1.24 2004/05/04 08:08:19 wiz Exp $
 
 DISTNAME=              mc-4.5.51
 CATEGORIES+=           sysutils
@@ -14,7 +14,7 @@
 DISTINFO_FILE=         ${.CURDIR}/../../sysutils/mc/distinfo
 PATCHDIR=              ${.CURDIR}/../../sysutils/mc/patches
 
-USE_BUILDLINK2=                yes
+USE_BUILDLINK3=                yes
 USE_PKGLOCALEDIR=      yes
 USE_GNU_TOOLS+=                make
 
@@ -43,6 +43,6 @@
 CFLAGS+= -DSunOS
 .endif
 
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/glib/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 9d99a0a21bef -r e0f081a7e5cb sysutils/mc/distinfo
--- a/sysutils/mc/distinfo      Tue May 04 06:56:38 2004 +0000
+++ b/sysutils/mc/distinfo      Tue May 04 08:08:19 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2003/05/22 17:02:53 salo Exp $
+$NetBSD: distinfo,v 1.8 2004/05/04 08:08:19 wiz Exp $
 
 SHA1 (mc-4.5.51.tar.gz) = 24d5d90695266587a2e8190196b32c8f3a4b2406
 Size (mc-4.5.51.tar.gz) = 4330056 bytes
-SHA1 (patch-aa) = 2d9a4dd69706c923ffb46aab044833f974bd8d11
+SHA1 (patch-aa) = 57bd96ecafd94e8bb2bd888c31bf3b1b97937eaf
 SHA1 (patch-ab) = 6da1ccfdcd9b0623bf5619a99c59e67cd70b51b6
 SHA1 (patch-ac) = 36ee4017c74f04efff92e2a79cdb40cd5a4de6ed
 SHA1 (patch-ad) = 9867fe55febd06055ab4bc5415260708fb5d7472
diff -r 9d99a0a21bef -r e0f081a7e5cb sysutils/mc/patches/patch-aa
--- a/sysutils/mc/patches/patch-aa      Tue May 04 06:56:38 2004 +0000
+++ b/sysutils/mc/patches/patch-aa      Tue May 04 08:08:19 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.11 2002/10/08 17:27:20 wiz Exp $
+$NetBSD: patch-aa,v 1.12 2004/05/04 08:08:19 wiz Exp $
 
---- configure.orig     Mon Jul  3 10:31:57 2000
+--- configure.orig     2000-07-03 16:31:57.000000000 +0200
 +++ configure
-@@ -3543,6 +3543,11 @@
+@@ -3543,6 +3543,11 @@ fi
  
  
  
@@ -14,7 +14,7 @@
  cc_uses_g=yes
  if test x$GCC = xyes; then
      if test x$ac_cv_prog_gcc_g = xyes; then
-@@ -9409,11 +9414,15 @@
+@@ -9409,11 +9414,15 @@ fi
  
  
        # Check whether --with-gnome or --without-gnome was given.
@@ -30,7 +30,23 @@
        mx=mx
        gmcdep=gmcdep
        libgtkedit="libgtkedit.a"
-@@ -11891,6 +11900,7 @@
+@@ -10682,7 +10691,6 @@ EOF
+       LIBEDIT_A="libedit.a"
+       MCEDIT="mcedit"
+       LEDIT="-ledit"
+-      CPPFLAGS="$CPPFLAGS -I\$(rootdir)"
+       EDIT_msg="yes"
+       echo "$ac_t""will call internal editor" 1>&6
+ 
+@@ -10698,7 +10706,6 @@ EOF
+       LIBEDIT_A="libedit.a"
+       MCEDIT="mcedit"
+       LEDIT="-ledit"
+-      CPPFLAGS="$CPPFLAGS -I\$(rootdir)"
+       EDIT_msg="yes"
+       echo "$ac_t""will call internal editor" 1>&6
+ 
+@@ -11891,6 +11898,7 @@ sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g
   s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
  $ac_vpsub
  $extrasub
@@ -38,7 +54,7 @@
  s%@SHELL@%$SHELL%g
  s%@CFLAGS@%$CFLAGS%g
  s%@CPPFLAGS@%$CPPFLAGS%g
-@@ -12019,6 +12029,8 @@
+@@ -12019,6 +12027,8 @@ s%@GNOME_APPLETS_LIBS@%$GNOME_APPLETS_LI
  s%@GNOME_DOCKLETS_LIBS@%$GNOME_DOCKLETS_LIBS%g
  s%@GNOME_CAPPLET_LIBS@%$GNOME_CAPPLET_LIBS%g
  s%@gnomeicondir@%$gnomeicondir%g