pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Convert to buildlink3.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/4881e7d60564
branches:  trunk
changeset: 474756:4881e7d60564
user:      snj <snj%pkgsrc.org@localhost>
date:      Wed May 05 02:26:41 2004 +0000

description:
Convert to buildlink3.

diffstat:

 audio/esound/buildlink2.mk            |  21 -------------
 graphics/gimp1-base/Makefile          |  20 ++++++------
 graphics/gimp1-base/buildlink2.mk     |  34 ----------------------
 graphics/gimp1-base/buildlink3.mk     |  26 +++++++++++++++++
 graphics/gimp1-data/Makefile          |   6 +-
 graphics/gimp1-wideangle/Makefile     |   6 +-
 graphics/py-gimp/Makefile             |   8 ++--
 misc/hitchhiker/Makefile              |  14 ++++----
 print/ghostscript-esp/Makefile.common |  14 ++++----
 print/gimp-print-cups/Makefile        |   8 ++--
 print/gimp-print-escputil/Makefile    |  12 +++---
 print/gimp-print-ijs/Makefile         |   8 ++--
 print/gimp-print-lib/buildlink2.mk    |  21 -------------
 print/gimp-print/Makefile             |   8 ++--
 print/ijs/Makefile                    |   4 +-
 print/ijs/buildlink2.mk               |  19 ------------
 print/ijs/buildlink3.mk               |  18 +++++++++++
 x11/gnome-libs/buildlink2.mk          |  53 -----------------------------------
 18 files changed, 98 insertions(+), 202 deletions(-)

diffs (truncated from 513 to 300 lines):

diff -r 2e62526e7501 -r 4881e7d60564 audio/esound/buildlink2.mk
--- a/audio/esound/buildlink2.mk        Wed May 05 00:47:52 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:05 jlam Exp $
-
-.if !defined(ESOUND_BUILDLINK2_MK)
-ESOUND_BUILDLINK2_MK=  # defined
-
-BUILDLINK_PACKAGES+=           esound
-BUILDLINK_DEPENDS.esound?=     esound>=0.2.18
-BUILDLINK_PKGSRCDIR.esound?=   ../../audio/esound
-
-EVAL_PREFIX+=  BUILDLINK_PREFIX.esound=esound
-BUILDLINK_PREFIX.esound_DEFAULT=       ${LOCALBASE}
-BUILDLINK_FILES.esound=                include/esd.h
-BUILDLINK_FILES.esound+=       lib/libesd.*
-
-.include "../../audio/libaudiofile/buildlink2.mk"
-
-BUILDLINK_TARGETS+=            esound-buildlink
-
-esound-buildlink: _BUILDLINK_USE
-
-.endif # ESOUND_BUILDLINK2_MK
diff -r 2e62526e7501 -r 4881e7d60564 graphics/gimp1-base/Makefile
--- a/graphics/gimp1-base/Makefile      Wed May 05 00:47:52 2004 +0000
+++ b/graphics/gimp1-base/Makefile      Wed May 05 02:26:41 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/04/08 07:37:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2004/05/05 02:26:41 snj Exp $
 #
 
 DISTNAME=              gimp-1.2.5
@@ -18,7 +18,7 @@
 
 CONFLICTS+=            gimp<=1.2.3 gimp>=2.0.0
 
-USE_BUILDLINK2=                YES
+USE_BUILDLINK3=                YES
 USE_PKGINSTALL=                YES
 USE_PKGLOCALEDIR=      YES
 USE_X11=               YES
@@ -70,18 +70,18 @@
                ${LN} -fs ${PREFIX}/share/aclocal/gimp.m4               \
                        ${LOCALBASE}/share/aclocal/gimp.m4
 
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../graphics/mpeg-lib/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../graphics/mpeg-lib/buildlink3.mk"
 .if defined(GIMP_WITH_HELPBROWSER) && ${GIMP_WITH_HELPBROWSER} != "no"
 PLIST_SUBST+=  HELPBROWSER=""
-.include "../../x11/gnome-libs/buildlink2.mk"
+.include "../../x11/gnome-libs/buildlink3.mk"
 .else
 PLIST_SUBST+=  HELPBROWSER="@comment "
-.include "../../graphics/jpeg/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
-.include "../../graphics/tiff/buildlink2.mk"
-.include "../../graphics/xpm/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff -r 2e62526e7501 -r 4881e7d60564 graphics/gimp1-base/buildlink2.mk
--- a/graphics/gimp1-base/buildlink2.mk Wed May 05 00:47:52 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.2 2004/03/29 22:24:20 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use gimp-base.
-#
-# This file was created automatically using createbuildlink 2.6.
-#
-
-.if !defined(GIMP_BASE_BUILDLINK2_MK)
-GIMP_BASE_BUILDLINK2_MK=       # defined
-
-BUILDLINK_PACKAGES+=                   gimp-base
-BUILDLINK_DEPENDS.gimp-base?=          gimp-base>=1.2.5nb2
-BUILDLINK_PKGSRCDIR.gimp-base?=                ../../graphics/gimp1-base
-
-EVAL_PREFIX+=  BUILDLINK_PREFIX.gimp-base=gimp-base
-BUILDLINK_PREFIX.gimp-base_DEFAULT=    ${LOCALBASE}
-BUILDLINK_FILES.gimp-base+=    include/gck/*
-BUILDLINK_FILES.gimp-base+=    include/libgimp/*
-BUILDLINK_FILES.gimp-base+=    lib/libgck*
-BUILDLINK_FILES.gimp-base+=    lib/libgimp*
-
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../graphics/jpeg/buildlink2.mk"
-.include "../../graphics/mpeg-lib/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
-.include "../../graphics/tiff/buildlink2.mk"
-.include "../../graphics/xpm/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
-
-BUILDLINK_TARGETS+=    gimp-base-buildlink
-
-gimp-base-buildlink: _BUILDLINK_USE
-
-.endif # GIMP_BASE_BUILDLINK2_MK
diff -r 2e62526e7501 -r 4881e7d60564 graphics/gimp1-base/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/gimp1-base/buildlink3.mk Wed May 05 02:26:41 2004 +0000
@@ -0,0 +1,26 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/05 02:26:41 snj Exp $
+
+BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
+GIMP_BASE_BUILDLINK3_MK:=      ${GIMP_BASE_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=    gimp-base
+.endif
+
+BUILDLINK_PACKAGES:=   ${BUILDLINK_PACKAGES:Ngimp-base}
+BUILDLINK_PACKAGES+=   gimp-base
+
+.if !empty(GIMP_BASE_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.gimp-base+=  gimp-base>=1.2.5nb2
+BUILDLINK_PKGSRCDIR.gimp-base?=        ../../graphics/gimp1-base
+.endif # GIMP_BASE_BUILDLINK3_MK
+
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/mpeg-lib/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff -r 2e62526e7501 -r 4881e7d60564 graphics/gimp1-data/Makefile
--- a/graphics/gimp1-data/Makefile      Wed May 05 00:47:52 2004 +0000
+++ b/graphics/gimp1-data/Makefile      Wed May 05 02:26:41 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/04/08 07:37:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2004/05/05 02:26:41 snj Exp $
 #
 
 DISTNAME=      gimp-data-extras-1.2.0
@@ -16,9 +16,9 @@
 
 CONFLICTS+=    gimp<=1.2.3 gimp>=2.0.0
 
-USE_BUILDLINK2=        YES
+USE_BUILDLINK3=        YES
 USE_X11=       YES
 GNU_CONFIGURE= YES
 
-.include "../../graphics/gimp1-base/buildlink2.mk"
+.include "../../graphics/gimp1-base/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 2e62526e7501 -r 4881e7d60564 graphics/gimp1-wideangle/Makefile
--- a/graphics/gimp1-wideangle/Makefile Wed May 05 00:47:52 2004 +0000
+++ b/graphics/gimp1-wideangle/Makefile Wed May 05 02:26:41 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/03/29 22:22:54 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2004/05/05 02:26:41 snj Exp $
 #
 
 DISTNAME=      wideangleFeb03
@@ -13,11 +13,11 @@
 COMMENT=       GIMP plugin for wideangle lens distortions
 
 WRKSRC=                ${WRKDIR}/wideangle
-USE_BUILDLINK2=        YES
+USE_BUILDLINK3=        YES
 USE_GNU_TOOLS+=        make
 
 ALL_TARGET=    wideangle
 
-.include "../../graphics/gimp1-base/buildlink2.mk"
+.include "../../graphics/gimp1-base/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r 2e62526e7501 -r 4881e7d60564 graphics/py-gimp/Makefile
--- a/graphics/py-gimp/Makefile Wed May 05 00:47:52 2004 +0000
+++ b/graphics/py-gimp/Makefile Wed May 05 02:26:41 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/03/29 22:31:13 snj Exp $
+# $NetBSD: Makefile,v 1.11 2004/05/05 02:26:41 snj Exp $
 #
 
 DISTNAME=      pygimp-1.2
@@ -14,7 +14,7 @@
 CONFIGURE_ENV+=        PYTHON=${PYTHONBIN}
 USE_LIBTOOL=   yes
 LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
-USE_BUILDLINK2= yes
+USE_BUILDLINK3= yes
 
 PYTHON_PATCH_SCRIPTS= plug-ins/clothify.py plug-ins/foggify.py
 PYTHON_PATCH_SCRIPTS+= plug-ins/gimpcons.py plug-ins/gtkcons.py
@@ -30,6 +30,6 @@
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
-.include "../../graphics/gimp1-base/buildlink2.mk"
-.include "../../x11/pygtk/buildlink2.mk"
+.include "../../graphics/gimp1-base/buildlink3.mk"
+.include "../../x11/pygtk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 2e62526e7501 -r 4881e7d60564 misc/hitchhiker/Makefile
--- a/misc/hitchhiker/Makefile  Wed May 05 00:47:52 2004 +0000
+++ b/misc/hitchhiker/Makefile  Wed May 05 02:26:41 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/04/14 16:15:25 jmmv Exp $
+# $NetBSD: Makefile,v 1.16 2004/05/05 02:26:41 snj Exp $
 #
 
 DISTNAME=      hh2000-0.6
@@ -13,13 +13,13 @@
 
 GNU_CONFIGURE=         yes
 USE_X11BASE=           yes
-USE_BUILDLINK2=                yes
+USE_BUILDLINK3=                yes
 USE_DIRS+=             gnome1-1.5
 USE_PKGLOCALEDIR=      yes
 
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../graphics/glu/buildlink2.mk"
-.include "../../graphics/glut/buildlink2.mk"
-.include "../../x11/gnome-libs/buildlink2.mk"
-.include "../../x11/gtkglarea/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.include "../../graphics/glut/buildlink3.mk"
+.include "../../x11/gnome-libs/buildlink3.mk"
+.include "../../x11/gtkglarea/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 2e62526e7501 -r 4881e7d60564 print/ghostscript-esp/Makefile.common
--- a/print/ghostscript-esp/Makefile.common     Wed May 05 00:47:52 2004 +0000
+++ b/print/ghostscript-esp/Makefile.common     Wed May 05 02:26:41 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2004/02/01 01:43:30 jlam Exp $
+# $NetBSD: Makefile.common,v 1.16 2004/05/05 02:26:41 snj Exp $
 
 DISTNAME=      espgs-${GS_VERS}-source
 BASEGS_VERS=   7.07
@@ -23,7 +23,7 @@
 DEPENDS+=      ghostscript-fonts-6.0:../../fonts/ghostscript-fonts
 
 WRKSRC=                        ${WRKDIR}/${DISTNAME:S/-source//}
-USE_BUILDLINK2=                yes
+USE_BUILDLINK3=                yes
 USE_PKGINSTALL=                yes
 USE_GNU_TOOLS+=                make
 GNU_CONFIGURE=         yes
@@ -88,11 +88,11 @@
                ${PREFIX}/libexec/cups/filter
        ${INSTALL_DATA} ${WRKSRC}/pstoraster/pstoraster.convs ${CUPS_EGDIR}
 
-.include "../../security/openssl/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
-.include "../../graphics/tiff/buildlink2.mk"
-.include "../../print/cups/buildlink2.mk"
-.include "../../print/gimp-print-lib/buildlink2.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
+.include "../../print/gimp-print-lib/buildlink3.mk"
 
 .include "../../mk/autoconf.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 2e62526e7501 -r 4881e7d60564 print/gimp-print-cups/Makefile
--- a/print/gimp-print-cups/Makefile    Wed May 05 00:47:52 2004 +0000
+++ b/print/gimp-print-cups/Makefile    Wed May 05 02:26:41 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/03/26 02:27:51 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2004/05/05 02:26:41 snj Exp $
 #
 
 DISTNAME=      gimp-print-4.2.6
@@ -20,8 +20,8 @@
 CONFIGURE_ARGS+= --enable-libgimpprint=no
 USE_LIBTOOL=   yes
 USE_GNU_TOOLS+=        make
-USE_BUILDLINK2=        yes
+USE_BUILDLINK3=        yes
 
-.include "../../print/gimp-print-lib/buildlink2.mk"
-.include "../../print/cups/buildlink2.mk"
+.include "../../print/gimp-print-lib/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 2e62526e7501 -r 4881e7d60564 print/gimp-print-escputil/Makefile
--- a/print/gimp-print-escputil/Makefile        Wed May 05 00:47:52 2004 +0000
+++ b/print/gimp-print-escputil/Makefile        Wed May 05 02:26:41 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/03/02 14:56:07 drochner Exp $
+# $NetBSD: Makefile,v 1.16 2004/05/05 02:26:42 snj Exp $



Home | Main Index | Thread Index | Old Index