- Update to version 4.1a.2

PR:		187040
Submitted by:	Ports Fury

4 files changed, 50 insertions, 39 deletions

diff --git a/lang/bigloo/Makefile b/lang/bigloo/Makefile
index 6e2290017230..40c47556797a 100644
--- a/lang/bigloo/Makefile
+++ b/lang/bigloo/Makefile
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	bigloo
-PORTVERSION=	4.0b
+PORTVERSION=	4.1a.2
 CATEGORIES=	lang scheme
 MASTER_SITES=	ftp://ftp-sop.inria.fr/indes/fp/Bigloo/
-DISTNAME=	${PORTNAME}${PORTVERSION}
+DISTNAME=	${PORTNAME}${PORTVERSION:R}-${PORTVERSION:E}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Scheme interpreter and native code compiler
@@ -16,12 +16,7 @@ LICENSE_COMB=	multi
 LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
 		libgmp.so:${PORTSDIR}/math/gmp
 
-OPTIONS_DEFINE=	ALSA AVAHI DOCS FLAC GSTREAMER MPG123 OPENSSL SQLITE
-OPTIONS_DEFAULT=OPENSSL
-OPTIONS_SUB=	yes
-
-USES=		gmake
-USE_GCC=	yes
+USES=		compiler:c++0x gmake
 USE_EMACS=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	pcrelib="-L${LOCALBASE}/lib -lpcre" \
@@ -36,19 +31,31 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--disable-phidget
 ALL_TARGET=	build compile-bee
 INSTALL_TARGET=	install-progs install-bee
-USE_LDCONFIG=	${PREFIX}/lib ${PREFIX}/lib/bigloo/${PORTVERSION}
-PLIST_SUB=	BIGLOO_VERSION="${PORTVERSION}"
+USE_LDCONFIG=	${PREFIX}/lib ${PREFIX}/lib/bigloo/${PORTVERSION:R}
 MAKE_JOBS_UNSAFE=yes
 
 CPPFLAGS+=	-idirafter ${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+PLIST_SUB=	BIGLOO_VERSION="${PORTVERSION:R}"
+
 INFO=		bdb bigloo
 
+OPTIONS_DEFINE=		ALSA AVAHI CUSTOMGC DOCS FLAC GSTREAMER MPG123 \
+			OPENSSL SQLITE
+OPTIONS_DEFAULT=	OPENSSL
+OPTIONS_SUB=		yes
+
 ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
 ALSA_CONFIGURE_OFF=	--disable-alsa --disable-wav
 AVAHI_LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app
 AVAHI_CONFIGURE_OFF=	--disable-avahi
+CUSTOMGC_DESC=		Build with custom garbage collector
+CUSTOMGC_LIB_DEPENDS_OFF=\
+			libgc.so:${PORTSDIR}/devel/boehm-gc
+CUSTOMGC_CONFIGURE_OFF=	--customgc=no \
+			--gcincdir=${LOCALBASE}/include \
+			--gclibdir=${LOCALBASE}/lib
 FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
 FLAC_CONFIGURE_OFF=	--disable-flac
 GSTREAMER_USE=		GSTREAMER=yes
@@ -60,7 +67,7 @@ OPENSSL_CONFIGURE_OFF=	--disable-ssl
 SQLITE_USE=		SQLITE=yes
 SQLITE_CONFIGURE_OFF=	--disable-pkglib --disable-sqlite
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${ARCH} == "sparc64"
 BROKEN=		Does not compile on sparc64
@@ -69,19 +76,23 @@ BROKEN=		Does not compile on sparc64
 post-patch:
 	@${REINPLACE_CMD} -e 's|"-lthr"|"-pthread"|g' \
 		${WRKSRC}/autoconf/pthread
+.for i in autoconf/mixer api/multimedia/src/Unix/bglmixer.c
 	@${REINPLACE_CMD} -e 's|machine/soundcard|sys/soundcard|g' \
-		${WRKSRC}/autoconf/mixer \
-		${WRKSRC}/api/multimedia/src/Unix/bglmixer.c
+		${WRKSRC}/${i}
+.endfor
 	@${FIND} ${WRKSRC}/gc -maxdepth 1 -type f | ${XARGS} \
 		${REINPLACE_CMD} -e '/LDFLAGS=/s|export|true|g'
 
 post-install:
-.for i in bglafile bgldepend bgljfile bglmake bglmco bglpp bglprof bgltags bigloo
-	${INSTALL_MAN} ${WRKSRC}/manuals/${i}.man \
-		${STAGEDIR}${MANPREFIX}/man/man1/${i}.1
+.for i in bglafile bgldepend bgljfile bglmake bglmco bglpp bglprof bgltags \
+	bigloo
+	(cd ${WRKSRC}/manuals && ${INSTALL_MAN} ${i}.man \
+		${STAGEDIR}${MANPREFIX}/man/man1/${i}.1)
 .endfor
-	(cd ${WRKSRC}/manuals && ${INSTALL_DATA} bdb.info bigloo.info \
+.for i in bdb bigloo
+	(cd ${WRKSRC}/manuals && ${INSTALL_DATA} ${i}.info \
 		${STAGEDIR}${PREFIX}/${INFO_PATH})
+.endfor
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/manuals && ${INSTALL_DATA} *.html *.sui \
 		${STAGEDIR}${DOCSDIR})
@@ -89,4 +100,4 @@ post-install:
 test: build
 	@(cd ${WRKSRC}; ${MAKE_CMD} test)
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/lang/bigloo/distinfo b/lang/bigloo/distinfo
index 0477fb3f4303..d3cadaac9e9e 100644
--- a/lang/bigloo/distinfo
+++ b/lang/bigloo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bigloo4.0b.tar.gz) = f16f690e7340e8a8f90f9e294c93efce6b70eb53ec0c421d827b0187081493b9
-SIZE (bigloo4.0b.tar.gz) = 20884078
+SHA256 (bigloo4.1a-2.tar.gz) = 6e5926e2d44b0e61fca4d756bc3b292586ba8b492be541d47d1690d9333e5571
+SIZE (bigloo4.1a-2.tar.gz) = 22387008
diff --git a/lang/bigloo/files/patch-configure b/lang/bigloo/files/patch-configure
index 9368d54b2cfa..cfaa3c9cd022 100644
--- a/lang/bigloo/files/patch-configure
+++ b/lang/bigloo/files/patch-configure
@@ -1,6 +1,6 @@
 --- configure.orig
 +++ configure
-@@ -2014,12 +2014,10 @@
+@@ -2125,12 +2125,10 @@
  #*---------------------------------------------------------------------*/
  # find out the C library for mpg123
  if [ "$mpg123 " = " " ]; then
@@ -16,7 +16,7 @@
  fi
  
  #*---------------------------------------------------------------------*/
-@@ -2027,7 +2025,10 @@
+@@ -2138,7 +2136,10 @@
  #*---------------------------------------------------------------------*/
  # find out the C library for flac
  if [ "$flac " = " " ]; then
@@ -28,16 +28,16 @@
  fi
  
  #*---------------------------------------------------------------------*/
-@@ -2040,7 +2041,7 @@
- #*---------------------------------------------------------------------*/
+@@ -2152,7 +2153,7 @@
  if [ "$regexp " = " " ]; then
    # find out the C library for pcre
--  pcrelibs=`$autoconf pcre --cflags="$cflags"` || exit 1;
-+  pcrelibs=`$autoconf pcre --cflags="$cflags" --pcrelib="$pcrelib"` || exit 1;
- 
-   if [ "$pcrelibs " != "no " ]; then
-     featureflags="-srfi enable-pcre $featureflags";
-@@ -2226,7 +2227,7 @@
+   if [ "$enable_configure_pcre " = "yes " ]; then
+-    pcrelibs=`$autoconf pcre --cflags="$cflags"` || exit 1;
++    pcrelibs=`$autoconf pcre --cflags="$cflags" --pcrelib="$pcrelib"` || exit 1;
+   else
+     pcrelibs=no
+   fi
+@@ -2349,7 +2350,7 @@
      featureflags="-srfi enable-gmp $featureflags";
      extralibs="-lbigloogmp-$release $extralibs"
    elif [ "$gmpversion " = " " ]; then
@@ -46,7 +46,7 @@
  
      if [ $gmpversion = "no" ]; then
        havegmp=0;
-@@ -2359,8 +2360,8 @@
+@@ -2506,8 +2507,8 @@
      fi
    fi
  
@@ -57,7 +57,7 @@
  
    long_sign_bit=`$autoconf signbit --type=long --alignment="$alignment"` || exit 1
    elong_sign_bit=`$autoconf signbit --type=long --alignment=0` || exit 1
-@@ -3277,7 +3278,7 @@
+@@ -3454,7 +3455,7 @@
    fi
  
    # MPG123
@@ -66,7 +66,7 @@
      echo "MPG123=$mpg123" >> $makefile_cfg
      echo "MPG123LIBS=$mpg123libs" >> $makefile_cfg
      echo "MPG123CFLAGS=$mpg123cflags" >> $makefile_cfg
-@@ -3302,13 +3303,14 @@
+@@ -3479,13 +3480,14 @@
      apis=$napis;
      echo "MPG123=" >> $makefile_cfg
      echo "MPG123LIBS=" >> $makefile_cfg
diff --git a/lang/bigloo/pkg-plist b/lang/bigloo/pkg-plist
index f4501d85532a..12723b046e44 100644
--- a/lang/bigloo/pkg-plist
+++ b/lang/bigloo/pkg-plist
@@ -109,10 +109,10 @@ lib/bigloo/%%BIGLOO_VERSION%%/libbigloofthread_s-%%BIGLOO_VERSION%%.a
 lib/bigloo/%%BIGLOO_VERSION%%/libbigloofthread_s-%%BIGLOO_VERSION%%.so
 lib/bigloo/%%BIGLOO_VERSION%%/libbigloofthread_u-%%BIGLOO_VERSION%%.a
 lib/bigloo/%%BIGLOO_VERSION%%/libbigloofthread_u-%%BIGLOO_VERSION%%.so
-lib/bigloo/%%BIGLOO_VERSION%%/libbigloogc-%%BIGLOO_VERSION%%.a
-lib/bigloo/%%BIGLOO_VERSION%%/libbigloogc-%%BIGLOO_VERSION%%.so
-lib/bigloo/%%BIGLOO_VERSION%%/libbigloogc_fth-%%BIGLOO_VERSION%%.a
-lib/bigloo/%%BIGLOO_VERSION%%/libbigloogc_fth-%%BIGLOO_VERSION%%.so
+%%CUSTOMGC%%lib/bigloo/%%BIGLOO_VERSION%%/libbigloogc-%%BIGLOO_VERSION%%.a
+%%CUSTOMGC%%lib/bigloo/%%BIGLOO_VERSION%%/libbigloogc-%%BIGLOO_VERSION%%.so
+%%CUSTOMGC%%lib/bigloo/%%BIGLOO_VERSION%%/libbigloogc_fth-%%BIGLOO_VERSION%%.a
+%%CUSTOMGC%%lib/bigloo/%%BIGLOO_VERSION%%/libbigloogc_fth-%%BIGLOO_VERSION%%.so
 %%GSTREAMER%%lib/bigloo/%%BIGLOO_VERSION%%/libbigloogstreamer_es-%%BIGLOO_VERSION%%.a
 %%GSTREAMER%%lib/bigloo/%%BIGLOO_VERSION%%/libbigloogstreamer_es-%%BIGLOO_VERSION%%.so
 %%GSTREAMER%%lib/bigloo/%%BIGLOO_VERSION%%/libbigloogstreamer_eu-%%BIGLOO_VERSION%%.a
@@ -339,8 +339,8 @@ lib/libbigloofthread_es-%%BIGLOO_VERSION%%.so
 lib/libbigloofthread_eu-%%BIGLOO_VERSION%%.so
 lib/libbigloofthread_s-%%BIGLOO_VERSION%%.so
 lib/libbigloofthread_u-%%BIGLOO_VERSION%%.so
-lib/libbigloogc-%%BIGLOO_VERSION%%.so
-lib/libbigloogc_fth-%%BIGLOO_VERSION%%.so
+%%CUSTOMGC%%lib/libbigloogc-%%BIGLOO_VERSION%%.so
+%%CUSTOMGC%%lib/libbigloogc_fth-%%BIGLOO_VERSION%%.so
 %%GSTREAMER%%lib/libbigloogstreamer_es-%%BIGLOO_VERSION%%.so
 %%GSTREAMER%%lib/libbigloogstreamer_eu-%%BIGLOO_VERSION%%.so
 %%GSTREAMER%%lib/libbigloogstreamer_s-%%BIGLOO_VERSION%%.so