Attachment 50238 Details for Bug 76575 – file.diff

[patch] file.diff

file.diff (text/plain), 5.94 KB, created by Tobias Roth on 2005-01-22 18:30:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Roth

Created: 2005-01-22 18:30:26 UTC

Size: 5.94 KB

patch

obsolete

>diff -ruN mod_musicindex.orig/Makefile mod_musicindex/Makefile
>--- mod_musicindex.orig/Makefile	Fri Jan 21 20:10:05 2005
>+++ mod_musicindex/Makefile	Sat Jan 22 17:21:27 2005
>@@ -7,14 +7,15 @@
> 
> PORTNAME=	mod_musicindex
> PORTVERSION=	0.99.7
>+PORTREVISION=	1
> CATEGORIES=	www audio
>-# Master site don't have a current version'd tarball...
>-#MASTER_SITES=	http://www.esiee.fr/~puffin/musicindex/
>-MASTER_SITES=	http://sheepkiller.nerim.net/
>+# 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}
> 
>-MAINTAINER=	apache@FreeBSD.org
>-COMMENT=	Apache module in C implements Perl module Apache::MP3
>+MAINTAINER=	ports@fsck.ch
>+COMMENT=	Apache module in C that implements the perl module Apache::MP3
> 
> LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis \
> 		id3tag.2:${PORTSDIR}/audio/libid3tag \
>@@ -27,6 +28,7 @@
> #WANT_APACHE=	YES
> USE_GMAKE=	yes
> WRKSRC=		${WRKDIR}/libapache-mod-musicindex-${PORTVERSION}
>+SUB_FILES=	pkg-message
> 
> PORTDOCS=	directory.png musicindex.css fetch.png \
> 		right_arrow.gif general.png sound.png
>@@ -39,5 +41,14 @@
> .if "${AP_VER}"=="2"
> MAKE_ENV+=	APACHE_VERSION=2 APRCONFIG=${LOCALBASE}/lib/apache2/apr-config
> .endif
>+
>+post-install:
>+.if !defined(NOPORTDOCS)
>+	${MKDIR} ${DOCSDIR}
>+	${CP} ${WRKSRC}/README ${DOCSDIR}
>+.endif
>+	@${ECHO_MSG} ""
>+	@${CAT} ${PKGMESSAGE}
>+	@${ECHO_MSG} ""
> 
> .include <bsd.port.post.mk>
>diff -ruN mod_musicindex.orig/files/patch-Makefile mod_musicindex/files/patch-Makefile
>--- mod_musicindex.orig/files/patch-Makefile	Fri Jan 21 20:10:05 2005
>+++ mod_musicindex/files/patch-Makefile	Sat Jan 22 14:58:38 2005
>@@ -1,5 +1,5 @@
>---- Makefile.orig	Mon Jan 17 21:44:36 2005
>-+++ Makefile	Mon Jan 17 21:51:06 2005
>+--- 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)
>  
>@@ -39,3 +39,12 @@
>  
>  #   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
>diff -ruN mod_musicindex.orig/files/pkg-message.in mod_musicindex/files/pkg-message.in
>--- mod_musicindex.orig/files/pkg-message.in	Thu Jan  1 01:00:00 1970
>+++ mod_musicindex/files/pkg-message.in	Sat Jan 22 16:49:41 2005
>@@ -0,0 +1,40 @@
>+************************************************************
>+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
>+
>+************************************************************
>diff -ruN mod_musicindex.orig/pkg-descr mod_musicindex/pkg-descr
>--- mod_musicindex.orig/pkg-descr	Fri Jan 21 20:10:05 2005
>+++ mod_musicindex/pkg-descr	Sat Jan 22 14:41:45 2005
>@@ -3,4 +3,4 @@
> containing MP3 or Ogg Vorbis files, including sorting them on various 
> fields, streaming/downloading them, constructing playlists, and searching.
> 
>-WWW: http://www.esiee.fr/~puffin/musicindex/
>+WWW: http://www.parisc-linux.org/~varenet/musicindex/
>diff -ruN mod_musicindex.orig/pkg-message mod_musicindex/pkg-message
>--- mod_musicindex.orig/pkg-message	Fri Jan 21 20:10:05 2005
>+++ mod_musicindex/pkg-message	Thu Jan  1 01:00:00 1970
>@@ -1,26 +0,0 @@
>-************************************************************
>-You've installed mod_musicindex
>-
>-Edit your apache.conf or httpd.conf to enable and setup this
>-module. 
>-
>-And sample Directory configuration should looks like this:
>-
>-<Directory /usr/local/www/data/musicindex/>
>-    Options Indexes MultiViews FollowSymlinks
>-    AllowOverride None
>-    MusicLister
>-    MusicSortOrder      artist album track title
>-    MusicFields         title artist album track length bitrate
>-    MusicAllowDownload
>-    MusicAllowStream
>-    MusicAllowSearch
>-    MusicCachePath      /tmp/musicindex
>-</Directory>
>-
>-Then do this to make it work effective:
>-
>-# apachectl configtest (see if there are any config errors)
>-# apachectl restart
>-
>-************************************************************
>diff -ruN mod_musicindex.orig/pkg-plist mod_musicindex/pkg-plist
>--- mod_musicindex.orig/pkg-plist	Fri Jan 21 20:10:05 2005
>+++ mod_musicindex/pkg-plist	Sat Jan 22 16:56:30 2005
>@@ -7,5 +7,6 @@
> www/musicindex/musicindex.css
> www/musicindex/right_arrow.gif
> www/musicindex/sound.png
>+%%PORTDOCS%%%%DOCSDIR%%/README
> @dirrm www/musicindex
>-
>+%%PORTDOCS%%@dirrm %%DOCSDIR%%

Actions: View | Diff

Attachments on bug 76575: 50238