diff options
author | Christian Weisgerber <naddy@FreeBSD.org> | 2002-08-14 00:03:26 +0000 |
---|---|---|
committer | Christian Weisgerber <naddy@FreeBSD.org> | 2002-08-14 00:03:26 +0000 |
commit | 8e92340f89af61a862a7618c6b57cb32eec69f22 (patch) | |
tree | 327b2c918559bb293b3bc457b75114c8307a0009 /audio | |
parent | Fix building in -current. (diff) |
* Always depend on external libvorbis when building with Ogg Vorbis support.
* This port does not install any shared libraries.
* Don't clobber an existing configuration file or remove a modified one.
* Don't install .la files for plugins.
* Fix build on -CURRENT.
* Fix build on 64-bit platforms.
Notes
Notes:
svn path=/head/; revision=64481
Diffstat (limited to 'audio')
-rw-r--r-- | audio/gnump3d/Makefile | 3 | ||||
-rw-r--r-- | audio/gnump3d/files/patch-config::ltmain.sh | 29 | ||||
-rw-r--r-- | audio/gnump3d/files/patch-src::threads.cc | 52 | ||||
-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 | 14 | ||||
-rw-r--r-- | audio/gnump3d/pkg-plist | 10 |
7 files changed, 130 insertions, 11 deletions
diff --git a/audio/gnump3d/Makefile b/audio/gnump3d/Makefile index 39cd50713e97..15b46857338c 100644 --- a/audio/gnump3d/Makefile +++ b/audio/gnump3d/Makefile @@ -8,6 +8,7 @@ PORTNAME= gnump3d PORTVERSION= 0.9.9.9.2 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -25,11 +26,11 @@ CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --libdir=${PREFIX}/lib/gnump3d -INSTALLS_SHLIB= yes MAN1= gnump3d.1 gnump3d.conf.1 gnump3d-config.1 gnump3d-top.1 .if !defined(WITHOUT_VORBIS) +LIB_DEPENDS= vorbis.2:${PORTSDIR}/audio/libvorbis CONFIGURE_ARGS+= --with-vorbis .endif diff --git a/audio/gnump3d/files/patch-config::ltmain.sh b/audio/gnump3d/files/patch-config::ltmain.sh index d8d418253953..46d28117efca 100644 --- a/audio/gnump3d/files/patch-config::ltmain.sh +++ b/audio/gnump3d/files/patch-config::ltmain.sh @@ -1,5 +1,8 @@ ---- config/ltmain.sh.orig Sun Jul 14 08:53:50 2002 -+++ config/ltmain.sh Tue Jul 16 00:38:55 2002 + +$FreeBSD$ + +--- config/ltmain.sh.orig Sun Jul 14 01:53:50 2002 ++++ config/ltmain.sh Tue Aug 13 18:00:19 2002 @@ -967,6 +967,7 @@ ;; @@ -8,3 +11,25 @@ avoid_version=yes continue ;; +@@ -1061,7 +1062,7 @@ + esac + elif test "X$arg" = "X-lc_r"; then + case $host in +- *-*-openbsd* | *-*-freebsd*) ++ *-*-openbsd*) + # 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-src::threads.cc b/audio/gnump3d/files/patch-src::threads.cc index e3df3f0b3c49..7d7d0102f4bf 100644 --- a/audio/gnump3d/files/patch-src::threads.cc +++ b/audio/gnump3d/files/patch-src::threads.cc @@ -1,5 +1,8 @@ ---- src/threads.cc.orig Sun Jul 14 08:53:50 2002 -+++ src/threads.cc Tue Jul 16 00:01:18 2002 + +$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> @@ -8,3 +11,48 @@ #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 new file mode 100644 index 000000000000..cd57d56c0fcb --- /dev/null +++ b/audio/gnump3d/files/patch-src_files.cc @@ -0,0 +1,14 @@ + +$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 new file mode 100644 index 000000000000..f469eae0b7e6 --- /dev/null +++ b/audio/gnump3d/files/patch-src_theme.cc @@ -0,0 +1,19 @@ + +$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 new file mode 100644 index 000000000000..2feef0461f9f --- /dev/null +++ b/audio/gnump3d/files/patch-templates_Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- templates/Makefile.in.orig Sun Jul 14 01:53:52 2002 ++++ templates/Makefile.in Tue Aug 13 19:19:39 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 diff --git a/audio/gnump3d/pkg-plist b/audio/gnump3d/pkg-plist index 620facfeb5ce..548f6ec6e34e 100644 --- a/audio/gnump3d/pkg-plist +++ b/audio/gnump3d/pkg-plist @@ -1,3 +1,4 @@ +@comment $FreeBSD$ bin/gnump3d bin/gnump3d-config bin/gnump3d-top @@ -8,7 +9,9 @@ etc/gnump3d/default/results.html etc/gnump3d/default/search.html etc/gnump3d/default/stats.html etc/gnump3d/default/style.css -etc/gnump3d/gnump3d.conf +@unexec if cmp -s %D/etc/gnump3d/gnump3d.conf %D/etc/gnump3d/gnump3d.conf-default; then rm -f %D/etc/gnump3d/gnump3d.conf; fi +etc/gnump3d/gnump3d.conf-default +@exec [ -f %B/gnump3d.conf ] || cp %B/%f %B/gnump3d.conf etc/gnump3d/nausicaa/error.html etc/gnump3d/nausicaa/index.html etc/gnump3d/nausicaa/plugin.html @@ -30,14 +33,9 @@ etc/gnump3d/split/plugin.html etc/gnump3d/split/results.html etc/gnump3d/split/search.html etc/gnump3d/split/stats.html -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 |