Date: Mon, 28 Apr 2014 11:47:34 +0000 (UTC) From: Olli Hauer <ohauer@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r352488 - in head/www/mod_musicindex: . files Message-ID: <201404281147.s3SBlYgV006587@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ohauer Date: Mon Apr 28 11:47:33 2014 New Revision: 352488 URL: http://svnweb.freebsd.org/changeset/ports/352488 QAT: https://qat.redports.org/buildarchive/r352488/ Log: - update to 1.4.1 - add stage support - use new OPTIONS syntax - update WWW Deleted: head/www/mod_musicindex/files/patch-src__Makefile.in Modified: head/www/mod_musicindex/Makefile head/www/mod_musicindex/distinfo head/www/mod_musicindex/pkg-descr head/www/mod_musicindex/pkg-plist Modified: head/www/mod_musicindex/Makefile ============================================================================== --- head/www/mod_musicindex/Makefile Mon Apr 28 11:46:46 2014 (r352487) +++ head/www/mod_musicindex/Makefile Mon Apr 28 11:47:33 2014 (r352488) @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= mod_musicindex -PORTVERSION= 1.3.7 +PORTVERSION= 1.4.1 CATEGORIES= www audio -MASTER_SITES= http://www.parisc-linux.org/~varenet/musicindex/ +MASTER_SITES= http://hacks.slashdirt.org/musicindex/ PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} MAINTAINER= apache@FreeBSD.org @@ -21,98 +21,50 @@ LIBARCHIVE_DESC= Archive downloading sup FILECACHE_DESC= Flat file caching support MYSQLCACHE_DESC= MySQL caching support -NO_STAGE= yes -.include <bsd.port.options.mk> +OPTIONS_SUB= yes +FILECACHE_CONFIGURE_ENABLE= filecache +FLAC_CONFIGURE_ENABLE= flac +FLAC_LIB_DEPENDS= libFLAC.so:${PORTSDIR}/audio/flac +LIBARCHIVE_CONFIGURE_ENABLE= archive +MP3_CONFIGURE_ENABLE= mp3 +MP3_LIB_DEPENDS= libid3tag.so:${PORTSDIR}/audio/libid3tag \ + libmad.so:${PORTSDIR}/audio/libmad +MP4_CONFIGURE_ENABLE= mp4 +MP4_LIB_DEPENDS= libmp4v2.so:${PORTSDIR}/multimedia/mp4v2 +MYSQLCACHE_CONFIGURE_ENABLE= mysqlcache +MYSQLCACHE_USE= MYSQL=yes +NLS_CFLAGS= -lintl +NLS_CONFIGURE_ENABLE= nls +NLS_USES= gettext +VORBIS_CONFIGURE_ENABLE= vorbis +VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis +.include <bsd.port.options.mk> -GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ARGS= --with-apxs=${APXS} \ - --disable-libFLACtest --disable-vorbistest +GNU_CONFIGURE= yes +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib +CONFIGURE_ARGS+= --with-apxs=${APXS} \ + --disable-libFLACtest --disable-vorbistest SUB_FILES= pkg-message SUB_LIST= PORTNAME=${PORTNAME} PORTDOCS= README -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -CFLAGS+= -lintl -PLIST_SUB+= NLS="" -CONFIGURE_ARGS+=--enable-nls -.else -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.endif - -.if ${PORT_OPTIONS:MFLAC} -LIB_DEPENDS+= FLAC:${PORTSDIR}/audio/flac -CONFIGURE_ARGS+= --enable-flac -.else -CONFIGURE_ARGS+= --disable-flac -.endif - -.if ${PORT_OPTIONS:MMP3} -LIB_DEPENDS+= id3tag:${PORTSDIR}/audio/libid3tag \ - mad:${PORTSDIR}/audio/libmad -CONFIGURE_ARGS+= --enable-mp3 -.else -CONFIGURE_ARGS+= --disable-mp3 -.endif - -.if ${PORT_OPTIONS:MMP4} -LIB_DEPENDS+= mp4v2:${PORTSDIR}/multimedia/mp4v2 -CONFIGURE_ARGS+= --enable-mp4 -.else -CONFIGURE_ARGS+= --disable-mp4 -.endif - -.if ${PORT_OPTIONS:MVORBIS} -LIB_DEPENDS+= vorbis:${PORTSDIR}/audio/libvorbis -CONFIGURE_ARGS+= --enable-vorbis -.else -CONFIGURE_ARGS+= --disable-vorbis -.endif - -.if ${PORT_OPTIONS:MLIBARCHIVE} -CONFIGURE_ARGS+= --enable-archive -.else -CONFIGURE_ARGS+= --disable-archive -.endif - -.if ${PORT_OPTIONS:MFILECACHE} -CONFIGURE_ARGS+= --enable-filecache -.else -CONFIGURE_ARGS+= --disable-filecache -.endif - -.if ${PORT_OPTIONS:MMYSQLCACHE} -USE_MYSQL= yes -CONFIGURE_ARGS+= --enable-mysqlcache -.else -CONFIGURE_ARGS+= --disable-mysqlcache -.endif - post-patch: - @${REINPLACE_CMD} -e '/@BUILD_FOR_APACHE2/ s| -i -n musicindex| -a &|' \ - ${WRKSRC}/src/Makefile.in .if ${PORT_OPTIONS:MNLS} ${RM} ${WRKSRC}/po/*.gmo .endif post-build: .if ${PORT_OPTIONS:MNLS} - cd ${WRKSRC}/po && ${SETENV} ${MAKE_ENV} ${MAKE} update-gmo + @(${SETENV} ${MAKE_ENV} ${MAKE} -C ${WRKSRC}/po update-gmo) .endif post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR}/ - @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/ -.endif - @${ECHO_MSG} "" - @${CAT} ${PKGMESSAGE} - @${ECHO_MSG} "" + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${MODULENAME}.so .include <bsd.port.mk> Modified: head/www/mod_musicindex/distinfo ============================================================================== --- head/www/mod_musicindex/distinfo Mon Apr 28 11:46:46 2014 (r352487) +++ head/www/mod_musicindex/distinfo Mon Apr 28 11:47:33 2014 (r352488) @@ -1,2 +1,2 @@ -SHA256 (mod_musicindex-1.3.7.tar.gz) = 7d5120d6d9ae96e84fe6acae3e80d517269a74bf86e3e6920e82c4169be00891 -SIZE (mod_musicindex-1.3.7.tar.gz) = 505798 +SHA256 (mod_musicindex-1.4.1.tar.gz) = 0fb052ebb8fa511467fd21696d798dee35b2e611955572cf746e9712e531a596 +SIZE (mod_musicindex-1.4.1.tar.gz) = 508795 Modified: head/www/mod_musicindex/pkg-descr ============================================================================== --- head/www/mod_musicindex/pkg-descr Mon Apr 28 11:46:46 2014 (r352487) +++ head/www/mod_musicindex/pkg-descr Mon Apr 28 11:47:33 2014 (r352488) @@ -3,4 +3,4 @@ the Perl module Apache::MP3. It allows n containing several kinds of audio files, including sorting them on various fields, streaming/downloading them, constructing playlists, and searching. -WWW: http://www.parisc-linux.org/~varenet/musicindex/ +WWW: http://hacks.slashdirt.org/musicindex/ Modified: head/www/mod_musicindex/pkg-plist ============================================================================== --- head/www/mod_musicindex/pkg-plist Mon Apr 28 11:46:46 2014 (r352487) +++ head/www/mod_musicindex/pkg-plist Mon Apr 28 11:47:33 2014 (r352488) @@ -1,6 +1,12 @@ +@unexec /usr/bin/sed -i '' -E '/LoadModule[[:blank:]]+%%AP_NAME%%_module/d' %D/%%APACHEETCDIR%%/httpd.conf %%APACHEMODDIR%%/%%AP_MODULE%% -@exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%F -@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F +@exec %D/sbin/apxs -e %%AP_MOD_EN%% -n %%AP_NAME%% %D/%F +@unexec echo "Don't forget to remove all mod_musicindex-related directives in your httpd.conf" +%%NLS%%share/locale/de/LC_MESSAGES/mod_musicindex.mo +%%NLS%%share/locale/fr/LC_MESSAGES/mod_musicindex.mo +%%NLS%%share/locale/it/LC_MESSAGES/mod_musicindex.mo +%%NLS%%share/locale/nl/LC_MESSAGES/mod_musicindex.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/mod_musicindex.mo %%DATADIR%%/directory.png %%DATADIR%%/fetch.png %%DATADIR%%/fetchok.png @@ -11,9 +17,4 @@ %%DATADIR%%/shuffle.png %%DATADIR%%/sound.png %%DATADIR%%/soundok.png -%%NLS%%share/locale/de/LC_MESSAGES/mod_musicindex.mo -%%NLS%%share/locale/fr/LC_MESSAGES/mod_musicindex.mo -%%NLS%%share/locale/it/LC_MESSAGES/mod_musicindex.mo -%%NLS%%share/locale/nl/LC_MESSAGES/mod_musicindex.mo -%%NLS%%share/locale/pt_BR/LC_MESSAGES/mod_musicindex.mo @dirrm %%DATADIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404281147.s3SBlYgV006587>