- Update to 7.5.21

- Fix threads support that was broken

PR:		ports/64344
Submitted by:	maintainer

6 files changed, 14 insertions, 110 deletions

diff --git a/lang/pike76/Makefile b/lang/pike76/Makefile
index 213f93eb1a4f..932093863e9a 100644
--- a/lang/pike76/Makefile
+++ b/lang/pike76/Makefile
@@ -6,17 +6,13 @@
 #
 
 PORTNAME=	pike75
-PORTVERSION=	7.5.17
-PORTREVISION=	1
+PORTVERSION=	7.5.21
 CATEGORIES=	lang
 MASTER_SITES=	ftp://pike.ida.liu.se/pub/pike/all/${PORTVERSION}/ \
-		ftp://ftp.oav.net/pkg_freebsd/distfiles/ \
-		http://ftp.oav.net/pkg_freebsd/distfiles/ \
 		ftp://ftp.oav.net/pike/7.5/export/ \
-		http://ftp.oav.net/pike/7.5/export/ \
 		http://grendel.firewall.com/caudium-pkg/ \
 		ftp://ftp.caudium.net/pike/official_releases/${PORTVERSION}/
-DISTNAME=	Pike-v${PORTVERSION}-4
+DISTNAME=	Pike-v${PORTVERSION}
 
 MAINTAINER=	kiwi@oav.net
 COMMENT=	A dynamic programming language with a syntax similar to C++
@@ -26,9 +22,8 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		gdbm.3:${PORTSDIR}/databases/gdbm \
 		fftw.2:${PORTSDIR}/math/fftw \
 		pcre.0:${PORTSDIR}/devel/pcre \
+		nettle.1:${PORTSDIR}/security/nettle \
 		mird.1:${PORTSDIR}/databases/mird
-# Nettle doesn't work ;(
-#		nettle.1:${PORTSDIR}/security/nettle \
 
 OPTIONS=	TTF "Add FreeType 1 support" on \
 		FREETYPE "Add FreeType 2 support" on \
@@ -42,8 +37,9 @@ WRKSRC=		${WRKDIR}/Pike-v${PORTVERSION}/src/
 WANT_MESA=	yes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS+=${PTHREAD_LIBS} CPPFLAGS+=${PTHREAD_CFLAGS}
+CONFIGURE_ENV=	CPPFLAGS+=${PTHREAD_CFLAGS}
 CONFIGURE_ARGS+=	--without-debug \
+		 --with-thread-library=${PTHREAD_LIBS} \
 		 --with-double-precision \
 		 --with-long-double-precision \
 		 --disable-rpath \
@@ -279,15 +275,10 @@ CONFIGURE_ARGS+=	--with-GL --with-GLUT
 CONFIGURE_ARGS+=	--without-GL --without-GLUT
 .endif
 
-#.if (${MACHINE} == "i386")
-#CONFIGURE_ARGS+= --with-poll
-#.else
-## Alpha seems to have problems with poll() with pike... :/
-#CONFIGURE_ARGS+= --without-poll
-#.endif
-
 USE_GMAKE=	yes
 
+INSTALL_TARGET=	install_nodoc
+
 pre-configure:
 	@${ECHO} ${CONFIGURE_ARGS}
 
diff --git a/lang/pike76/distinfo b/lang/pike76/distinfo
index ff298a0d8942..a84e7ac20c8a 100644
--- a/lang/pike76/distinfo
+++ b/lang/pike76/distinfo
@@ -1,2 +1,2 @@
-MD5 (Pike-v7.5.17-4.tar.gz) = c4c62ec2f342c73aa77c13157a094cf5
-SIZE (Pike-v7.5.17-4.tar.gz) = 7401405
+MD5 (Pike-v7.5.21.tar.gz) = 877ba7a831656bb98b0b4369e94d2603
+SIZE (Pike-v7.5.21.tar.gz) = 10141665
diff --git a/lang/pike76/files/patch-aa b/lang/pike76/files/patch-aa
deleted file mode 100644
index f9a279c86d1e..000000000000
--- a/lang/pike76/files/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
---- Makefile.in.orig	Tue Jan 13 19:26:50 2004
-+++ Makefile.in	Thu Feb  5 17:03:20 2004
-@@ -425,8 +425,8 @@
- 	@:
- 
- # install
--install: pike tools autodoc.xml
--	@$(RUNPIKE) $(TMP_BINDIR)/install.pike \
-+install: pike tools
-+	@$(RUNPIKE) $(TMP_BINDIR)/install.pike --no-autodoc \
- 	exec_prefix="$(exec_prefix)" lib_prefix="$(lib_prefix)" \
- 	TMP_LIBDIR="$(TMP_LIBDIR)" LIBDIR_SRC="$(LIBDIR_SRC)" \
- 	SRCDIR="$(SRCDIR)" prefix="$(prefix)" DOCDIR_SRC="$(DOCDIR_SRC)" \
-@@ -435,8 +435,8 @@
- 	fakeroot="$(buildroot)" PIKE_MODULE_RELOC="$(PIKE_MODULE_RELOC)" \
- 	$(INSTALLARGS)
- 
--install_interactive: pike tools autodoc.xml
--	@$(RUNPIKE) $(TMP_BINDIR)/install.pike --interactive \
-+install_interactive: pike tools
-+	@$(RUNPIKE) $(TMP_BINDIR)/install.pike --interactive --no-autodoc \
- 	exec_prefix="$(exec_prefix)"  prefix=$(prefix) \
- 	TMP_LIBDIR="$(TMP_LIBDIR)" LIBDIR_SRC="$(LIBDIR_SRC)" \
- 	SRCDIR="$(SRCDIR)" DOCDIR_SRC="$(DOCDIR_SRC)" \
diff --git a/lang/pike76/files/patch-ab b/lang/pike76/files/patch-ab
index 80b11e736382..c2cb30063d3d 100644
--- a/lang/pike76/files/patch-ab
+++ b/lang/pike76/files/patch-ab
@@ -1,6 +1,6 @@
---- modules/_Image_FreeType/configure.orig	Fri Feb  6 14:35:54 2004
-+++ modules/_Image_FreeType/configure	Fri Feb  6 14:36:58 2004
-@@ -2047,8 +2047,8 @@
+--- modules/_Image_FreeType/configure.orig	Tue Mar 16 14:58:23 2004
++++ modules/_Image_FreeType/configure	Tue Mar 16 14:59:04 2004
+@@ -2046,8 +2046,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:2052: checking for $ac_word" >&5
+ echo "$as_me:2051: 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-configure b/lang/pike76/files/patch-configure
deleted file mode 100644
index 773422515b02..000000000000
--- a/lang/pike76/files/patch-configure
+++ /dev/null
@@ -1,46 +0,0 @@
---- configure.orig	Fri Feb 20 20:41:26 2004
-+++ configure	Sat Feb 21 02:29:33 2004
-@@ -27161,14 +27161,14 @@
- 
-         if test "x$PTHREAD_CONFIG" = xno ; then
- 
--  echo "$as_me:27164: checking -pthread" >&5
--echo $ECHO_N "checking -pthread... $ECHO_C" >&6
-+  echo "$as_me:27164: checking %%PTHREAD_CFLAGS%%" >&5
-+echo $ECHO_N "checking %%PTHREAD_CFLAGS%%.. $ECHO_C" >&6
-   if test "${pike_cv_option_pthread+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-     OLD_CPPFLAGS="$CPPFLAGS"
--    CPPFLAGS="$OLD_CPPFLAGS -pthread"
-+    CPPFLAGS="$OLD_CPPFLAGS %%PTHREAD_CFLAGS%%"
-     old_ac_link="$ac_link"
-     ac_link="$old_ac_link 2>conftezt.out.2"
-     if test "$cross_compiling" = yes; then
-@@ -27275,10 +27275,10 @@
- fi
- 
-   if test x"$pike_cv_option_pthread" = "xyes" ; then
--    CFLAGS="$CFLAGS -pthread"
-+    CFLAGS="$CFLAGS %%PTHREAD_CFLAGS%%"
-     case "CFLAGS" in
-       OPTIMIZE)
--        CFLAGS="$CFLAGS -pthread"
-+        CFLAGS="$CFLAGS %%PTHREAD_CFLAGS%%"
-       ;;
-     esac
-     echo "$as_me:27284: result: yes" >&5
-@@ -27287,10 +27287,10 @@
-   else
-     echo "$as_me:27288: result: no" >&5
- echo "${ECHO_T}no" >&6
--    LIBS="$LIBS -lc_r"
-+    LIBS="$LIBS %%PTHREAD_LIBS%%"
-   fi
- 
--          LD_FALLBACK_FLAGS="${LD_FALLBACK_FLAGS-} -lc_r"
-+          LD_FALLBACK_FLAGS="${LD_FALLBACK_FLAGS-} %%PTHREAD_LIBS%%"
- 
-           echo "$as_me:27295: checking Initial stack limit" >&5
- echo $ECHO_N "checking Initial stack limit... $ECHO_C" >&6
diff --git a/lang/pike76/pkg-plist b/lang/pike76/pkg-plist
index b2b3d6c05119..72a427a6a737 100644
--- a/lang/pike76/pkg-plist
+++ b/lang/pike76/pkg-plist
@@ -257,6 +257,7 @@ pike/%%PORTVERSION%%/lib/modules/Tools.pmod/sed.pmod
 pike/%%PORTVERSION%%/lib/modules/Web.pmod/Crawler.pmod
 pike/%%PORTVERSION%%/lib/modules/Yabu.pmod/module.pmod
 pike/%%PORTVERSION%%/lib/modules/_Image.pmod/module.pmod
+pike/%%PORTVERSION%%/lib/include/regexp.h
 pike/%%PORTVERSION%%/lib/include/array.h
 pike/%%PORTVERSION%%/lib/include/fifo.h
 pike/%%PORTVERSION%%/lib/include/getopt.h
@@ -316,7 +317,6 @@ pike/%%PORTVERSION%%/lib/7.4/modules/Regexp.pmod
 pike/%%PORTVERSION%%/lib/7.4/modules/Crypto.pmod/arcfour.pike
 pike/%%PORTVERSION%%/lib/7.4/modules/Crypto.pmod/aes.pike
 pike/%%PORTVERSION%%/lib/7.4/modules/Crypto.pmod/rijndael.pike
-pike/%%PORTVERSION%%/lib/7.4/modules/Crypto.pmod/des.pike.o
 pike/%%PORTVERSION%%/lib/7.4/modules/Crypto.pmod/cast.pike
 pike/%%PORTVERSION%%/lib/7.4/modules/Crypto.pmod/cbc.pike
 pike/%%PORTVERSION%%/lib/7.4/modules/Crypto.pmod/crypto.pike
@@ -329,20 +329,7 @@ pike/%%PORTVERSION%%/lib/7.4/modules/Crypto.pmod/md4.pike
 pike/%%PORTVERSION%%/lib/7.4/modules/Crypto.pmod/md5.pike
 pike/%%PORTVERSION%%/lib/7.4/modules/Crypto.pmod/module.pmod
 pike/%%PORTVERSION%%/lib/7.4/modules/Crypto.pmod/pipe.pike
-pike/%%PORTVERSION%%/lib/7.4/modules/Crypto.pmod/aes.pike.o
-pike/%%PORTVERSION%%/lib/7.4/modules/Crypto.pmod/des3.pike.o
 pike/%%PORTVERSION%%/lib/7.4/modules/Crypto.pmod/sha.pike
-pike/%%PORTVERSION%%/lib/7.4/modules/Crypto.pmod/arcfour.pike.o
-pike/%%PORTVERSION%%/lib/7.4/modules/Crypto.pmod/cast.pike.o
-pike/%%PORTVERSION%%/lib/7.4/modules/Crypto.pmod/cbc.pike.o
-pike/%%PORTVERSION%%/lib/7.4/modules/Crypto.pmod/crypto.pike.o
-pike/%%PORTVERSION%%/lib/7.4/modules/Crypto.pmod/idea.pike.o
-pike/%%PORTVERSION%%/lib/7.4/modules/Crypto.pmod/invert.pike.o
-pike/%%PORTVERSION%%/lib/7.4/modules/Crypto.pmod/md2.pike.o
-pike/%%PORTVERSION%%/lib/7.4/modules/Crypto.pmod/md4.pike.o
-pike/%%PORTVERSION%%/lib/7.4/modules/Crypto.pmod/md5.pike.o
-pike/%%PORTVERSION%%/lib/7.4/modules/Crypto.pmod/module.pmod.o
-pike/%%PORTVERSION%%/lib/7.4/modules/Crypto.pmod/pipe.pike.o
 pike/%%PORTVERSION%%/lib/7.4/modules/Crypto.pmod/rijndael.pike.o
 pike/%%PORTVERSION%%/lib/7.4/modules/Crypto.pmod/sha.pike.o
 pike/%%PORTVERSION%%/lib/7.4/modules/Locale.pmod/Charset.pmod.o
@@ -351,12 +338,8 @@ pike/%%PORTVERSION%%/lib/7.4/modules/Protocols.pmod/SMTP.pmod.o
 pike/%%PORTVERSION%%/lib/7.4/modules/Protocols.pmod/SMTP.pmod
 pike/%%PORTVERSION%%/lib/7.4/modules/SSL.pmod/constants.pike
 pike/%%PORTVERSION%%/lib/7.4/modules/SSL.pmod/cipher.pike
-pike/%%PORTVERSION%%/lib/7.4/modules/Sql.pmod/sql.pike.o
 pike/%%PORTVERSION%%/lib/7.4/modules/Sql.pmod/sql.pike
-pike/%%PORTVERSION%%/lib/7.4/modules/Standards.pmod/ASN1.pmod/Encode.pmod.o
 pike/%%PORTVERSION%%/lib/7.4/modules/Standards.pmod/ASN1.pmod/Encode.pmod
-pike/%%PORTVERSION%%/lib/7.4/modules/Regexp.pmod.o
-pike/%%PORTVERSION%%/lib/7.4/modules/__default.pmod.o
 pike/%%PORTVERSION%%/lib/master.pike
 pike/%%PORTVERSION%%/lib/master.pike.o
 pike/%%PORTVERSION%%/lib/master.pike.in