diff options
author | Christian Weisgerber <naddy@FreeBSD.org> | 2002-08-20 19:26:03 +0000 |
---|---|---|
committer | Christian Weisgerber <naddy@FreeBSD.org> | 2002-08-20 19:26:03 +0000 |
commit | 1c80bacc6a1e9ecb8724d9ddb14f189be03d2ff2 (patch) | |
tree | 7a904c7e10dbf0729f49f5c776f9b15f1ba62a9d /audio/gnump3d | |
parent | Forgot to take maintainership of these buggers, too. (diff) |
* Update to version 1.0-pre1, which incorporates all our portability
fixes plus miscellaneous small improvements.
* Enable plugins again by installing .la files (oops).
Notes
Notes:
svn path=/head/; revision=64709
Diffstat (limited to 'audio/gnump3d')
-rw-r--r-- | audio/gnump3d/Makefile | 8 | ||||
-rw-r--r-- | audio/gnump3d/distinfo | 2 | ||||
-rw-r--r-- | audio/gnump3d/files/patch-config::ltmain.sh | 13 | ||||
-rw-r--r-- | audio/gnump3d/files/patch-configure.in | 15 | ||||
-rw-r--r-- | audio/gnump3d/files/patch-scripts_Makefile.in | 16 | ||||
-rw-r--r-- | audio/gnump3d/files/patch-src::threads.cc | 58 | ||||
-rw-r--r-- | audio/gnump3d/files/patch-src_files.cc | 14 | ||||
-rw-r--r-- | audio/gnump3d/files/patch-src_theme.cc | 19 | ||||
-rw-r--r-- | audio/gnump3d/files/patch-templates_Makefile.in | 18 | ||||
-rw-r--r-- | audio/gnump3d/pkg-descr | 2 | ||||
-rw-r--r-- | audio/gnump3d/pkg-plist | 9 |
11 files changed, 33 insertions, 141 deletions
diff --git a/audio/gnump3d/Makefile b/audio/gnump3d/Makefile index 726a38c9d02e..38947c35b2bd 100644 --- a/audio/gnump3d/Makefile +++ b/audio/gnump3d/Makefile @@ -7,11 +7,11 @@ # PORTNAME= gnump3d -PORTVERSION= 0.9.9.9.2 -PORTREVISION= 2 +PORTVERSION= 1.0.p1 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} +DISTNAME= ${PORTNAME}-1.0-pre1 MAINTAINER= ports@FreeBSD.org @@ -48,11 +48,13 @@ post-patch: s|-pthread|${PTHREAD_LIBS}|g' ${WRKSRC}/aclocal.m4 # Avoid triggering automake @${TOUCH} -r ${WRKSRC}/aclocal.m4.bak ${WRKSRC}/aclocal.m4 - @${TOUCH} -r ${WRKSRC}/configure.in.orig ${WRKSRC}/configure.in pre-configure: .for dir in . mplib libltdl @cd ${WRKSRC}/${dir} && ${LOCALBASE}/bin/autoconf .endfor +post-install: + @${MKDIR} /var/log/gnump3d + .include <bsd.port.mk> diff --git a/audio/gnump3d/distinfo b/audio/gnump3d/distinfo index 1ea011054759..2306bff35f12 100644 --- a/audio/gnump3d/distinfo +++ b/audio/gnump3d/distinfo @@ -1 +1 @@ -MD5 (gnump3d-0.9.9.9.2.tar.bz2) = 1e8c72e5dec7ab9c98f2d9e5795cfca3 +MD5 (gnump3d-1.0-pre1.tar.bz2) = bd89ca74bc354ad65827be3cd572dad9 diff --git a/audio/gnump3d/files/patch-config::ltmain.sh b/audio/gnump3d/files/patch-config::ltmain.sh index 46d28117efca..8015c0c75789 100644 --- a/audio/gnump3d/files/patch-config::ltmain.sh +++ b/audio/gnump3d/files/patch-config::ltmain.sh @@ -20,16 +20,3 @@ $FreeBSD$ # Do not include libc_r directly, use -pthread flag. continue ;; -@@ -4273,10 +4274,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/audio/gnump3d/files/patch-configure.in b/audio/gnump3d/files/patch-configure.in deleted file mode 100644 index 849548066e57..000000000000 --- a/audio/gnump3d/files/patch-configure.in +++ /dev/null @@ -1,15 +0,0 @@ - -$FreeBSD$ - ---- configure.in.orig Wed Aug 14 14:45:44 2002 -+++ configure.in Wed Aug 14 14:46:10 2002 -@@ -97,7 +97,8 @@ - - dnl check for Unix98 socklen_t - AC_MSG_CHECKING(for socklen_t) --AC_TRY_COMPILE([#include <sys/socket.h> -+AC_TRY_COMPILE([#include <sys/types.h> -+#include <sys/socket.h> - socklen_t x; - ],[],[AC_MSG_RESULT(yes)],[ - AC_TRY_COMPILE([#include <sys/socket.h> diff --git a/audio/gnump3d/files/patch-scripts_Makefile.in b/audio/gnump3d/files/patch-scripts_Makefile.in index 55dcaebfb1cd..72fc907f94d9 100644 --- a/audio/gnump3d/files/patch-scripts_Makefile.in +++ b/audio/gnump3d/files/patch-scripts_Makefile.in @@ -1,20 +1,20 @@ $FreeBSD$ ---- scripts/Makefile.in.orig Wed Aug 14 02:16:56 2002 -+++ scripts/Makefile.in Wed Aug 14 02:18:25 2002 +--- scripts/Makefile.in.orig Sun Aug 18 13:47:54 2002 ++++ scripts/Makefile.in Tue Aug 20 17:07:07 2002 @@ -195,11 +195,9 @@ install: -- mkdir -p $(bindir) -- cp gnump3d-config $(bindir) -- cp gnump3d-top $(bindir) -- chmod 755 $(bindir)/gnump3d-config -- chmod 755 $(bindir)/gnump3d-top +- mkdir -p $(DESTDIR)$(bindir) +- cp gnump3d-config $(DESTDIR)$(bindir) +- cp gnump3d-top $(DESTDIR)$(bindir) +- chmod 755 $(DESTDIR)$(bindir)/gnump3d-config +- chmod 755 $(DESTDIR)$(bindir)/gnump3d-top + $(mkinstalldirs) $(DESTDIR)$(bindir) +# $(INSTALL_SCRIPT) gnump3d-config $(DESTDIR)$(bindir) + $(INSTALL_SCRIPT) gnump3d-top $(DESTDIR)$(bindir) uninstall: - rm -f $(bindir)/gnump3d-config + rm -f $(DESTDIR)$(bindir)/gnump3d-config diff --git a/audio/gnump3d/files/patch-src::threads.cc b/audio/gnump3d/files/patch-src::threads.cc deleted file mode 100644 index 7d7d0102f4bf..000000000000 --- a/audio/gnump3d/files/patch-src::threads.cc +++ /dev/null @@ -1,58 +0,0 @@ - -$FreeBSD$ - ---- src/threads.cc.orig Sun Jul 14 01:53:50 2002 -+++ src/threads.cc Tue Aug 13 22:15:58 2002 -@@ -39,6 +39,7 @@ - #include <errno.h> - #include <algorithm> - #include <fstream.h> /* Portability fix: used to be <fstream> */ -+#include <sys/types.h> - #include <netinet/in.h> - #include <sys/socket.h> - #include <netdb.h> -@@ -248,7 +249,7 @@ - * worry about things like '%2E'. - * - */ -- if ( path.find( "/../" ) != (unsigned int)-1 ) -+ if ( path.find( "/../" ) != std::string::npos ) - { - path = "/"; - } -@@ -278,7 +279,7 @@ - /* - * Return a playlist of all the files in the given directory. - */ -- if ( path.find( "/all.m3u" ) != (unsigned int)-1 ) -+ if ( path.find( "/all.m3u" ) != std::string::npos ) - { - std::string dir; - int offset = path.find( "/all.m3u" ); -@@ -307,7 +308,7 @@ - /* - * Return a playlist of all the files in the given directory - Recursively. - */ -- if ( path.find( "/recurse.m3u" ) != (unsigned int)-1 ) -+ if ( path.find( "/recurse.m3u" ) != std::string::npos ) - { - std::string dir; - int offset = path.find( "/recurse.m3u" ); -@@ -337,7 +338,7 @@ - * Handle streaming a file or a playlist to the client - don't serve - * the .password file to clients though.. - */ -- if ( path.find( "/.password" ) != (unsigned int)-1 ) -+ if ( path.find( "/.password" ) != std::string::npos ) - { - std::string errText = "'$PATH' - Not found."; - -@@ -441,7 +442,7 @@ - * as a result of 'always_stream' being set to 1). - */ - if ( settings->alwaysStream() && -- ( path.find( ".m3u" ) != (unsigned int)-1 ) ) -+ ( path.find( ".m3u" ) != std::string::npos ) ) - { - /* Strip off the '.m3u' suffix */ - if ( path.size() > 4 ) diff --git a/audio/gnump3d/files/patch-src_files.cc b/audio/gnump3d/files/patch-src_files.cc deleted file mode 100644 index cd57d56c0fcb..000000000000 --- a/audio/gnump3d/files/patch-src_files.cc +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- src/files.cc.orig Tue Aug 13 22:16:33 2002 -+++ src/files.cc Tue Aug 13 22:16:54 2002 -@@ -360,7 +360,7 @@ - {
- CFunctionDebug( "CFile::normalize" );
-
-- if ( path.find( "//" ) == (unsigned int) -1)
-+ if ( path.find( "//" ) == std::string::npos)
- {
- return( path );
- }
diff --git a/audio/gnump3d/files/patch-src_theme.cc b/audio/gnump3d/files/patch-src_theme.cc deleted file mode 100644 index f469eae0b7e6..000000000000 --- a/audio/gnump3d/files/patch-src_theme.cc +++ /dev/null @@ -1,19 +0,0 @@ - -$FreeBSD$ - ---- src/theme.cc.orig Tue Aug 13 21:56:19 2002 -+++ src/theme.cc Tue Aug 13 21:56:46 2002 -@@ -123,11 +123,11 @@ - /* - * Make sure there's no directory traversal in the theme name. - */ -- if ( m_theme.find( ".." ) != (unsigned int)-1 ) -+ if ( m_theme.find( ".." ) != std::string::npos ) - { - return 0; - } -- if ( m_theme.find( "/" ) != (unsigned int)-1 ) -+ if ( m_theme.find( "/" ) != std::string::npos ) - { - return 0; - } diff --git a/audio/gnump3d/files/patch-templates_Makefile.in b/audio/gnump3d/files/patch-templates_Makefile.in index 2feef0461f9f..19952df9c39a 100644 --- a/audio/gnump3d/files/patch-templates_Makefile.in +++ b/audio/gnump3d/files/patch-templates_Makefile.in @@ -1,14 +1,14 @@ $FreeBSD$ ---- templates/Makefile.in.orig Sun Jul 14 01:53:52 2002 -+++ templates/Makefile.in Tue Aug 13 19:19:39 2002 +--- templates/Makefile.in.orig Sun Aug 18 13:47:52 2002 ++++ templates/Makefile.in Tue Aug 20 17:08:55 2002 @@ -192,7 +192,7 @@ install: - mkdir -p $(sysconfdir)/gnump3d - cp gnump3d.conf $(sysconfdir)/gnump3d/gnump3d.conf-default -- if ! test -e $(sysconfdir)/gnump3d/gnump3d.conf; then mv $(sysconfdir)/gnump3d/gnump3d.conf-default $(sysconfdir)/gnump3d/gnump3d.conf; fi -+ if ! test -e $(sysconfdir)/gnump3d/gnump3d.conf; then cp $(sysconfdir)/gnump3d/gnump3d.conf-default $(sysconfdir)/gnump3d/gnump3d.conf; fi - cp -R default $(sysconfdir)/gnump3d - cp -R simple $(sysconfdir)/gnump3d - cp -R split $(sysconfdir)/gnump3d + mkdir -p $(DESTDIR)$(sysconfdir)/gnump3d + cp gnump3d.conf $(DESTDIR)$(sysconfdir)/gnump3d/gnump3d.conf-default +- if ! test -e $(DESTDIR)$(sysconfdir)/gnump3d/gnump3d.conf; then mv $(DESTDIR)$(sysconfdir)/gnump3d/gnump3d.conf-default $(DESTDIR)$(sysconfdir)/gnump3d/gnump3d.conf; fi ++ if ! test -e $(DESTDIR)$(sysconfdir)/gnump3d/gnump3d.conf; then cp $(DESTDIR)$(sysconfdir)/gnump3d/gnump3d.conf-default $(DESTDIR)$(sysconfdir)/gnump3d/gnump3d.conf; fi + cp -R default $(DESTDIR)$(sysconfdir)/gnump3d + cp -R simple $(DESTDIR)$(sysconfdir)/gnump3d + cp -R split $(DESTDIR)$(sysconfdir)/gnump3d diff --git a/audio/gnump3d/pkg-descr b/audio/gnump3d/pkg-descr index f096c3299ba2..a5d140c9f87c 100644 --- a/audio/gnump3d/pkg-descr +++ b/audio/gnump3d/pkg-descr @@ -1,4 +1,4 @@ -GNUMP3d is a streaming server for MP3's, OGG vorbis, and other streamable +GNUMP3d is a streaming server for MP3's, Ogg Vorbis, and other streamable audio files. WWW: http://gnump3d.sourceforge.net/ diff --git a/audio/gnump3d/pkg-plist b/audio/gnump3d/pkg-plist index a03774cabc42..028bfb71a5f9 100644 --- a/audio/gnump3d/pkg-plist +++ b/audio/gnump3d/pkg-plist @@ -32,9 +32,18 @@ etc/gnump3d/split/plugin.html etc/gnump3d/split/results.html etc/gnump3d/split/search.html etc/gnump3d/split/stats.html +lib/gnump3d/bug.la +lib/gnump3d/bug.so +lib/gnump3d/last20.la lib/gnump3d/last20.so +lib/gnump3d/search.la lib/gnump3d/search.so +lib/gnump3d/stats.la lib/gnump3d/stats.so +lib/gnump3d/theme.la lib/gnump3d/theme.so +lib/gnump3d/version.la lib/gnump3d/version.so @dirrm lib/gnump3d +@exec mkdir -p /var/log/gnump3d +@unexec rmdir /var/log/gnump3d 2>/dev/null || true |