summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-06-26 16:30:55 +0000
committerjlam <jlam@pkgsrc.org>2001-06-26 16:30:55 +0000
commit31d1b3af609f42346967b9fb58a27994223eba51 (patch)
tree385aed669fbba2270d809f19c7a03a64c0a65323
parentea0bbe8c3df1779150d21e5b46cfb88c524ecb35 (diff)
downloadpkgsrc-31d1b3af609f42346967b9fb58a27994223eba51.tar.gz
Use REPLACE_BUILDLINK instead of repeating the post-build same code over
and over again in the pkgsrc tree.
-rw-r--r--audio/esound/Makefile17
-rw-r--r--audio/libmikmod/Makefile16
-rw-r--r--devel/SDL/Makefile16
-rw-r--r--graphics/ImageMagick/Makefile18
-rw-r--r--graphics/gdk-pixbuf-gnome/Makefile16
-rw-r--r--graphics/gdk-pixbuf/Makefile22
-rw-r--r--net/ORBit/Makefile16
-rw-r--r--x11/gnome-libs/Makefile17
-rw-r--r--x11/gtk/Makefile19
9 files changed, 27 insertions, 130 deletions
diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index 8ecfad955d3..ab061ae97a0 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2001/06/19 04:00:48 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2001/06/26 16:30:55 jlam Exp $
DISTNAME= esound-0.2.22
CATEGORIES= audio
@@ -14,21 +14,8 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
USE_BUILDLINK_ONLY= YES
USE_CONFIG_WRAPPER= YES
+REPLACE_BUILDLINK= esd-config
.include "../../audio/libaudiofile/buildlink.mk"
.include "../../devel/libgetopt/buildlink.mk"
-
-# Fix config scripts by removing buildlink directory references.
-post-build:
- @cd ${WRKSRC}; \
- config_scripts="esd-config"; \
- for file in $${config_scripts}; do \
- ${MV} -f $${file} $${file}.fixme; \
- ${SED} -e "s|-I${BUILDLINK_DIR}/|-I${LOCALBASE}/|g" \
- -e "s|-L${BUILDLINK_DIR}/|-L${LOCALBASE}/|g" \
- $${file}.fixme > $${file}; \
- ${RM} -f $${file}.fixme; \
- ${CHMOD} +x $${file}; \
- done
-
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile
index 140c25ee446..e3f8283792a 100644
--- a/audio/libmikmod/Makefile
+++ b/audio/libmikmod/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/06/19 16:00:05 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2001/06/26 16:30:56 jlam Exp $
DISTNAME= libmikmod-3.1.9
CATEGORIES= audio
@@ -15,6 +15,7 @@ USE_LIBTOOL= # defined
USE_BUILDLINK_ONLY= # defined
USE_CONFIG_WRAPPER= # defined
+REPLACE_BUILDLINK= libmikmod-config
CONFIGURE_ARGS+= --disable-threads
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
@@ -22,18 +23,5 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
pre-build:
${RM} -f ${WRKSRC}/docs/mikmod.info*
-# Fix config scripts by removing buildlink directory references.
-post-build:
- @cd ${WRKSRC}; \
- config_scripts="libmikmod-config"; \
- for file in $${config_scripts}; do \
- ${MV} -f $${file} $${file}.fixme; \
- ${SED} -e "s|-I${BUILDLINK_DIR}/|-I${LOCALBASE}/|g" \
- -e "s|-L${BUILDLINK_DIR}/|-L${LOCALBASE}/|g" \
- $${file}.fixme > $${file}; \
- ${RM} -f $${file}.fixme; \
- ${CHMOD} +x $${file}; \
- done
-
.include "../../audio/esound/buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile
index b6416c108c1..bd9690ba2c7 100644
--- a/devel/SDL/Makefile
+++ b/devel/SDL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/06/26 03:29:17 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2001/06/26 16:30:56 jlam Exp $
#
DISTNAME= SDL-1.2.0
@@ -16,6 +16,7 @@ BUILDLINK_DEPENDS.pth= pth>=1.4.0
USE_BUILDLINK_ONLY= YES
USE_CONFIG_WRAPPER= YES
+REPLACE_BUILDLINK= sdl-config
GNU_CONFIGURE= YES
USE_GMAKE= YES
@@ -52,19 +53,6 @@ pre-configure:
post-configure:
cd ${WRKSRC}/src/audio && ${CP} *.[ch] netbsd/
-# Fix config scripts by removing buildlink directory references.
-post-build:
- @cd ${WRKSRC}; \
- config_scripts="sdl-config"; \
- for file in $${config_scripts}; do \
- ${MV} -f $${file} $${file}.fixme; \
- ${SED} -e "s|-I${BUILDLINK_DIR}/|-I${LOCALBASE}/|g" \
- -e "s|-L${BUILDLINK_DIR}/|-L${LOCALBASE}/|g" \
- $${file}.fixme > $${file}; \
- ${RM} -f $${file}.fixme; \
- ${CHMOD} +x $${file}; \
- done
-
.include "../../audio/esound/buildlink.mk"
.include "../../devel/pth/buildlink.mk"
.include "../../graphics/Mesa/buildlink.mk"
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 94bd6d2402e..d356b30ec28 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2001/06/21 22:53:30 jlam Exp $
+# $NetBSD: Makefile,v 1.73 2001/06/26 16:30:57 jlam Exp $
DISTNAME= ImageMagick-5.2.8
CATEGORIES= graphics
@@ -16,6 +16,9 @@ DEPENDS+= mpeg2codec-1.2:../../graphics/mpeg2codec
NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL
USE_BUILDLINK_ONLY= YES
+REPLACE_BUILDLINK= Magick++/bin/Magick++-config
+REPLACE_BUILDLINK+= magick/Magick-config
+
GNU_CONFIGURE= YES
USE_X11= YES
USE_LIBTOOL= YES
@@ -40,19 +43,6 @@ CONFIGURE_ARGS+= --without-perl --without-dps --without-fpx \
--without-hdf --without-jbig --without-threads \
--without-ttf --without-wmf --without-xml
-# Fix config scripts by removing buildlink directory references.
-post-build:
- @cd ${WRKSRC}; \
- config_scripts="Magick++/bin/Magick++-config magick/Magick-config"; \
- for file in $${config_scripts}; do \
- ${MV} -f $${file} $${file}.fixme; \
- ${SED} -e "s|-I${BUILDLINK_DIR}/|-I${LOCALBASE}/|g" \
- -e "s|-L${BUILDLINK_DIR}/|-L${LOCALBASE}/|g" \
- $${file}.fixme > $${file}; \
- ${RM} -f $${file}.fixme; \
- ${CHMOD} +x $${file}; \
- done
-
post-install:
${INSTALL_DATA} ${WRKSRC}/Copyright.txt ${WRKSRC}/QuickStart.txt \
${PREFIX}/share/ImageMagick
diff --git a/graphics/gdk-pixbuf-gnome/Makefile b/graphics/gdk-pixbuf-gnome/Makefile
index 55a66c2c7c6..c4667857a78 100644
--- a/graphics/gdk-pixbuf-gnome/Makefile
+++ b/graphics/gdk-pixbuf-gnome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/06/23 19:26:55 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2001/06/26 16:30:57 jlam Exp $
.include "../gdk-pixbuf/Makefile.common"
@@ -8,19 +8,7 @@ COMMENT= the GNOME image loading library GNOME canvas support add-on
CONFLICTS+= gdk-pixbuf<0.10.1
BUILDLINK_DEPENDS.gdk-pixbuf= gdk-pixbuf>=0.10.1
-
-# Fix config scripts by removing buildlink directory references.
-post-build:
- @cd ${WRKSRC}; \
- config_scripts="gnomecanvaspixbufConf.sh"; \
- for file in $${config_scripts}; do \
- ${MV} -f $${file} $${file}.fixme; \
- ${SED} -e "s|-I${BUILDLINK_DIR}/|-I${LOCALBASE}/|g" \
- -e "s|-L${BUILDLINK_DIR}/|-L${LOCALBASE}/|g" \
- $${file}.fixme > $${file}; \
- ${RM} -f $${file}.fixme; \
- ${CHMOD} +x $${file}; \
- done
+REPLACE_BUILDLINK= gnomecanvaspixbufConf.sh
do-install:
${INSTALL_DATA} ${WRKSRC}/gdk-pixbuf/gnome-canvas-pixbuf.h \
diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index b1b99d7b618..0934eeed97a 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -1,11 +1,14 @@
-# $NetBSD: Makefile,v 1.15 2001/06/18 20:49:01 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2001/06/26 16:30:57 jlam Exp $
#
-.include "Makefile.common"
PKGNAME= ${DISTNAME}
-
COMMENT= the GNOME image loading library
+REPLACE_BUILDLINK= gdk_pixbufConf.sh
+REPLACE_BUILDLINK+= gdk_pixbuf_xlibConf.sh
+
+.include "Makefile.common"
+
post-patch:
${SED} -e 's/BUILD_CANVAS=yes/BUILD_CANVAS=no/g' \
${WRKSRC}/configure.in >${WRKSRC}/.tmp && \
@@ -15,19 +18,6 @@ post-configure:
${SED} -e 's/ doc$$//' ${WRKSRC}/Makefile >${WRKSRC}/.tmp && \
${MV} ${WRKSRC}/.tmp ${WRKSRC}/Makefile
-# Fix config scripts by removing buildlink directory references.
-post-build:
- @cd ${WRKSRC}; \
- config_scripts="gdk_pixbufConf.sh gdk_pixbuf_xlibConf.sh"; \
- for file in $${config_scripts}; do \
- ${MV} -f $${file} $${file}.fixme; \
- ${SED} -e "s|-I${BUILDLINK_DIR}/|-I${LOCALBASE}/|g" \
- -e "s|-L${BUILDLINK_DIR}/|-L${LOCALBASE}/|g" \
- $${file}.fixme > $${file}; \
- ${RM} -f $${file}.fixme; \
- ${CHMOD} +x $${file}; \
- done
-
post-install:
${TEST} ${PREFIX} = ${LOCALBASE} || \
${LN} -fs ${PREFIX}/share/aclocal/gdk-pixbuf.m4 \
diff --git a/net/ORBit/Makefile b/net/ORBit/Makefile
index 5e8e7e73b91..81995309dc9 100644
--- a/net/ORBit/Makefile
+++ b/net/ORBit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2001/06/19 03:55:30 jlam Exp $
+# $NetBSD: Makefile,v 1.58 2001/06/26 16:30:57 jlam Exp $
#
DISTNAME= ORBit-0.${ORBIT_MAJOR}.${ORBIT_MINOR}
@@ -24,6 +24,7 @@ LTCONFIG_OVERRIDE+= ${WRKSRC}/libIDL/ltconfig
GNU_CONFIGURE= YES
USE_CONFIG_WRAPPER= YES
USE_BUILDLINK_ONLY= YES
+REPLACE_BUILDLINK= libIDL/libIDLConf.sh
# for DISTNAME, PKGNAME, and PLIST
ORBIT_MAJOR= 5
@@ -40,17 +41,4 @@ INFO_FILES= libIDL.info
pre-configure:
cd ${WRKSRC}/popt && ${LOCALBASE}/bin/autoreconf --include-deps --force
-# Fix config scripts by removing buildlink directory references.
-post-build:
- @cd ${WRKSRC}; \
- config_scripts="libIDL/libIDLConf.sh"; \
- for file in $${config_scripts}; do \
- ${MV} -f $${file} $${file}.fixme; \
- ${SED} -e "s|-I${BUILDLINK_DIR}/|-I${LOCALBASE}/|g" \
- -e "s|-L${BUILDLINK_DIR}/|-L${LOCALBASE}/|g" \
- $${file}.fixme > $${file}; \
- ${RM} -f $${file}.fixme; \
- ${CHMOD} +x $${file}; \
- done
-
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index 56601633377..0c809cb408c 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2001/06/19 07:38:33 jlam Exp $
+# $NetBSD: Makefile,v 1.66 2001/06/26 16:30:58 jlam Exp $
DISTNAME= gnome-libs-1.2.13
CATEGORIES= x11 gnome
@@ -25,6 +25,8 @@ CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} \
USE_CONFIG_WRAPPER= YES
USE_BUILDLINK_ONLY= YES
+REPLACE_BUILDLINK= gnomeConf.sh
+REPLACE_BUILDLINK+= gnome-config
.include "../../audio/esound/buildlink.mk"
.include "../../devel/gettext-lib/buildlink.mk"
@@ -63,19 +65,6 @@ pre-build:
cd ${WRKSRC}/support && \
${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} gnomesupport.h
-# Fix config scripts by removing buildlink directory references.
-post-build:
- @cd ${WRKSRC}; \
- config_scripts="gnomeConf.sh gnome-config"; \
- for file in $${config_scripts}; do \
- ${MV} -f $${file} $${file}.fixme; \
- ${SED} -e "s|-I${BUILDLINK_DIR}/|-I${LOCALBASE}/|g" \
- -e "s|-L${BUILDLINK_DIR}/|-L${LOCALBASE}/|g" \
- $${file}.fixme > $${file}; \
- ${RM} -f $${file}.fixme; \
- ${CHMOD} +x $${file}; \
- done
-
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/etc/CORBA/servers
${TOUCH} ${PREFIX}/etc/CORBA/servers/.directory
diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index aa84e18abd7..641f32ab530 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2001/06/19 06:52:10 jlam Exp $
+# $NetBSD: Makefile,v 1.63 2001/06/26 16:30:58 jlam Exp $
DISTNAME= gtk+-1.2.10
CATEGORIES= x11
@@ -15,12 +15,14 @@ BUILD_DEPENDS+= perl>=${PERL5_REQD}:../../lang/perl5
BUILD_USES_MSGFMT= yes
USE_BUILDLINK_ONLY= yes
+USE_CONFIG_WRAPPER= yes
+REPLACE_BUILDLINK= gtk-config
+
#USE_LIBINTL= yes
USE_LIBTOOL= yes
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
USE_X11BASE= yes
USE_GMAKE= yes
-USE_CONFIG_WRAPPER= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-xinput=xfree
@@ -62,19 +64,6 @@ pre-configure:
${RM} $${file}.fixme; \
done
-# Fix config scripts by removing buildlink directory references.
-post-build:
- @cd ${WRKSRC}; \
- config_scripts="gtk-config"; \
- for file in $${config_scripts}; do \
- ${MV} -f $${file} $${file}.fixme; \
- ${SED} -e "s|-I${BUILDLINK_DIR}/|-I${LOCALBASE}/|g" \
- -e "s|-L${BUILDLINK_DIR}/|-L${LOCALBASE}/|g" \
- $${file}.fixme > $${file}; \
- ${RM} -f $${file}.fixme; \
- ${CHMOD} +x $${file}; \
- done
-
post-install:
${TEST} ${PREFIX} = ${LOCALBASE} || \
${LN} -fs ${PREFIX}/share/aclocal/gtk.m4 \