- Update to 7.6.48

PR:		ports/88378
Submitted by:	Xavier Beaudouin <kiwi@oav.net> (maintainer)

4 files changed, 23 insertions, 24 deletions

diff --git a/lang/pike76/Makefile b/lang/pike76/Makefile
index fdf4e6c6f475..95f7a340448d 100644
--- a/lang/pike76/Makefile
+++ b/lang/pike76/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	pike76
-PORTVERSION=	7.6.24
+PORTVERSION=	7.6.48
 CATEGORIES=	lang
-MASTER_SITES=	ftp://pike.ida.liu.se/pub/pike/all/${PORTVERSION}/ \
+MASTER_SITES=	ftp://pike.ida.liu.se/pub/pike/beta/${PORTVERSION}/ \
+		ftp://pike.ida.liu.se/pub/pike/all/${PORTVERSION}/ \
 		ftp://ftp.oav.net/pike/7.6/ \
 		ftp://ftp.caudium.net/pike/official_releases/${PORTVERSION}/ \
 		ftp://ftp.us.caudium.net/pub/pike/7.6/ \
@@ -41,11 +42,8 @@ OPTIONS=	TTF "Add FreeType 1 support" on \
 
 MAN1=		pike.1
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/src/
-
 WANT_MESA=	yes
 
-GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS+=${PTHREAD_CFLAGS}
 CONFIGURE_ARGS+=	--without-debug \
 		 --with-thread-library=${PTHREAD_LIBS} \
@@ -76,9 +74,12 @@ CONFIGURE_ARGS+=	--without-debug \
 		 --without-machine-code \
 		 --prefix=${PREFIX}
 
+MAKE_ARGS=	"CONFIGUREARGS=${CONFIGURE_ARGS}"
+
 USE_REINPLACE=	yes
 USE_GETTEXT=	yes
 USE_BISON=	yes
+USE_GMAKE=	yes
 
 .include <bsd.port.pre.mk>
 
@@ -154,7 +155,7 @@ CONFIGURE_ARGS+=	--with-mysql=${PREFIX}
 CONFIGURE_ARGS+=	--without-mysql
 .endif
 
-.if defined(WITH_POSTGRES)
+.if defined(WITH_POSTGRESQL)
 USE_PGSQL=	yes
 CONFIGURE_ARGS+=	--with-pgsql=${PREFIX}
 .else
@@ -221,8 +222,6 @@ CONFIGURE_ARGS+=	--with-GL --with-GLUT
 CONFIGURE_ARGS+=	--without-GL --without-GLUT
 .endif
 
-USE_GMAKE=	yes
-
 INSTALL_TARGET=	install_nodoc
 
 pre-configure:
@@ -230,19 +229,19 @@ pre-configure:
 
 post-patch:
 	@${REINPLACE_CMD} -e 's| -lgmp| -L${LOCALBASE}/lib -lgmp|' \
-		${WRKSRC}/modules/Gmp/configure ${WRKSRC}/modules/_Image_XFace/configure
+		${WRKSRC}/src/modules/Gmp/configure ${WRKSRC}/src/modules/_Image_XFace/configure
 	@${REINPLACE_CMD} -e 's|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|' \
-		${WRKSRC}/configure
+		${WRKSRC}/src/configure
 	@${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
-		${WRKSRC}/configure
+		${WRKSRC}/src/configure
 
 post-install:
 	${STRIP_CMD} ${PREFIX}/pike/${PORTVERSION}/bin/pike
-	${INSTALL_SCRIPT} ${WRKSRC}hilfe ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}../man/pike.1 ${MAN1PREFIX}/man/man1
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/hilfe ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/man/pike.1 ${MAN1PREFIX}/man/man1
 
-verify:
-	@(cd ${WRKSRC}; make verify)
+#verify:
+#	@(cd ${WRKSRC}; make verify)
 
 # Autodocs is currently b0rken.... :/
 #doc:
diff --git a/lang/pike76/distinfo b/lang/pike76/distinfo
index 27b4c4787c65..16b5758ca9e9 100644
--- a/lang/pike76/distinfo
+++ b/lang/pike76/distinfo
@@ -1,2 +1,2 @@
-MD5 (Pike-v7.6.24.tar.gz) = 4e39c43a00c6566a9638ef48499bbc82
-SIZE (Pike-v7.6.24.tar.gz) = 10285765
+MD5 (Pike-v7.6.48.tar.gz) = 9a822abed615f150566e267847fa7ec9
+SIZE (Pike-v7.6.48.tar.gz) = 17477493
diff --git a/lang/pike76/files/patch-ab b/lang/pike76/files/patch-ab
index 164c72981932..2b0719daade4 100644
--- a/lang/pike76/files/patch-ab
+++ b/lang/pike76/files/patch-ab
@@ -1,6 +1,6 @@
---- modules/_Image_FreeType/configure.orig	Mon May  3 13:58:33 2004
-+++ modules/_Image_FreeType/configure	Mon May  3 13:59:12 2004
-@@ -2048,8 +2048,8 @@
+--- src/modules/_Image_FreeType/configure.orig	Tue Nov  1 09:57:18 2005
++++ src/modules/_Image_FreeType/configure	Tue Nov  1 09:57:45 2005
+@@ -2682,8 +2682,8 @@
  fi
  
    else
@@ -8,6 +8,6 @@
 -set dummy ${ac_tool_prefix}freetype-config; ac_word=$2
 +    # Extract the first word of "freetype-config", so it can be a program name with args.
 +set dummy freetype-config; ac_word=$2
- echo "$as_me:2053: checking for $ac_word" >&5
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_path_FT_CONFIG+set}" = set; then
diff --git a/lang/pike76/files/patch-install.pike b/lang/pike76/files/patch-install.pike
index b83725f302ad..b2e5277102f6 100644
--- a/lang/pike76/files/patch-install.pike
+++ b/lang/pike76/files/patch-install.pike
@@ -1,6 +1,6 @@
---- ../bin/install.pike.orig	Sat Feb 21 03:14:53 2004
-+++ ../bin/install.pike	Sat Feb 21 03:12:41 2004
-@@ -1380,7 +1380,7 @@
+--- bin/install.pike.orig	Tue Nov  1 09:58:59 2005
++++ bin/install.pike	Tue Nov  1 09:59:20 2005
+@@ -1707,7 +1707,7 @@
  
      if(file_stat(vars->MANDIR_SRC))
      {