ports/115280: [MAINTAINER] www/mod_musicindex: update to 1.2.0
Tobias Roth
ports at fsck.ch
Tue Aug 7 19:50:06 UTC 2007
>Number: 115280
>Category: ports
>Synopsis: [MAINTAINER] www/mod_musicindex: update to 1.2.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Aug 07 19:50:03 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Tobias Roth
>Release: FreeBSD 6.2-STABLE i386
>Organization:
>Environment:
System: FreeBSD factory.fsck.ch 6.2-STABLE FreeBSD 6.2-STABLE #10: Tue Jun 19 10:32:09 CEST 2007
>Description:
- Update to 1.2.0
- There were a lot of changes, I hope I didn't break anything. Maybe an
Apache guru wants to check this thoroughly before committing.
Removed file(s):
- files/patch-Makefile
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- mod_musicindex-1.2.0.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/www/mod_musicindex/Makefile,v
retrieving revision 1.15
diff -u -u -r1.15 Makefile
--- Makefile 28 Jul 2007 12:27:31 -0000 1.15
+++ Makefile 7 Aug 2007 19:38:43 -0000
@@ -6,49 +6,81 @@
#
PORTNAME= mod_musicindex
-PORTVERSION= 0.99.7
-PORTREVISION= 4
+PORTVERSION= 1.2.0
CATEGORIES= www audio
-# Master site doesn't have a current version'd tarball...
-#MASTER_SITES= http://www.parisc-linux.org/~varenet/musicindex/
-MASTER_SITES= http://depot.fsck.ch/mirror/distfiles/
-DISTNAME= libapache-mod-musicindex_${PORTVERSION}
+MASTER_SITES= http://www.parisc-linux.org/~varenet/musicindex/ \
+ http://depot.fsck.ch/mirror/distfiles/
MAINTAINER= ports at fsck.ch
-COMMENT= Apache module in C that implements the perl module Apache::MP3
+COMMENT= Apache module that allows downloading and streaming of audio
-LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/libvorbis \
- id3tag.0:${PORTSDIR}/audio/libid3tag \
- mad.2:${PORTSDIR}/audio/libmad \
- FLAC.7:${PORTSDIR}/audio/flac
-
-CPPFLAGS= -DHAS_MP3 -DHAS_OGG -DHAS_FLAC
-CFLAGS+= -I${LOCALBASE}/include
-
-#WANT_APACHE= YES
-USE_GMAKE= yes
-WRKSRC= ${WRKDIR}/libapache-mod-musicindex-${PORTVERSION}
+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
+
+USE_APACHE= YES
+AP_GENPLIST= YES
+GNU_CONFIGURE= yes
+CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
+CONFIGURE_ARGS+= --with-apxs=${APXS}
+PORTDOCS= README
SUB_FILES= pkg-message
+SUB_LIST= PORTNAME=${PORTNAME}
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+= --disable-nls
+PLIST_SUB+= NLS="@comment "
+.else
+USE_GETTEXT= yes
+CFLAGS+= -lintl
+PLIST_SUB+= NLS=""
+.endif
+
+.if defined(WITHOUT_FLAC)
+CONFIGURE_ARGS+= --disable-flac
+.else
+LIB_DEPENDS+= FLAC:${PORTSDIR}/audio/flac
+.endif
+
+.if defined(WITHOUT_MP3)
+CONFIGURE_ARGS+=--disable-mp3
+.else
+LIB_DEPENDS+= id3tag:${PORTSDIR}/audio/libid3tag \
+ mad:${PORTSDIR}/audio/libmad
+.endif
-MAKE_ENV+= APXS=${APXS} CPPFLAGS="${CPPFLAGS}" LDFLAGS="-L${LOCALBASE}/lib"
+.if defined(WITHOUT_MP4)
+CONFIGURE_ARGS+= --disable-mp4
+.else
+LIB_DEPENDS+= mp4v2:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2
+.endif
-.if "${AP_VER}"=="2"
-MAKE_ENV+= APACHE_VERSION=2 APRCONFIG=${LOCALBASE}/lib/apache2/apr-config
-.if "ARCH" = "amd64"
-CFLAGS+= -fPIC
+.if defined(WITHOUT_VORBIS)
+CONFIGURE_ARGS+= --disable-vorbis
+.else
+LIB_DEPENDS+= vorbis:${PORTSDIR}/audio/libvorbis
.endif
+
+.if defined(WITHOUT_LIBARCHIVE)
+CONFIGURE_ARGS+= --disable-archive
+.endif
+
+.if defined(WITHOUT_FILECACHE)
+CONFIGURE_ARGS+= --disable-filecache
.endif
post-install:
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
- @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+ @${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${DOCSDIR}
.endif
+
@${ECHO_MSG} ""
@${CAT} ${PKGMESSAGE}
@${ECHO_MSG} ""
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/www/mod_musicindex/distinfo,v
retrieving revision 1.5
diff -u -u -r1.5 distinfo
--- distinfo 24 Jan 2006 03:13:26 -0000 1.5
+++ distinfo 7 Aug 2007 19:38:43 -0000
@@ -1,3 +1,3 @@
-MD5 (libapache-mod-musicindex_0.99.7.tar.gz) = 98a146ee25786152ad756c41ff580e94
-SHA256 (libapache-mod-musicindex_0.99.7.tar.gz) = 64e23ec204da2125521b177ee412b784ffa8f7c73609da3bbe77ca83da85d041
-SIZE (libapache-mod-musicindex_0.99.7.tar.gz) = 81771
+MD5 (mod_musicindex-1.2.0.tar.gz) = a490703e50be29e271c5a28a4414fce5
+SHA256 (mod_musicindex-1.2.0.tar.gz) = 1b49abffe74a9a39bef57f0767cc2fad9b4e339565dd1ebc0de59f5bd68a531b
+SIZE (mod_musicindex-1.2.0.tar.gz) = 468706
Index: pkg-descr
===================================================================
RCS file: /home/ncvs/ports/www/mod_musicindex/pkg-descr,v
retrieving revision 1.2
diff -u -u -r1.2 pkg-descr
--- pkg-descr 22 Jan 2005 20:56:55 -0000 1.2
+++ pkg-descr 7 Aug 2007 19:38:43 -0000
@@ -1,6 +1,6 @@
mod_musicindex is an Apache module aimed at being a C implementation of
the Perl module Apache::MP3. It allows nice displaying of directories
-containing MP3 or Ogg Vorbis files, including sorting them on various
+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/
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/mod_musicindex/pkg-plist,v
retrieving revision 1.4
diff -u -u -r1.4 pkg-plist
--- pkg-plist 22 Jan 2005 20:56:55 -0000 1.4
+++ pkg-plist 7 Aug 2007 19:38:43 -0000
@@ -1,12 +1,12 @@
-%%APACHEMODDIR%%/mod_musicindex.so
- at exec %D/sbin/apxs -e -A -n musicindex %D/%F
- at unexec %D/sbin/apxs -e -A -n musicindex %D/%F
-www/musicindex/directory.png
-www/musicindex/fetch.png
-www/musicindex/general.png
-www/musicindex/musicindex.css
-www/musicindex/right_arrow.gif
-www/musicindex/sound.png
-%%PORTDOCS%%%%DOCSDIR%%/README
- at dirrm www/musicindex
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%DATADIR%%/musicindex.css
+%%DATADIR%%/directory.png
+%%DATADIR%%/fetch.png
+%%DATADIR%%/general.png
+%%DATADIR%%/right_arrow.gif
+%%DATADIR%%/sound.png
+%%DATADIR%%/shuffle.png
+%%DATADIR%%/rss.png
+%%DATADIR%%/fetchok.png
+%%DATADIR%%/soundok.png
+%%NLS%%share/locale/fr/LC_MESSAGES/mod_musicindex.mo
+%%NLS%%share/locale/it/LC_MESSAGES/mod_musicindex.mo
Index: files/patch-Makefile
===================================================================
RCS file: files/patch-Makefile
diff -N files/patch-Makefile
--- files/patch-Makefile 22 Jan 2005 20:56:55 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,50 +0,0 @@
---- Makefile.orig Wed Sep 15 18:34:27 2004
-+++ Makefile Sat Jan 22 14:58:01 2005
-@@ -8,21 +8,16 @@
- ## @todo autoconf/automake (i18n/apache2)
-
- # the tools
--CC = gcc
--INSTALL = install
-+CC ?= gcc
-+INSTALL ?= install
-
- ifeq ($(APACHE_VERSION),2)
--APXS = apxs2
--APACHECTL = apache2ctl
--APRCONFIG = apr-config
- APINCDIR = $(shell $(APRCONFIG) --includes)
- APCFLAGS = $(shell $(APRCONFIG) --cflags | sed -e "s/-g //" -e "s/-O.//" -e "s/-W[a-z]*//")
- APCPPFLAGS = $(shell $(APRCONFIG) --cppflags)
- #APLIBXDIR = $(shell $(APRCONFIG) --installbuilddir)
- APLIBXDIR = $(shell $(APXS) -q LIBEXECDIR)
- else
--APXS = apxs
--APACHECTL = apachectl
- APCFLAGS = $(shell $(APXS) -q CFLAGS_SHLIB | sed -e "s/-g //" -e "s/-O.//" -e "s/-W[a-z]*//")
- APLIBXDIR = $(shell $(APXS) -q LIBEXECDIR)
- endif
-@@ -31,11 +26,11 @@
- # debian doesn't have some libs (faad2 for instance...)
- DEBCPPFLAGS = -DHAS_MP3 -DHAS_OGG -DHAS_FLAC
- # in all cases:
--CPPFLAGS = -DHAS_MP3 -DHAS_OGG -DHAS_FLAC -DHAS_MP4
-+#CPPFLAGS = -DHAS_MP3 -DHAS_OGG -DHAS_FLAC -DHAS_MP4
- #INC =
- #LDFLAGS =
--CFLAGS = -O2 -Wall
--DOCROOT = /var/www
-+CFLAGS += -Wall
-+DOCROOT = ${LOCALBASE}/www
-
- # our own defines
- UNAME := $(shell uname)
-@@ -90,8 +85,6 @@
- $(INSTALL) -d $(DESTDIR)$(DOCROOT)/musicindex $(DESTDIR)$(LIBEXECDIR)
- $(INSTALL) -m 0644 musicindex/*.* $(DESTDIR)$(DOCROOT)/musicindex
- $(INSTALL) -m 0644 $(MOD_SO) $(DESTDIR)$(LIBEXECDIR)
-- @echo -e "\nDon't forget to edit your httpd.conf (see README for details):\n \
-- LoadModule musicindex_module $(DESTDIR)$(LIBEXECDIR)/$(MOD_SO)"
-
- # how to compile the objects
- %.o: %.c %.h mod_musicindex.h
Index: files/pkg-message.in
===================================================================
RCS file: /home/ncvs/ports/www/mod_musicindex/files/pkg-message.in,v
retrieving revision 1.1
diff -u -u -r1.1 pkg-message.in
--- files/pkg-message.in 22 Jan 2005 20:56:55 -0000 1.1
+++ files/pkg-message.in 7 Aug 2007 19:38:43 -0000
@@ -1,40 +1 @@
-************************************************************
-You've installed mod_musicindex
-
-To enable it, you need to take the following steps:
-
-1) Edit httpd.conf to make sure the module is loaded.
-2) Mod_musicindex looks for a directory called musicindex below
- the apache DocumentRoot. Make sure it finds it by either changing
- the DocumentRoot directive in httpd.conf to %%LOCALBASE%%/www or by
- copying or linking %%LOCALBASE%%/www/musicindex into your DocumentRoot
-3) Add a Directory configuration to your httpd.conf that should look
- something like this:
-
-<Directory "/path/to/you/mp3/files/">
- Options Indexes MultiViews FollowSymlinks
- AllowOverride None
- MusicLister On
- MusicSortOrder album disc track artist title length bitrate freq filetype filename uri
- MusicFields title artist length bitrate
- MusicAllowDownload On
- MusicAllowStream Off
- MusicAllowSearch On
- MusicPageTitle Myname
- MusicCssDefault musicindex.css
- MusicCachePath /tmp/musicindex
- MusicIceServer [ice.domain.my]:8000
- MusicCookieLife 300
-</Directory>
-
-4) Optionally consider setting an alias to your mp3 dir, so you can access
- the files by http://yourhost/music/ :
-
-Alias /music/ /path/to/you/mp3/files/
-
-5) To make your changes effective, restart apache:
-
-# apachectl configtest (see if there are any config errors)
-# apachectl restart
-
-************************************************************
+Read %%DOCSDIR%%/README to find out how to configure apache for %%PORTNAME%%.
--- mod_musicindex-1.2.0.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list