- Update to Pike 7.8.852

- Stagify

2 files changed, 29 insertions, 51 deletions

diff --git a/lang/pike78/Makefile b/lang/pike78/Makefile
index bad17abd5654..a382b57fcbf9 100644
--- a/lang/pike78/Makefile
+++ b/lang/pike78/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	pike78
-PORTVERSION=	7.8.700
-PORTREVISION=	4
+PORTVERSION=	7.8.852
 CATEGORIES=	lang
 MASTER_SITES=	http://pike.ida.liu.se/pub/pike/all/${PORTVERSION}/ \
 		ftp://pike.ida.liu.se/pub/pike/beta/${PORTVERSION}/ \
@@ -25,9 +24,15 @@ CONFLICTS=	pike7[26]-[0-9]*
 OPTIONS_DEFINE=	TTF FREETYPE MYSQL PGSQL
 OPTIONS_DEFAULT=TTF FREETYPE MYSQL
 NO_OPTIONS_SORT=yes
-TTF_DESC?=	Enable FreeType 1 (libttf) font rendering engine
-
-MAN1=		pike.1
+TTF_DESC?=		Enable FreeType 1 (libttf) font rendering engine
+TTF_LIB_DEPENDS=	libttf.so:${PORTSDIR}/print/freetype
+TTF_CONFIGURE_WITH=	ttflib
+FREETYPE_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+FREETYPE_CONFIGURE_WITH=freetype
+MYSQL_USE=		mysql=yes
+MYSQL_CONFIGURE_WITH=	mysql
+PGSQL_USE=		pgsql=yes
+PGSQL_CONFIGURE_WITH=	pgsql
 
 CFLAGS+=	-ffast-math -fomit-frame-pointer
 
@@ -75,46 +80,14 @@ CONFIGURE_ARGS+=	--without-debug \
 
 USES=		bison gettext gmake perl5
 
-PLIST_FILES=	bin/pike bin/pike78 bin/hilfe
-
-NO_STAGE=	yes
-
-.include <bsd.port.pre.mk>
+PLIST_FILES=	bin/pike bin/pike78 bin/hilfe \
+		man/man1/pike.1.gz
 
 ONLY_FOR_ARCHS=	i386 amd64
 
-.if ${PORT_OPTIONS:MTTF}
-LIB_DEPENDS+=	libttf.so:${PORTSDIR}/print/freetype
-CONFIGURE_ARGS+=	--with-ttflib
-.else
-CONFIGURE_ARGS+=	--without-ttflib
-.endif
-
-.if ${PORT_OPTIONS:MFREETYPE}
-LIB_DEPENDS+=	libfreetype.so:${PORTSDIR}/print/freetype2
-CONFIGURE_ARGS+=	--with-freetype
-.else
-CONFIGURE_ARGS+=	--without-freetype
-.endif
-
-.if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL=	yes
-CONFIGURE_ARGS+=	--with-mysql=${PREFIX}
-.else
-CONFIGURE_ARGS+=	--without-mysql
-.endif
-
-.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL=	yes
-CONFIGURE_ARGS+=	--with-pgsql=${PREFIX}
-.else
-CONFIGURE_ARGS+=	--without-pgsql
-.endif
-
 do-configure:
 	@${MAKE} -C ${WRKSRC} configure CONFIGUREARGS="${CONFIGURE_ARGS}"
 
-
 post-patch:
 	@${REINPLACE_CMD} -e 's| -lgmp| -L${LOCALBASE}/lib -lgmp|' \
 		${WRKSRC}/src/modules/Gmp/configure ${WRKSRC}/src/modules/_Image_XFace/configure
@@ -125,17 +98,22 @@ post-patch:
 	@${REINPLACE_CMD} -e '/install.*MANDIR/s|^|//|' \
 		${WRKSRC}/bin/install.pike
 
+do-install:
+	@cd ${WRKSRC} && ${GMAKE} ${INSTALL_TARGET} buildroot=${STAGEDIR}
+
 post-install:
-	${STRIP_CMD} ${PREFIX}/pike/${PORTVERSION}/bin/pike
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/hilfe ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/man/pike.1 ${MAN1PREFIX}/man/man1
-	@cd ${PREFIX} && ${FIND} pike/${PORTVERSION} ! -type d >> ${TMPPLIST}
-	@cd ${PREFIX} && ${FIND} pike/${PORTVERSION} -type d -empty -delete
-	@cd ${PREFIX} && ${FIND} -d pike/${PORTVERSION} -type d | \
-		${SED} 's,^,@dirrm ,' >> ${TMPPLIST}
-	@${ECHO} '@unexec rmdir %D/pike 2>/dev/null || true' >> ${TMPPLIST}
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/pike/${PORTVERSION}/bin/pike
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/hilfe ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/man/pike.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	@cd ${STAGEDIR}${PREFIX} && \
+		(${FIND} pike/${PORTVERSION} ! -type d && \
+		${FIND} pike/${PORTVERSION} -type d -empty -delete && \
+		${FIND} -d pike/${PORTVERSION} -type d | \
+		${SED} 's,^,@dirrm ,' && \
+		${ECHO_CMD} '@unexec rmdir %D/pike 2>/dev/null || true' \
+		) >> ${TMPPLIST}
 
 verify:
-	@(cd ${WRKSRC}; make verify)
+	cd ${WRKSRC}; ${GMAKE} verify
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/lang/pike78/distinfo b/lang/pike78/distinfo
index 90890e2f973c..c2a8c5901014 100644
--- a/lang/pike78/distinfo
+++ b/lang/pike78/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Pike-v7.8.700.tar.gz) = b29b294b766bda805fc539e2cb9661bc86c54e3f735271ff760bbe20bff1de19
-SIZE (Pike-v7.8.700.tar.gz) = 14874033
+SHA256 (Pike-v7.8.852.tar.gz) = 8730e37a72cbc2e0e469450e9a2c9a8823390bc8787890add2ac107ed3cc85d0
+SIZE (Pike-v7.8.852.tar.gz) = 14273581