Attachment #37361 for bug #59507

View | Details | Raw Unified | Return to bug 59507
Collapse All | Expand All




#

PORTNAME=	mod_musicindex
PORTVERSION=	0.9.0
CATEGORIES=	www audio
MASTER_SITES=	http://www.esiee.fr/~puffin/musicindex/
DISTNAME=	libapache-mod-musicindex_${PORTVERSION}

		mad.1:${PORTSDIR}/audio/mad

APXS?=		${LOCALBASE}/sbin/apxs
APACHE_PORT?=	${PORTSDIR}/www/apache13
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?=	${PORTSDIR}/www/apache2
MAKE_TARGET=	all
.else
MODULE_EXT=	so
PLIST_SUB+=	MOD_DIR=libexec/apache
APACHE_PORT?=	${PORTSDIR}/www/apache13
.endif

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
.endif

Line 1 Link Here

(-)mod_musicindex/distinfo (-1 / +1 lines)
1	MD5 (libapache-mod-musicindex_0.8.9.tar.gz) = 49eede2e4935f32b7f5f60a4782aa9a0	1	MD5 (libapache-mod-musicindex_0.9.0.tar.gz) = 81bc6f199801b6a4dc6e91d52b87c3b3

Lines 1-10 Link Here

(-)mod_musicindex/pkg-plist (-8 / +1 lines)
1	libexec/apache/mod_musicindex.so	1	%%MOD_DIR%%/mod_musicindex.so
2	@exec %D/sbin/apxs -e -A -n musicindex %D/%F	2	@exec %D/sbin/apxs -e -A -n musicindex %D/%F
3	@unexec %D/sbin/apxs -e -A -n musicindex %D/%F	3	@unexec %D/sbin/apxs -e -A -n musicindex %D/%F
4	%%PORTDOCS%%%%DOCSDIR%%/directory.png
5	%%PORTDOCS%%%%DOCSDIR%%/fetch.png
6	%%PORTDOCS%%%%DOCSDIR%%/general.png
7	%%PORTDOCS%%%%DOCSDIR%%/musicindex.css
8	%%PORTDOCS%%%%DOCSDIR%%/right_arrow.gif
9	%%PORTDOCS%%%%DOCSDIR%%/sound.png
10	%%PORTDOCS%%@dirrm %%DOCSDIR%%

Lines 1-6 Link Here

(-)mod_musicindex/files/patch-Makefile (-3 / +10 lines)
1	--- Makefile.orig Thu Oct 30 20:41:45 2003	1	--- Makefile.orig Thu Oct 30 12:41:45 2003
2	+++ Makefile Tue Nov 4 00:03:52 2003	2	+++ Makefile Thu Nov 20 12:35:49 2003
3	@@ -15,8 +15,8 @@	3	@@ -8,15 +8,13 @@
		4	## @todo auto-dep
		5
		6	# the tools
		7	-APXS = apxs
		8	APACHECTL = apachectl
		9	-CC = gcc
		10	INSTALL = install
4		11
5	# additional user defines, includes and libraries	12	# additional user defines, includes and libraries
6	#DEF =	13	#DEF =




--- 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

Return to bug 59507

Lines 6-12 Link Here

(-)mod_musicindex/Makefile (-5 / +21 lines)
6	#	6	#
7		7
8	PORTNAME= mod_musicindex	8	PORTNAME= mod_musicindex
9	PORTVERSION= 0.8.9	9	PORTVERSION= 0.9.0
10	CATEGORIES= www audio	10	CATEGORIES= www audio
11	MASTER_SITES= http://www.esiee.fr/~puffin/musicindex/	11	MASTER_SITES= http://www.esiee.fr/~puffin/musicindex/
12	DISTNAME= libapache-mod-musicindex_${PORTVERSION}	12	DISTNAME= libapache-mod-musicindex_${PORTVERSION}
Lines 22-39 Link Here
22	mad.1:${PORTSDIR}/audio/mad	22	mad.1:${PORTSDIR}/audio/mad
23		23
24	APXS?= ${LOCALBASE}/sbin/apxs	24	APXS?= ${LOCALBASE}/sbin/apxs
25	APACHE_PORT?= ${PORTSDIR}/www/apache13
26	USE_GMAKE= yes	25	USE_GMAKE= yes
27	WRKSRC= ${WRKDIR}/libapache-mod-musicindex-${PORTVERSION}	26	WRKSRC= ${WRKDIR}/libapache-mod-musicindex-${PORTVERSION}
		27	MAKE_ENV+= APXS=${APXS} BUILDDIR=${WRKSRC}
28		28
29	DOCS_HTMLIMAGES= directory.png musicindex.css fetch.png \	29	PORTDOCS= directory.png musicindex.css fetch.png \
30	right_arrow.gif general.png sound.png	30	right_arrow.gif general.png sound.png
31		31
		32	.if defined (WITH_APACHE2)
		33	MODULE_EXT= la
		34	MAKEFILE= Makefile.apache2
		35	PLIST_SUB+= MOD_DIR=libexec/apache2
		36	APACHE_PORT?= ${PORTSDIR}/www/apache2
		37	MAKE_TARGET= all
		38	.else
		39	MODULE_EXT= so
		40	PLIST_SUB+= MOD_DIR=libexec/apache
		41	APACHE_PORT?= ${PORTSDIR}/www/apache13
		42	.endif
		43
		44	post-patch:
		45	@${CP} ${WRKSRC}/modules.mk.apache2 ${WRKSRC}/modules.mk
		46	@${TOUCH} ${WRKSRC}/.deps
		47
32	do-install:	48	do-install:
33	${APXS} -i -A -n musicindex ${WRKSRC}/mod_musicindex.so	49	${APXS} -i -n musicindex -A ${WRKSRC}/mod_musicindex.${MODULE_EXT}
34	.if !defined(NOPORTDOCS)	50	.if !defined(NOPORTDOCS)
35	@${MKDIR} ${DOCSDIR}	51	@${MKDIR} ${DOCSDIR}
36	.for f in ${DOCS_HTMLIMAGES}	52	.for f in ${PORTDOCS}
37	${INSTALL_DATA} ${WRKSRC}/musicindex/${f} ${DOCSDIR}	53	${INSTALL_DATA} ${WRKSRC}/musicindex/${f} ${DOCSDIR}
38	.endfor	54	.endfor
39	.endif	55	.endif

Added Link Here

(-)mod_musicindex/files/patch-Makefile.apache2 (+34 lines)
1	--- Makefile.apache2.orig Tue Nov 11 18:58:43 2003
2	+++ Makefile.apache2 Thu Nov 20 14:09:38 2003
3	@@ -3,23 +3,23 @@
4	## Autogenerated via ``apxs -n musicindex -g''.
5	##
6
7	-builddir=.
8	-top_srcdir=/usr/share/apache2
9	-top_builddir=/usr/share/apache2
10	-include /usr/share/apache2/build/special.mk
11	+builddir=${BUILDDIR}
12	+top_srcdir=${LOCALBASE}/share/apache2
13	+top_builddir=${LOCALBASE}/share/apache2
14	+include ${LOCALBASE}/share/apache2/build/special.mk
15
16	# the used tools
17	-APXS=apxs2
18	APACHECTL=apache2ctl
19
20	# additional defines, includes and libraries
21	DEF = -DEAPI
22	-#INCLUDES=-Imy/include/dir
23	-LIBS= -logg -lvorbis -lvorbisfile -lid3tag -lmad -lz
24	-CFLAGS += -Wall -I/usr/include/apr-0
25	+INCLUDES=-I${LOCALBASE}/include/ -I${LOCALBASE}/include/apache2
26	+LIBS= -logg -lvorbis -lvorbisfile -lid3tag -lmad -lz -L${LOCALBASE}/lib
27	+CFLAGS += -Wall -I${LOCALBASE}/include/ -I${LOCALBASE}/include/apache2
28
29	# the default target
30	all: local-shared-build
31	+ ${APXS} -c mod_musicindex.c
32
33	# install the shared object file into Apache
34	install: install-modules