- Update to 0.99.7

6 files changed, 66 insertions, 96 deletions

diff --git a/www/mod_musicindex/Makefile b/www/mod_musicindex/Makefile
index 0906ae29524..5125cc6a0c7 100644
--- a/www/mod_musicindex/Makefile
+++ b/www/mod_musicindex/Makefile
@@ -6,53 +6,38 @@
 #
 
 PORTNAME=	mod_musicindex
-PORTVERSION=	0.9.0
-PORTREVISION=	3
+PORTVERSION=	0.99.7
 CATEGORIES=	www audio
-MASTER_SITES=	http://www.esiee.fr/~puffin/musicindex/
+# Master site don't have a current version'd tarball...
+#MASTER_SITES=	http://www.esiee.fr/~puffin/musicindex/
+MASTER_SITES=	http://sheepkiller.nerim.net/
 DISTNAME=	libapache-mod-musicindex_${PORTVERSION}
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Apache module in C implements Perl module Apache::MP3
 
-BUILD_DEPENDS=	${APXS}:${PORTSDIR}/${APACHE_PORT}
-RUN_DEPENDS=	${APXS}:${PORTSDIR}/${APACHE_PORT}
 LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis \
 		id3tag.2:${PORTSDIR}/audio/libid3tag \
-		mad.2:${PORTSDIR}/audio/libmad
+		mad.2:${PORTSDIR}/audio/libmad \
+		FLAC.5:${PORTSDIR}/audio/flac
 
-APXS?=		${LOCALBASE}/sbin/apxs
+CPPFLAGS=	-DHAS_MP3 -DHAS_OGG -DHAS_FLAC
+CFLAGS+=	-I${LOCALBASE}/include
+
+#WANT_APACHE=	YES
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/libapache-mod-musicindex-${PORTVERSION}
-MAKE_ENV+=	APXS=${APXS} BUILDDIR=${WRKSRC}
 
 PORTDOCS=	directory.png musicindex.css fetch.png \
-			right_arrow.gif general.png sound.png
-
-.if defined (WITH_APACHE2)
-MODULE_EXT=	la
-MAKEFILE=	Makefile.apache2
-PLIST_SUB+=	MOD_DIR=libexec/apache2
-APACHE_PORT?=	www/apache2
-MAKE_TARGET=	all
-.else
-MODULE_EXT=	so
-PLIST_SUB+=	MOD_DIR=libexec/apache
-APACHE_PORT?=	www/apache13
-.endif
+		right_arrow.gif general.png sound.png
+
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+
+MAKE_ENV+=	APXS=${APXS} CPPFLAGS="${CPPFLAGS}" LDFLAGS="-L${LOCALBASE}/lib"
 
-post-patch:
-	@${CP} ${WRKSRC}/modules.mk.apache2 ${WRKSRC}/modules.mk
-	@${TOUCH} ${WRKSRC}/.deps
-
-do-install:
-	${APXS} -i -n musicindex -A ${WRKSRC}/mod_musicindex.${MODULE_EXT}
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/musicindex/${f} ${DOCSDIR}
-.endfor
+.if "${AP_VER}"=="2"
+MAKE_ENV+=	APACHE_VERSION=2 APRCONFIG=${LOCALBASE}/lib/apache2/apr-config
 .endif
-	${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/mod_musicindex/distinfo b/www/mod_musicindex/distinfo
index b9fb4e78702..5e1ab3d035b 100644
--- a/www/mod_musicindex/distinfo
+++ b/www/mod_musicindex/distinfo
@@ -1,2 +1,2 @@
-MD5 (libapache-mod-musicindex_0.9.0.tar.gz) = 81bc6f199801b6a4dc6e91d52b87c3b3
-SIZE (libapache-mod-musicindex_0.9.0.tar.gz) = 134708
+MD5 (libapache-mod-musicindex_0.99.7.tar.gz) = 98a146ee25786152ad756c41ff580e94
+SIZE (libapache-mod-musicindex_0.99.7.tar.gz) = 81771
diff --git a/www/mod_musicindex/files/patch-Makefile b/www/mod_musicindex/files/patch-Makefile
index 71caab7dec2..784e7ef1f65 100644
--- a/www/mod_musicindex/files/patch-Makefile
+++ b/www/mod_musicindex/files/patch-Makefile
@@ -1,20 +1,41 @@
---- Makefile.orig	Thu Oct 30 12:41:45 2003
-+++ Makefile	Thu Nov 20 12:35:49 2003
-@@ -8,15 +8,13 @@
- ##  @todo auto-dep
+--- Makefile.orig	Mon Jan 17 21:44:36 2005
++++ Makefile	Mon Jan 17 21:51:06 2005
+@@ -8,21 +8,16 @@
+ ##  @todo autoconf/automake (i18n/apache2)
  
  #   the tools
--APXS = apxs
- APACHECTL = apachectl
 -CC = gcc
- INSTALL = install
+-INSTALL = install
++CC ?= gcc
++INSTALL ?= install
  
- #   additional user defines, includes and libraries
- #DEF = 
--#INC =
--#LIB = 
-+INC = -I/usr/local/include
-+LIB = -L/usr/local/lib
- CFLAGS = -O2 -Wall
- DOCROOT = /var/www
+ 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)
diff --git a/www/mod_musicindex/files/patch-Makefile.apache2 b/www/mod_musicindex/files/patch-Makefile.apache2
deleted file mode 100644
index bbf7664bb3a..00000000000
--- a/www/mod_musicindex/files/patch-Makefile.apache2
+++ /dev/null
@@ -1,34 +0,0 @@
---- Makefile.apache2.orig	Tue Nov 11 18:58:43 2003
-+++ Makefile.apache2	Thu Nov 20 14:09:38 2003
-@@ -3,23 +3,23 @@
- ##  Autogenerated via ``apxs -n musicindex -g''.
- ##
- 
--builddir=.
--top_srcdir=/usr/share/apache2
--top_builddir=/usr/share/apache2
--include /usr/share/apache2/build/special.mk
-+builddir=${BUILDDIR}
-+top_srcdir=${LOCALBASE}/share/apache2
-+top_builddir=${LOCALBASE}/share/apache2
-+include ${LOCALBASE}/share/apache2/build/special.mk
- 
- #   the used tools
--APXS=apxs2
- APACHECTL=apache2ctl
- 
- #   additional defines, includes and libraries
- DEF = -DEAPI
--#INCLUDES=-Imy/include/dir
--LIBS= -logg -lvorbis -lvorbisfile -lid3tag -lmad -lz
--CFLAGS += -Wall -I/usr/include/apr-0
-+INCLUDES=-I${LOCALBASE}/include/ -I${LOCALBASE}/include/apache2
-+LIBS= -logg -lvorbis -lvorbisfile -lid3tag -lmad -lz -L${LOCALBASE}/lib
-+CFLAGS += -Wall -I${LOCALBASE}/include/ -I${LOCALBASE}/include/apache2
- 
- #   the default target
- all: local-shared-build
-+	${APXS} -c mod_musicindex.c
- 
- #   install the shared object file into Apache 
- install: install-modules
diff --git a/www/mod_musicindex/files/patch-playlist.h b/www/mod_musicindex/files/patch-playlist.h
deleted file mode 100644
index 3f780db1a91..00000000000
--- a/www/mod_musicindex/files/patch-playlist.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- playlist.h.orig	Thu Oct 30 20:41:45 2003
-+++ playlist.h	Tue Nov  4 00:03:01 2003
-@@ -51,5 +51,7 @@
- 	
- mu_ent *new_ent(apr_pool_t *pool, mu_ent *head);
- 
-+#define FALSE 0
-+#define TRUE !FALSE
- 
- #endif
diff --git a/www/mod_musicindex/pkg-plist b/www/mod_musicindex/pkg-plist
index 62812974bc6..652665e62bb 100644
--- a/www/mod_musicindex/pkg-plist
+++ b/www/mod_musicindex/pkg-plist
@@ -1,3 +1,11 @@
-%%MOD_DIR%%/mod_musicindex.so
+%%APACHEMODDIR%%/mod_musicindex.so
 @exec %D/sbin/apxs -e -A -n musicindex %D/%F
 @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
+@dirrm www/musicindex
+