diff options
| -rw-r--r-- | cross/COMMON/cross.mk | 6 | ||||
| -rw-r--r-- | graphics/freetype2/buildlink2-freetype-config.in | 37 | ||||
| -rw-r--r-- | lang/perl5/module.mk | 4 | ||||
| -rw-r--r-- | www/apache/module.mk | 6 |
4 files changed, 4 insertions, 49 deletions
diff --git a/cross/COMMON/cross.mk b/cross/COMMON/cross.mk index 6187af98ff7..b82868e8aa6 100644 --- a/cross/COMMON/cross.mk +++ b/cross/COMMON/cross.mk @@ -1,4 +1,4 @@ -# $NetBSD: cross.mk,v 1.27 2004/01/25 02:36:11 grant Exp $ +# $NetBSD: cross.mk,v 1.28 2004/07/06 22:51:34 wiz Exp $ # Shared definitions for building a cross-compile environment. @@ -37,11 +37,7 @@ CXXFLAGS= # empty CROSS_DISTFILES+= ${BINUTILS_DISTNAME}.tar.gz MASTER_SITES+= ${MASTER_SITE_GNU:=binutils/} CONFIGURE_ARGS+= --with-gnu-as --with-gnu-ld -.if defined(USE_BUILDLINK2) && empty(USE_BUILDLINK2:M[nN][oO]) -. include "../../cross/binutils/buildlink2.mk" -.else DEPENDS+= cross-binutils>=2.9.1.1:../../cross/binutils -.endif PLIST_PRE+= ${COMMON_DIR}/PLIST-binutils AS_FOR_TARGET= ${BINUTILS_WRKSRC}/gas/as-new diff --git a/graphics/freetype2/buildlink2-freetype-config.in b/graphics/freetype2/buildlink2-freetype-config.in deleted file mode 100644 index d7447dffee1..00000000000 --- a/graphics/freetype2/buildlink2-freetype-config.in +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -# -# $NetBSD: buildlink2-freetype-config.in,v 1.2 2002/08/25 18:39:01 jlam Exp $ -# -# If FreeType2 is distributed as part of XFree86, then it may be missing a -# freetype-config script that emits the preprocessor and linker flags -# necessary to find the FreeType2 headers and libraries. This script -# provides that functionality within the buildlink2 framework and is used -# by freetype2/buildlink2.mk. - -while [ $# -gt 0 ] -do - case "$1" in - -*=*) optarg=`echo "$1" | @SED@ 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; - esac - - case $1 in - --prefix=*|--prefix|--exec-prefix=*|--exec-prefix) - echo @X11BASE@ - ;; - --version) - freetype_h=@X11BASE@/include/freetype2/freetype/freetype.h - major=`@AWK@ '/.*#define.*FREETYPE_MAJOR/ { print $3 }' ${freetype_h}` - minor=`@AWK@ '/.*#define.*FREETYPE_MINOR/ { print $3 }' ${freetype_h}` - echo ${major}.${minor} - exit 0 - ;; - --cflags) - echo -I@X11BASE@/include/freetype2 ${includes} - ;; - --libs) - echo -L@X11BASE@/lib -Wl,-R@X11BASE@/lib -lfreetype - ;; - esac - shift -done diff --git a/lang/perl5/module.mk b/lang/perl5/module.mk index 6b7d41851ff..379f5c0cdc5 100644 --- a/lang/perl5/module.mk +++ b/lang/perl5/module.mk @@ -1,4 +1,4 @@ -# $NetBSD: module.mk,v 1.36 2004/07/03 14:13:06 wiz Exp $ +# $NetBSD: module.mk,v 1.37 2004/07/06 22:52:33 wiz Exp $ # # This Makefile fragment is intended to be included by packages that build # and install perl5 modules. @@ -37,8 +37,6 @@ BUILDLINK_DEPMETHOD.perl+= full . if !defined(NO_BUILDLINK) . if empty(USE_BUILDLINK3:M[nN][oO]) . include "../../lang/perl5/buildlink3.mk" -. elif empty(USE_BUILDLINK2:M[nN][oO]) -. include "../../lang/perl5/buildlink2.mk" . endif . endif .endif diff --git a/www/apache/module.mk b/www/apache/module.mk index 0aed51ee999..9ce942b9a50 100644 --- a/www/apache/module.mk +++ b/www/apache/module.mk @@ -1,4 +1,4 @@ -# $NetBSD: module.mk,v 1.8 2004/05/08 15:12:52 grant Exp $ +# $NetBSD: module.mk,v 1.9 2004/07/06 22:55:35 wiz Exp $ # # This Makefile fragment is intended to be included by packages that build # and install apache modules. @@ -24,9 +24,7 @@ _APACHE_MODULE_MK= # defined APACHE_MODULE= # defined -.if defined(USE_BUILDLINK2) -. include "../../www/apache/buildlink2.mk" -.elif defined(USE_BUILDLINK3) +.if defined(USE_BUILDLINK3) . include "../../www/apache/buildlink3.mk" .endif |