From c085b8334fc3e3e18685ee5be72024fe27a51396 Mon Sep 17 00:00:00 2001
From: reg <reg@FreeBSD.org>
Date: Sun, 13 Feb 2000 01:04:28 +0000
Subject: Make this port actually allow you to pick depends.

Approved by:	maintainer
---
 lang/pike/Makefile               | 13 ++++++++-----
 lang/pike/scripts/configure.pike | 10 +++-------
 2 files changed, 11 insertions(+), 12 deletions(-)

(limited to 'lang/pike')

diff --git a/lang/pike/Makefile b/lang/pike/Makefile
index 221844aa805b..ebc4f3c4ba3a 100644
--- a/lang/pike/Makefile
+++ b/lang/pike/Makefile
@@ -13,11 +13,6 @@ MASTER_SITES=	http://pike.idonex.se/download/
 
 MAINTAINER=	vns@delta.odessa.ua
 
-pre-fetch:
-.if !defined(BATCH)
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.pike
-.endif
-
 WRKSRC=		${WRKDIR}/${DISTNAME}/src/
 
 IS_INTERACTIVE=	yes
@@ -30,10 +25,18 @@ CONFIGURE_ARGS?= \
 	--without-msql \
 	--without-jpeg
 
+pre-fetch:
+.if !defined(BATCH)
+	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.pike
+.endif
+
 pre-configure:
 	@${ECHO} ${CONFIGURE_ARGS}
 
 pre-clean:
 	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
 
+.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
+.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
+.endif
 .include <bsd.port.mk>
diff --git a/lang/pike/scripts/configure.pike b/lang/pike/scripts/configure.pike
index 8a8d041d583e..343685570c1a 100644
--- a/lang/pike/scripts/configure.pike
+++ b/lang/pike/scripts/configure.pike
@@ -42,7 +42,7 @@ mkdir -p ${WRKDIRPREFIX}${CURDIR}
 while [ "$1" ]; do
 	case $1 in
 		\"FreeType\")
-			echo "LIB_DEPENDS+=		ttf.3:\${PORTSDIR}/print/freetype" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+			echo "LIB_DEPENDS+=	ttf.4:\${PORTSDIR}/print/freetype" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 			echo "CONFIGURE_ARGS+=	--with-ttflib" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 			FreeType=1
 			;;
@@ -63,7 +63,7 @@ while [ "$1" ]; do
 			JPEG=1
 			;;
 		\"GDBM\")
-			echo "BUILD_DEPENDS= ${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc 
+			echo "LIB_DEPENDS+=	gdbm.2:${PORTSDIR}/databases/gdbm" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc 
 			echo "CONFIGURE_ARGS+=	--with-gdbm=\${PREFIX}" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 			GDBM=1
 			;;
@@ -72,11 +72,7 @@ while [ "$1" ]; do
 			zlib=1
 			;;
 		\"MySQL\")
-			echo ".if !exists(\${PREFIX}/lib/mysql/libmysqlclient.a) || exists(\${PREFIX}/lib/mysql/libmysqlclient.so)" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			echo "LIB_DEPENDS+=		mysqlclient.5:\${PORTSDIR}/databases/mysql322" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			echo ".else" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			echo "BUILD_DEPENDS+=		\${PREFIX}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql321" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			echo ".endif" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+			echo "LIB_DEPENDS+=	mysqlclient.6:\${PORTSDIR}/databases/mysql322-client" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 			echo "CONFIGURE_ARGS+=	--with-mysql=\${PREFIX}" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 			MySQL=1
 			;;
-- 
cgit