Attachment 37361 Details for Bug 59507 – mod_musicindex.diff

[patch] mod_musicindex.diff

mod_musicindex.diff (text/plain), 4.99 KB, created by Clement Laforet on 2003-11-20 14:20:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Clement Laforet

Created: 2003-11-20 14:20:15 UTC

Size: 4.99 KB

patch

obsolete

>Index: mod_musicindex/Makefile
>===================================================================
>RCS file: /WORK/REPO/FreeBSD/ports/www/mod_musicindex/Makefile,v
>retrieving revision 1.1
>diff -u -r1.1 Makefile
>--- mod_musicindex/Makefile	3 Nov 2003 16:17:10 -0000	1.1
>+++ mod_musicindex/Makefile	20 Nov 2003 14:00:37 -0000
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	mod_musicindex
>-PORTVERSION=	0.8.9
>+PORTVERSION=	0.9.0
> CATEGORIES=	www audio
> MASTER_SITES=	http://www.esiee.fr/~puffin/musicindex/
> DISTNAME=	libapache-mod-musicindex_${PORTVERSION}
>@@ -22,18 +22,34 @@
> 		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}
> 
>-DOCS_HTMLIMAGES=	directory.png musicindex.css fetch.png \
>+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 -A -n musicindex ${WRKSRC}/mod_musicindex.so
>+	${APXS} -i -n musicindex -A ${WRKSRC}/mod_musicindex.${MODULE_EXT}
> .if !defined(NOPORTDOCS)
> 	@${MKDIR} ${DOCSDIR}
>-.for f in ${DOCS_HTMLIMAGES}
>+.for f in ${PORTDOCS}
> 	${INSTALL_DATA} ${WRKSRC}/musicindex/${f} ${DOCSDIR}
> .endfor
> .endif
>Index: mod_musicindex/distinfo
>===================================================================
>RCS file: /WORK/REPO/FreeBSD/ports/www/mod_musicindex/distinfo,v
>retrieving revision 1.1
>diff -u -r1.1 distinfo
>--- mod_musicindex/distinfo	3 Nov 2003 16:17:10 -0000	1.1
>+++ mod_musicindex/distinfo	20 Nov 2003 12:41:21 -0000
>@@ -1 +1 @@
>-MD5 (libapache-mod-musicindex_0.8.9.tar.gz) = 49eede2e4935f32b7f5f60a4782aa9a0
>+MD5 (libapache-mod-musicindex_0.9.0.tar.gz) = 81bc6f199801b6a4dc6e91d52b87c3b3
>Index: mod_musicindex/pkg-plist
>===================================================================
>RCS file: /WORK/REPO/FreeBSD/ports/www/mod_musicindex/pkg-plist,v
>retrieving revision 1.1
>diff -u -r1.1 pkg-plist
>--- mod_musicindex/pkg-plist	3 Nov 2003 16:17:10 -0000	1.1
>+++ mod_musicindex/pkg-plist	20 Nov 2003 12:49:13 -0000
>@@ -1,10 +1,3 @@
>-libexec/apache/mod_musicindex.so
>+%%MOD_DIR%%/mod_musicindex.so
> @exec %D/sbin/apxs -e -A -n musicindex %D/%F
> @unexec %D/sbin/apxs -e -A -n musicindex %D/%F
>-%%PORTDOCS%%%%DOCSDIR%%/directory.png
>-%%PORTDOCS%%%%DOCSDIR%%/fetch.png
>-%%PORTDOCS%%%%DOCSDIR%%/general.png
>-%%PORTDOCS%%%%DOCSDIR%%/musicindex.css
>-%%PORTDOCS%%%%DOCSDIR%%/right_arrow.gif
>-%%PORTDOCS%%%%DOCSDIR%%/sound.png
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%
>Index: mod_musicindex/files/patch-Makefile
>===================================================================
>RCS file: /WORK/REPO/FreeBSD/ports/www/mod_musicindex/files/patch-Makefile,v
>retrieving revision 1.1
>diff -u -r1.1 patch-Makefile
>--- mod_musicindex/files/patch-Makefile	3 Nov 2003 16:17:10 -0000	1.1
>+++ mod_musicindex/files/patch-Makefile	20 Nov 2003 12:36:00 -0000
>@@ -1,6 +1,13 @@
>---- Makefile.orig	Thu Oct 30 20:41:45 2003
>-+++ Makefile	Tue Nov  4 00:03:52 2003
>-@@ -15,8 +15,8 @@
>+--- Makefile.orig	Thu Oct 30 12:41:45 2003
>++++ Makefile	Thu Nov 20 12:35:49 2003
>+@@ -8,15 +8,13 @@
>+ ##  @todo auto-dep
>+ 
>+ #   the tools
>+-APXS = apxs
>+ APACHECTL = apachectl
>+-CC = gcc
>+ INSTALL = install
>  
>  #   additional user defines, includes and libraries
>  #DEF = 
>Index: mod_musicindex/files/patch-Makefile.apache2
>===================================================================
>RCS file: mod_musicindex/files/patch-Makefile.apache2
>diff -N mod_musicindex/files/patch-Makefile.apache2
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ mod_musicindex/files/patch-Makefile.apache2	20 Nov 2003 14:09:40 -0000
>@@ -0,0 +1,34 @@
>+--- 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

Actions: View | Diff

Attachments on bug 59507: 37361