aboutsummaryrefslogtreecommitdiffstats
path: root/lang/pike
diff options
context:
space:
mode:
Diffstat (limited to 'lang/pike')
-rw-r--r--lang/pike/Makefile13
-rw-r--r--lang/pike/scripts/configure.pike10
2 files changed, 11 insertions, 12 deletions
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
;;