[PATCH] www/mod_musicindex: update to 1.3.5

[Sunpoet Po-Chuan Hsieh]

>Submitter-Id:	current-users
>Originator:	Sunpoet Po-Chuan Hsieh
>Organization:	The FreeBSD Project
>Confidential:	no 
>Synopsis:	[PATCH] www/mod_musicindex: update to 1.3.5
>Severity:	non-critical
>Priority:	low
>Category:	ports 
>Class:		update
>Release:	FreeBSD 8.1-STABLE amd64
>Environment:
System: FreeBSD bonjour.sunpoet.net 8.1-STABLE FreeBSD 8.1-STABLE #0: Sat Oct 23 16:01:16 CST 2010
>Description:
- Update to 1.3.5
- Add new option: MYSQLCACHE for MySQL caching support
- Add LICENSE
- Install Brazilian Portugese language files to pt_BR instead of pt-br
- Sort PLIST
- Space/tab twiddle

Port maintainer (apache at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- ap22-mod_musicindex-1.3.5.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/www/mod_musicindex/Makefile,v
retrieving revision 1.32
diff -u -u -r1.32 Makefile
--- Makefile	20 Oct 2010 03:26:33 -0000	1.32
+++ Makefile	8 Nov 2010 17:30:03 -0000
@@ -6,22 +6,24 @@
 #
 
 PORTNAME=	mod_musicindex
-PORTVERSION=	1.3.3
-PORTREVISION=	4
+PORTVERSION=	1.3.5
 CATEGORIES=	www audio
-MASTER_SITES=	http://www.parisc-linux.org/~varenet/musicindex/oldsrc/
+MASTER_SITES=	http://www.parisc-linux.org/~varenet/musicindex/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 
 MAINTAINER=	apache at FreeBSD.org
 COMMENT=	Apache module that allows downloading and streaming of audio
 
+LICENSE=	LGPL21
+
 OPTIONS=	NLS "Native language support" on \
 		FLAC "FLAC support" off \
 		MP3 "MP3 support" on \
 		MP4 "MP4 support" off \
 		VORBIS "Ogg/Vorbis support" off \
 		LIBARCHIVE "Archive downloading support" on \
-		FILECACHE "Caching support" on
+		FILECACHE "Flat file caching support" on \
+		MYSQLCACHE "MySQL caching support" off
 
 MAKE_JOBS_SAFE=	yes
 
@@ -29,7 +31,8 @@
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
-CONFIGURE_ARGS+=	--with-apxs=${APXS}
+CONFIGURE_ARGS=	--with-apxs=${APXS} \
+		--disable-libFLACtest --disable-vorbistest
 
 SUB_FILES=	pkg-message
 SUB_LIST=	PORTNAME=${PORTNAME}
@@ -39,7 +42,7 @@
 .include <bsd.port.options.mk>
 
 .if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=	--disable-nls
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .else
 USE_GETTEXT=	yes
@@ -48,7 +51,7 @@
 .endif
 
 .if defined(WITHOUT_FLAC)
-CONFIGURE_ARGS+=	--disable-flac
+CONFIGURE_ARGS+=--disable-flac
 .else
 LIB_DEPENDS+=	FLAC:${PORTSDIR}/audio/flac
 .endif
@@ -61,23 +64,43 @@
 .endif
 
 .if defined(WITHOUT_MP4)
-CONFIGURE_ARGS+=	--disable-mp4
+CONFIGURE_ARGS+=--disable-mp4
 .else
 LIB_DEPENDS+=	mp4v2:${PORTSDIR}/multimedia/mp4v2
 .endif
 
 .if defined(WITHOUT_VORBIS)
-CONFIGURE_ARGS+=	--disable-vorbis
+CONFIGURE_ARGS+=--disable-vorbis
 .else
 LIB_DEPENDS+=	vorbis:${PORTSDIR}/audio/libvorbis
 .endif
 
 .if defined(WITHOUT_LIBARCHIVE)
-CONFIGURE_ARGS+=	--disable-archive
+CONFIGURE_ARGS+=--disable-archive
 .endif
 
 .if defined(WITHOUT_FILECACHE)
-CONFIGURE_ARGS+=	--disable-filecache
+CONFIGURE_ARGS+=--disable-filecache
+.endif
+
+.if defined(WITHOUT_MYSQLCACHE)
+CONFIGURE_ARGS+=--disable-mysqlcache
+.else
+USE_MYSQL=	yes
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e '/@BUILD_FOR_APACHE2/ s| -i -n musicindex| -a &|' \
+		${WRKSRC}/src/Makefile.in
+.if !defined(WITHOUT_NLS)
+	${RM} ${WRKSRC}/po/*.gmo
+	${MV} ${WRKSRC}/po/pt-br.po ${WRKSRC}/po/pt_BR.po
+	cd ${WRKSRC} && ${REINPLACE_CMD} -e 's|pt-br|pt_BR|g' ${WRKSRC}/po/LINGUAS ${WRKSRC}/po/pt_BR.po
+.endif
+
+post-build:
+.if !defined(WITHOUT_NLS)
+	cd ${WRKSRC}/po && ${SETENV} ${MAKE_ENV} ${MAKE} update-gmo
 .endif
 
 post-install:
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/www/mod_musicindex/distinfo,v
retrieving revision 1.9
diff -u -u -r1.9 distinfo
--- distinfo	26 May 2010 22:00:47 -0000	1.9
+++ distinfo	8 Nov 2010 17:30:03 -0000
@@ -1,3 +1,2 @@
-MD5 (mod_musicindex-1.3.3.tar.gz) = 6488db2d6e9dd814fb9d47c7b390c777
-SHA256 (mod_musicindex-1.3.3.tar.gz) = ae8cb26c946fe2175d09ed89099ddf6f10547ae81e4842cea4627d24d93d1b82
-SIZE (mod_musicindex-1.3.3.tar.gz) = 482313
+SHA256 (mod_musicindex-1.3.5.tar.gz) = e9178f8dd6481f2614a17ba1cdf55ec55636cd0802866d236b4230ee801d67ca
+SIZE (mod_musicindex-1.3.5.tar.gz) = 488090
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/mod_musicindex/pkg-plist,v
retrieving revision 1.9
diff -u -u -r1.9 pkg-plist
--- pkg-plist	6 Jun 2010 05:00:29 -0000	1.9
+++ pkg-plist	8 Nov 2010 17:30:03 -0000
@@ -1,20 +1,19 @@
 %%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
-%%DATADIR%%/musicindex.css
 %%DATADIR%%/directory.png
 %%DATADIR%%/fetch.png
+%%DATADIR%%/fetchok.png
 %%DATADIR%%/general.png
+%%DATADIR%%/musicindex.css
 %%DATADIR%%/right_arrow.gif
-%%DATADIR%%/sound.png
-%%DATADIR%%/shuffle.png
 %%DATADIR%%/rss.png
-%%DATADIR%%/fetchok.png
+%%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
-%%NLS%%@dirrm share/locale/pt-br/LC_MESSAGES
-%%NLS%%@dirrm share/locale/pt-br
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/mod_musicindex.mo
 @dirrm %%DATADIR%%
--- ap22-mod_musicindex-1.3.5.patch ends here ---