- Update to version 3.8c

PR:		ports/169003
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

3 files changed, 66 insertions, 19 deletions

diff --git a/lang/bigloo/Makefile b/lang/bigloo/Makefile
index f12a8c8c57bc..9632e46e5e4a 100644
--- a/lang/bigloo/Makefile
+++ b/lang/bigloo/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	bigloo
-PORTVERSION=	3.7a.2
-PORTREVISION=	2
+PORTVERSION=	3.8c
 CATEGORIES=	lang scheme
 MASTER_SITES=	ftp://ftp-sop.inria.fr/indes/fp/Bigloo/
-DISTNAME=	${PORTNAME}${PORTVERSION:R}-${PORTVERSION:E}
+DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Scheme interpreter and native code compiler
@@ -18,14 +17,13 @@ COMMENT=	A Scheme interpreter and native code compiler
 LICENSE=	GPLv2 LGPL20
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	gc.1:${PORTSDIR}/devel/boehm-gc \
-		gmp.10:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre \
+		gmp:${PORTSDIR}/math/gmp
 
-OPTIONS_DEFINE=	ALSA FLAC GSTREAMER MPG123 SQLITE OPENSSL DOCS
-OPTIONS_DEFAULT=	OPENSSL
+OPTIONS_DEFINE=	AVAHI ALSA FLAC GSTREAMER MPG123 SQLITE OPENSSL DOCS
+OPTIONS_DEFAULT=OPENSSL
 MPG123_DESC=	Enable MPG123 support
 
-WANT_GSTREAMER=	yes
 USE_GCC=	4.6+
 USE_EMACS=	yes
 USE_GMAKE=	yes
@@ -33,14 +31,12 @@ HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--docdir=${WRKDIR}/fakeroot \
 		--lispdir=${LOCALBASE}/${EMACS_SITE_LISPDIR}/bigloo \
-		--customgc=no \
-		--gclibdir=${LOCALBASE}/lib \
-		--gcincdir=${LOCALBASE}/include \
-		--emacs=${EMACS_NAME}
+		--emacs=${EMACS_NAME} \
+		--disable-phidget
 ALL_TARGET=	build compile-bee
 INSTALL_TARGET=	install-progs install-bee
-USE_LDCONFIG=	${PREFIX}/lib ${PREFIX}/lib/bigloo/${PORTVERSION:R}
-PLIST_SUB=	BIGLOO_VERSION="${PORTVERSION:R}"
+USE_LDCONFIG=	${PREFIX}/lib ${PREFIX}/lib/bigloo/${PORTVERSION}
+PLIST_SUB=	BIGLOO_VERSION="${PORTVERSION}"
 MAKE_JOBS_UNSAFE=yes
 
 MAN1=		bigloo.1
@@ -48,8 +44,16 @@ INFO=		bigloo
 
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MAVAHI}
+LIB_DEPENDS+=	avahi-client:${PORTSDIR}/net/avahi-app
+PLIST_SUB+=	AVAHI=""
+.else
+CONFIGURE_ARGS+=--disable-avahi
+PLIST_SUB+=	AVAHI="@comment "
+.endif
+
 .if ${PORT_OPTIONS:MALSA}
-LIB_DEPENDS+=	asound.2:${PORTSDIR}/audio/alsa-lib
+LIB_DEPENDS+=	asound:${PORTSDIR}/audio/alsa-lib
 PLIST_SUB+=	ALSA=""
 .else
 CONFIGURE_ARGS+=--disable-alsa
@@ -57,7 +61,10 @@ PLIST_SUB+=	ALSA="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MFLAC}
-LIB_DEPENDS+=	FLAC.10:${PORTSDIR}/audio/flac
+.if empty(PORT_OPTIONS:MALSA)
+IGNORE=		FLAC support requires ALSA
+.endif
+LIB_DEPENDS+=	FLAC:${PORTSDIR}/audio/flac
 PLIST_SUB+=	FLAC=""
 .else
 CONFIGURE_ARGS+=--disable-flac
@@ -73,7 +80,10 @@ PLIST_SUB+=	GSTREAMER="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMPG123}
-LIB_DEPENDS+=	mpg123.0:${PORTSDIR}/audio/mpg123
+.if empty(PORT_OPTIONS:MALSA)
+IGNORE=		MPG123 support requires ALSA
+.endif
+LIB_DEPENDS+=	mpg123:${PORTSDIR}/audio/mpg123
 PLIST_SUB+=	MPG123=""
 .else
 CONFIGURE_ARGS+=--disable-mpg123
@@ -114,6 +124,8 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|^coflags=|#coflags=|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|"-lthr"|"${PTHREAD_LIBS}"|g' \
 		${WRKSRC}/autoconf/pthread
+	@${REINPLACE_CMD} -e '/LDFLAGS=/s|export|true|g' \
+		${WRKSRC}/gc/configure-gc-7.3alpha1-20120316
 .for i in autoconf/mixer api/multimedia/src/Unix/bglmixer.c
 	@${REINPLACE_CMD} -e 's|machine/soundcard|sys/soundcard|g' \
 		${WRKSRC}/${i}
diff --git a/lang/bigloo/distinfo b/lang/bigloo/distinfo
index 3fcb8652eea0..6aea5823dda7 100644
--- a/lang/bigloo/distinfo
+++ b/lang/bigloo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bigloo3.7a-2.tar.gz) = f2f84954242482f822fb27da4d247b9ada6920f4e49751148bb5c8a2ddcdcd32
-SIZE (bigloo3.7a-2.tar.gz) = 14432496
+SHA256 (bigloo3.8c.tar.gz) = 3835d6aec4428f7a9dc8029a434b4c845e7ea15728141d60b72f9ebc6ddd45e1
+SIZE (bigloo3.8c.tar.gz) = 17721635
diff --git a/lang/bigloo/pkg-plist b/lang/bigloo/pkg-plist
index 26aadd1f483f..f21014d433db 100644
--- a/lang/bigloo/pkg-plist
+++ b/lang/bigloo/pkg-plist
@@ -17,6 +17,8 @@ lib/bigloo/%%BIGLOO_VERSION%%/Makefile.config
 lib/bigloo/%%BIGLOO_VERSION%%/Makefile.misc
 %%ALSA%%lib/bigloo/%%BIGLOO_VERSION%%/alsa.heap
 %%ALSA%%lib/bigloo/%%BIGLOO_VERSION%%/alsa.init
+%%AVAHI%%lib/bigloo/%%BIGLOO_VERSION%%/avahi.heap
+%%AVAHI%%lib/bigloo/%%BIGLOO_VERSION%%/avahi.init
 lib/bigloo/%%BIGLOO_VERSION%%/bdl.heap
 lib/bigloo/%%BIGLOO_VERSION%%/bdl.init
 lib/bigloo/%%BIGLOO_VERSION%%/bigloo.h
@@ -30,6 +32,8 @@ lib/bigloo/%%BIGLOO_VERSION%%/calendar.heap
 lib/bigloo/%%BIGLOO_VERSION%%/calendar.init
 lib/bigloo/%%BIGLOO_VERSION%%/crypto.heap
 lib/bigloo/%%BIGLOO_VERSION%%/crypto.init
+lib/bigloo/%%BIGLOO_VERSION%%/csv.heap
+lib/bigloo/%%BIGLOO_VERSION%%/csv.init
 %%FLAC%%lib/bigloo/%%BIGLOO_VERSION%%/flac.heap
 %%FLAC%%lib/bigloo/%%BIGLOO_VERSION%%/flac.init
 lib/bigloo/%%BIGLOO_VERSION%%/fthread.heap
@@ -48,6 +52,14 @@ lib/bigloo/%%BIGLOO_VERSION%%/libbigloo_u-%%BIGLOO_VERSION%%.so
 %%ALSA%%lib/bigloo/%%BIGLOO_VERSION%%/libbiglooalsa_s-%%BIGLOO_VERSION%%.so
 %%ALSA%%lib/bigloo/%%BIGLOO_VERSION%%/libbiglooalsa_u-%%BIGLOO_VERSION%%.a
 %%ALSA%%lib/bigloo/%%BIGLOO_VERSION%%/libbiglooalsa_u-%%BIGLOO_VERSION%%.so
+%%AVAHI%%lib/bigloo/%%BIGLOO_VERSION%%/libbiglooavahi_es-%%BIGLOO_VERSION%%.a
+%%AVAHI%%lib/bigloo/%%BIGLOO_VERSION%%/libbiglooavahi_es-%%BIGLOO_VERSION%%.so
+%%AVAHI%%lib/bigloo/%%BIGLOO_VERSION%%/libbiglooavahi_eu-%%BIGLOO_VERSION%%.a
+%%AVAHI%%lib/bigloo/%%BIGLOO_VERSION%%/libbiglooavahi_eu-%%BIGLOO_VERSION%%.so
+%%AVAHI%%lib/bigloo/%%BIGLOO_VERSION%%/libbiglooavahi_s-%%BIGLOO_VERSION%%.a
+%%AVAHI%%lib/bigloo/%%BIGLOO_VERSION%%/libbiglooavahi_s-%%BIGLOO_VERSION%%.so
+%%AVAHI%%lib/bigloo/%%BIGLOO_VERSION%%/libbiglooavahi_u-%%BIGLOO_VERSION%%.a
+%%AVAHI%%lib/bigloo/%%BIGLOO_VERSION%%/libbiglooavahi_u-%%BIGLOO_VERSION%%.so
 lib/bigloo/%%BIGLOO_VERSION%%/libbigloobdl_es-%%BIGLOO_VERSION%%.a
 lib/bigloo/%%BIGLOO_VERSION%%/libbigloobdl_es-%%BIGLOO_VERSION%%.so
 lib/bigloo/%%BIGLOO_VERSION%%/libbigloobdl_eu-%%BIGLOO_VERSION%%.a
@@ -72,6 +84,14 @@ lib/bigloo/%%BIGLOO_VERSION%%/libbigloocrypto_s-%%BIGLOO_VERSION%%.a
 lib/bigloo/%%BIGLOO_VERSION%%/libbigloocrypto_s-%%BIGLOO_VERSION%%.so
 lib/bigloo/%%BIGLOO_VERSION%%/libbigloocrypto_u-%%BIGLOO_VERSION%%.a
 lib/bigloo/%%BIGLOO_VERSION%%/libbigloocrypto_u-%%BIGLOO_VERSION%%.so
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloocsv_es-%%BIGLOO_VERSION%%.a
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloocsv_es-%%BIGLOO_VERSION%%.so
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloocsv_eu-%%BIGLOO_VERSION%%.a
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloocsv_eu-%%BIGLOO_VERSION%%.so
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloocsv_s-%%BIGLOO_VERSION%%.a
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloocsv_s-%%BIGLOO_VERSION%%.so
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloocsv_u-%%BIGLOO_VERSION%%.a
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloocsv_u-%%BIGLOO_VERSION%%.so
 %%FLAC%%lib/bigloo/%%BIGLOO_VERSION%%/libbiglooflac_es-%%BIGLOO_VERSION%%.a
 %%FLAC%%lib/bigloo/%%BIGLOO_VERSION%%/libbiglooflac_es-%%BIGLOO_VERSION%%.so
 %%FLAC%%lib/bigloo/%%BIGLOO_VERSION%%/libbiglooflac_eu-%%BIGLOO_VERSION%%.a
@@ -88,6 +108,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
 %%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
@@ -256,6 +280,10 @@ lib/libbigloo_u-%%BIGLOO_VERSION%%.so
 %%ALSA%%lib/libbiglooalsa_eu-%%BIGLOO_VERSION%%.so
 %%ALSA%%lib/libbiglooalsa_s-%%BIGLOO_VERSION%%.so
 %%ALSA%%lib/libbiglooalsa_u-%%BIGLOO_VERSION%%.so
+%%AVAHI%%lib/libbiglooavahi_es-%%BIGLOO_VERSION%%.so
+%%AVAHI%%lib/libbiglooavahi_eu-%%BIGLOO_VERSION%%.so
+%%AVAHI%%lib/libbiglooavahi_s-%%BIGLOO_VERSION%%.so
+%%AVAHI%%lib/libbiglooavahi_u-%%BIGLOO_VERSION%%.so
 lib/libbigloobdl_es-%%BIGLOO_VERSION%%.so
 lib/libbigloobdl_eu-%%BIGLOO_VERSION%%.so
 lib/libbigloobdl_s-%%BIGLOO_VERSION%%.so
@@ -268,6 +296,10 @@ lib/libbigloocrypto_es-%%BIGLOO_VERSION%%.so
 lib/libbigloocrypto_eu-%%BIGLOO_VERSION%%.so
 lib/libbigloocrypto_s-%%BIGLOO_VERSION%%.so
 lib/libbigloocrypto_u-%%BIGLOO_VERSION%%.so
+lib/libbigloocsv_es-%%BIGLOO_VERSION%%.so
+lib/libbigloocsv_eu-%%BIGLOO_VERSION%%.so
+lib/libbigloocsv_s-%%BIGLOO_VERSION%%.so
+lib/libbigloocsv_u-%%BIGLOO_VERSION%%.so
 %%FLAC%%lib/libbiglooflac_es-%%BIGLOO_VERSION%%.so
 %%FLAC%%lib/libbiglooflac_eu-%%BIGLOO_VERSION%%.so
 %%FLAC%%lib/libbiglooflac_s-%%BIGLOO_VERSION%%.so
@@ -276,6 +308,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
 %%GSTREAMER%%lib/libbigloogstreamer_es-%%BIGLOO_VERSION%%.so
 %%GSTREAMER%%lib/libbigloogstreamer_eu-%%BIGLOO_VERSION%%.so
 %%GSTREAMER%%lib/libbigloogstreamer_s-%%BIGLOO_VERSION%%.so
@@ -384,6 +418,7 @@ lib/libbiglooweb_u-%%BIGLOO_VERSION%%.so
 %%PORTDOCS%%%%DOCSDIR%%/bigloo-36.html
 %%PORTDOCS%%%%DOCSDIR%%/bigloo-37.html
 %%PORTDOCS%%%%DOCSDIR%%/bigloo-38.html
+%%PORTDOCS%%%%DOCSDIR%%/bigloo-39.html
 %%PORTDOCS%%%%DOCSDIR%%/bigloo-4.html
 %%PORTDOCS%%%%DOCSDIR%%/bigloo-5.html
 %%PORTDOCS%%%%DOCSDIR%%/bigloo-6.html