[pkgsrc/trunk]: pkgsrc Remove references to buildlink2.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/464189fa61e7
branches:  trunk
changeset: 477671:464189fa61e7
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue Jul 06 22:51:34 2004 +0000

description:
Remove references to buildlink2.

diffstat:

 cross/COMMON/cross.mk                            |   6 +---
 graphics/freetype2/buildlink2-freetype-config.in |  37 ------------------------
 lang/perl5/module.mk                             |   4 +-
 www/apache/module.mk                             |   6 +--
 4 files changed, 4 insertions(+), 49 deletions(-)

diffs (100 lines):

diff -r 6fa4a4ab0042 -r 464189fa61e7 cross/COMMON/cross.mk
--- a/cross/COMMON/cross.mk     Tue Jul 06 22:49:29 2004 +0000
+++ b/cross/COMMON/cross.mk     Tue Jul 06 22:51:34 2004 +0000
@@ -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 @@
 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 -r 6fa4a4ab0042 -r 464189fa61e7 graphics/freetype2/buildlink2-freetype-config.in
--- a/graphics/freetype2/buildlink2-freetype-config.in  Tue Jul 06 22:49:29 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 6fa4a4ab0042 -r 464189fa61e7 lang/perl5/module.mk
--- a/lang/perl5/module.mk      Tue Jul 06 22:49:29 2004 +0000
+++ b/lang/perl5/module.mk      Tue Jul 06 22:51:34 2004 +0000
@@ -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 @@
 .  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 -r 6fa4a4ab0042 -r 464189fa61e7 www/apache/module.mk
--- a/www/apache/module.mk      Tue Jul 06 22:49:29 2004 +0000
+++ b/www/apache/module.mk      Tue Jul 06 22:51:34 2004 +0000
@@ -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