FreeBSD Bugzilla – Attachment 28691 Details for
Bug 48146
Update port: audio/gnump3d to 2.2
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 25.64 KB, created by
tkato
on 2003-02-10 15:40:07 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
tkato
Created:
2003-02-10 15:40:07 UTC
Size:
25.64 KB
patch
obsolete
>diff -urN /usr/ports/audio/gnump3d/Makefile audio/gnump3d/Makefile >--- /usr/ports/audio/gnump3d/Makefile Fri Jan 31 21:45:05 2003 >+++ audio/gnump3d/Makefile Mon Feb 10 09:16:36 2003 >@@ -7,56 +7,53 @@ > # > > PORTNAME= gnump3d >-PORTVERSION= 1.0 >-PORTREVISION= 2 >+PORTVERSION= 2.2 > CATEGORIES= audio > MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} > MASTER_SITE_SUBDIR= ${PORTNAME} > > MAINTAINER= ports@FreeBSD.org > >+RUN_DEPENDS= lame:${PORTSDIR}/audio/lame \ >+ oggenc:${PORTSDIR}/audio/mp32ogg >+ > USE_BZIP2= yes > USE_PERL5= yes >-USE_REINPLACE= yes >-USE_GMAKE= yes >-USE_AUTOCONF_VER= 253 >-USE_LIBTOOL= yes >-LIBTOOLFLAGS= # none >-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} >-CONFIGURE_ENV= CONFIG_SHELL="${SH}" \ >- CPPFLAGS="-I${LOCALBASE}/include" \ >- LDFLAGS="-L${LOCALBASE}/lib" >-CONFIGURE_ARGS= --libdir=${PREFIX}/lib/gnump3d >-# Avoid triggering automake >-MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOHEADER="${TRUE}" \ >- AUTOMAKE="${TRUE}" >- >-MAN1= gnump3d.1 gnump3d.conf.1 gnump3d-top.1 >- >-.if !defined(WITHOUT_VORBIS) >-LIB_DEPENDS= vorbis.2:${PORTSDIR}/audio/libvorbis >-CONFIGURE_ARGS+= --with-vorbis >-.endif >+NO_BUILD= yes > >-pre-everything:: >-.if !defined(WITHOUT_VORBIS) >- @${ECHO_MSG} >- @${ECHO_MSG} "If you want to compile without Ogg/Vorbis support," >- @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITHOUT_VORBIS=yes\"" >- @${ECHO_MSG} >-.endif >+MAN1= gnump3d.1 gnump3d-top.1 gnump3d.conf.1 > >-post-patch: >- @${REINPLACE_CMD} -e 's|-D_THREAD_SAFE|${PTHREAD_CFLAGS}|g ; \ >- s|-pthread|${PTHREAD_LIBS}|g' ${WRKSRC}/aclocal.m4 >+CONFDIR= ${PREFIX}/etc/${PORTNAME} >+PERL_SITELIBDIR= ${PREFIX}/lib/perl5/site_perl/${PERL_VER} > >-pre-configure: >-.for dir in libltdl mplib >- @(cd ${WRKSRC}/${dir} && ${SETENV} ${AUTOCONF_ENV} ${AUTOCONF} \ >- ${AUTOCONF_ARGS}) >+post-patch: >+.for file in bin/gnump3d-top bin/gnump3d2 etc/gnump3d.conf man/gnump3d.conf.1 >+ @${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g ; \ >+ s|%%LOCALBASE%%|${LOCALBASE}|g ; \ >+ s|%%PERL_SITELIBDIR%%|${PERL_SITELIBDIR}|g' ${WRKSRC}/${file} > .endfor > >-post-install: >- @${MKDIR} /var/log/gnump3d >+do-install: >+.for file in gnump3d-top gnump3d2 >+ ${INSTALL_SCRIPT} ${WRKSRC}/bin/${file} ${PREFIX}/bin >+.endfor >+ ${LN} -sf gnump3d2 ${PREFIX}/bin/gnump3d >+.for file in gnump3d.1 gnump3d-top.1 gnump3d.conf.1 >+ ${INSTALL_MAN} ${WRKSRC}/man/${file} ${MANPREFIX}/man/man1 >+.endfor >+ ${MKDIR} ${PERL_SITELIBDIR} >+ cd ${WRKSRC}/lib && ${FIND} . | \ >+ cpio -pdm -L -R ${LIBOWN}:${LIBGRP} ${PERL_SITELIBDIR} >+ ${MKDIR} ${DATADIR} >+ cd ${WRKSRC}/templates && ${FIND} . | \ >+ cpio -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DATADIR} >+ ${MKDIR} ${CONFDIR} >+ ${INSTALL_DATA} ${WRKSRC}/etc/mime.types ${CONFDIR} >+ ${INSTALL_DATA} ${WRKSRC}/etc/gnump3d.conf \ >+ ${CONFDIR}/gnump3d.conf-default >+.if !exists(${PREFIX}/etc/${PORTNAME}/gnump3d.conf) >+ cd ${CONFDIR} && ${CP} gnump3d.conf-default gnump3d.conf >+.endif >+ ${MKDIR} /var/log/${PORTNAME} > > .include <bsd.port.mk> >diff -urN /usr/ports/audio/gnump3d/distinfo audio/gnump3d/distinfo >--- /usr/ports/audio/gnump3d/distinfo Mon Jan 6 15:53:19 2003 >+++ audio/gnump3d/distinfo Fri Feb 7 00:55:20 2003 >@@ -1 +1 @@ >-MD5 (gnump3d-1.0.tar.bz2) = 842d03a1e0421422c1a94c2c86273991 >+MD5 (gnump3d-2.2.tar.bz2) = fc3d6b4ad2d3ebf14c29536c8cc6a514 >diff -urN /usr/ports/audio/gnump3d/files/patch-aclocal.m4 audio/gnump3d/files/patch-aclocal.m4 >--- /usr/ports/audio/gnump3d/files/patch-aclocal.m4 Tue Jan 28 15:00:34 2003 >+++ audio/gnump3d/files/patch-aclocal.m4 Thu Jan 1 09:00:00 1970 >@@ -1,10 +0,0 @@ >---- aclocal.m4.orig Mon Jan 27 21:52:25 2003 >-+++ aclocal.m4 Mon Jan 27 21:52:56 2003 >-@@ -164,6 +164,7 @@ >- >- # This can be used to rebuild libtool when needed >- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" >-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS >- >- # Always use our own libtool. >- LIBTOOL='$(SHELL) $(top_builddir)/libtool' >diff -urN /usr/ports/audio/gnump3d/files/patch-bin::gnump3d-top audio/gnump3d/files/patch-bin::gnump3d-top >--- /usr/ports/audio/gnump3d/files/patch-bin::gnump3d-top Thu Jan 1 09:00:00 1970 >+++ audio/gnump3d/files/patch-bin::gnump3d-top Mon Feb 10 09:24:11 2003 >@@ -0,0 +1,17 @@ >+--- bin/gnump3d-top.orig Tue Feb 4 18:25:13 2003 >++++ bin/gnump3d-top Mon Feb 10 09:24:01 2003 >+@@ -63,12 +63,12 @@ >+ { >+ $DEFAULT_CONFIG = $ENV{"HOME"} . "/.gnump3drc"; >+ } >+-elsif ( -e "/etc/gnump3d/gnump3d.conf" ) >++elsif ( -e "%%PREFIX%%/etc/gnump3d/gnump3d.conf" ) >+ { >+ # >+ # Otherwise the system wide one. >+ # >+- $DEFAULT_CONFIG = "/etc/gnump3d/gnump3d.conf"; >++ $DEFAULT_CONFIG = "%%PREFIX%%/etc/gnump3d/gnump3d.conf"; >+ } >+ elsif ( -e "gnump3d.conf" ) >+ { >diff -urN /usr/ports/audio/gnump3d/files/patch-bin::gnump3d2 audio/gnump3d/files/patch-bin::gnump3d2 >--- /usr/ports/audio/gnump3d/files/patch-bin::gnump3d2 Thu Jan 1 09:00:00 1970 >+++ audio/gnump3d/files/patch-bin::gnump3d2 Mon Feb 10 09:22:56 2003 >@@ -0,0 +1,39 @@ >+--- bin/gnump3d2.orig Tue Feb 4 18:25:13 2003 >++++ bin/gnump3d2 Mon Feb 10 09:22:35 2003 >+@@ -2397,9 +2397,9 @@ >+ { >+ $CONFIG_FILE = $ENV{"HOME"} . "/.gnump3drc"; >+ } >+- elsif ( -e "/etc/gnump3d/gnump3d.conf" ) >++ elsif ( -e "%%PREFIX%%/etc/gnump3d/gnump3d.conf" ) >+ { >+- $CONFIG_FILE = "/etc/gnump3d/gnump3d.conf"; >++ $CONFIG_FILE = "%%PREFIX%%/etc/gnump3d/gnump3d.conf"; >+ } >+ elsif ( -e "gnump3d.conf" ) >+ { >+@@ -2534,8 +2534,8 @@ >+ $PORT = getConfig( "port" ) || 8888; >+ $bind_address = getConfig( "binding_host" ) || ""; >+ $host = getConfig( "hostname" ) || "localhost"; >+- $theme_dir = getConfig( "theme_directory" ) || "/usr/share/gnump3d"; >+- $plugin_dir = getConfig( "plugin_directory" )|| "/usr/lib/perl5/gnump3d/plugins"; >++ $theme_dir = getConfig( "theme_directory" ) || "%%PREFIX%%/share/gnump3d"; >++ $plugin_dir = getConfig( "plugin_directory" )|| "%%PERL_SITELIBDIR%%/gnump3d/plugins"; >+ $always_stream = getConfig( "always_stream" ) || 1; >+ $access_log = getConfig( "logfile" ) || "/var/log/gnump3d/access.log"; >+ $error_log = getConfig( "errorlog" ) || "/var/log/gnump3d/error.log"; >+@@ -2543,11 +2543,11 @@ >+ $client_host = getConfig( "use_client_host" ) || 1; >+ $default_theme = getConfig( "theme" ) || "default"; >+ $TIMEOUT = getConfig( "read_time" ) || 10; >+- $STATSPROG = getConfig( "stats_program" ) || "/usr/bin/gnump3d-top"; >++ $STATSPROG = getConfig( "stats_program" ) || "%%PREFIX%%/bin/gnump3d-top"; >+ $STATSARGS = getConfig( "stats_args" ) || "--count=40"; >+ $play_all = getConfig( "play_all_text" ) || "Play All"; >+ $play_rec = getConfig( "play_recursively_text" ) || "Play Recursively"; >+- $mime_file = getConfig( "mime_file" ) || "/etc/gnump3d/mime.types"; >++ $mime_file = getConfig( "mime_file" ) || "%%PREFIX%%/etc/gnump3d/mime.types"; >+ $enable_browse = getConfig( "enable_browsing" ) || 1; >+ $sort_order = getConfig( "sort_order" ) || '$SONGNAME'; >+ >diff -urN /usr/ports/audio/gnump3d/files/patch-etc::gnump3d.conf audio/gnump3d/files/patch-etc::gnump3d.conf >--- /usr/ports/audio/gnump3d/files/patch-etc::gnump3d.conf Thu Jan 1 09:00:00 1970 >+++ audio/gnump3d/files/patch-etc::gnump3d.conf Mon Feb 10 09:13:53 2003 >@@ -0,0 +1,78 @@ >+--- etc/gnump3d.conf.orig Tue Feb 4 18:25:13 2003 >++++ etc/gnump3d.conf Mon Feb 10 09:08:29 2003 >+@@ -145,7 +145,7 @@ >+ # path if you don't have it installed upon the $PATH of the user >+ # who starts the server: >+ # >+-# stats_program = /usr/bin/gnump3d-top >++# stats_program = %%PREFIX%%/bin/gnump3d-top >+ # >+ # >+ # For example you may change the default number of lines which are >+@@ -359,13 +359,13 @@ >+ # theme variable below you specify which set of templates you wish >+ # the server to use. >+ # >+-# The theme directory defaults to /usr/share/gnump3d - but may be >++# The theme directory defaults to %%PREFIX%%/share/gnump3d - but may be >+ # changed via the 'theme_directory' setting given below. >+ # >+-# eg. To use the templates in '/usr/share/gnump3d/simple/' then you >++# eg. To use the templates in '%%PREFIX%%/share/gnump3d/simple/' then you >+ # should set 'theme=simple' >+ # >+-# To use the templates in '/usr/share/gnump3d/twin/' then you >++# To use the templates in '%%PREFIX%%/share/gnump3d/twin/' then you >+ # should set 'theme=twin' >+ # >+ # When the server is running you may set the theme from your browser >+@@ -392,7 +392,7 @@ >+ # location. >+ # >+ ## >+-# theme_directory = /usr/share/gnump3d/themes/ >++# theme_directory = %%PREFIX%%/share/gnump3d/themes/ >+ ## >+ >+ >+@@ -574,11 +574,11 @@ >+ # downsampled it will be quoted in '"' characters. >+ # >+ # >+-# downsample_mp3_binary = /usr/bin/lame >++# downsample_mp3_binary = %%LOCALBASE%%/bin/lame >+ # downsample_mp3_args = --mp3input --resample 32 -b 33 $FILENAME - >+ # >+ # >+-# downsample_ogg_binary = /usr/bin/oggenc >++# downsample_ogg_binary = %%LOCALBASE%%/bin/oggenc >+ # downsample_ogg_args = --mp3input --resample 32 -b 44 $FILENAME - >+ # >+ # >+@@ -586,7 +586,7 @@ >+ # binary. So if you have .midi files you wish to downsample, (dunno if >+ # that's possible but just for example), you would create lines like this >+ # >+-# downsample_midi_binary = /usr/bin/mythic-downsampler. >++# downsample_midi_binary = %%LOCALBASE%%/bin/mythic-downsampler. >+ # downsample_midi_args = --new-rate 3bps --output - $FILENAME >+ >+ # >+@@ -609,7 +609,7 @@ >+ # This next setting allows you to change the location from which the >+ # plugins are loaded. >+ # >+-# plugin_directory = /usr/lib/perl5/gnump3d/plugins >++# plugin_directory = %%PERL_SITELIBDIR%%/gnump3d/plugins >+ # >+ >+ >+@@ -671,7 +671,7 @@ >+ # used by default. If not point this next file to wherever your mime >+ # types file is located: >+ # >+-# mime_file = /etc/gnump3d/mime.types >++# mime_file = %%PREFIX%%/etc/gnump3d/mime.types >+ # >+ # >+ >diff -urN /usr/ports/audio/gnump3d/files/patch-man::gnump3d.conf.1 audio/gnump3d/files/patch-man::gnump3d.conf.1 >--- /usr/ports/audio/gnump3d/files/patch-man::gnump3d.conf.1 Thu Jan 1 09:00:00 1970 >+++ audio/gnump3d/files/patch-man::gnump3d.conf.1 Fri Feb 7 01:04:45 2003 >@@ -0,0 +1,11 @@ >+--- man/gnump3d.conf.1.orig Tue Feb 4 18:25:13 2003 >++++ man/gnump3d.conf.1 Fri Feb 7 01:04:28 2003 >+@@ -18,7 +18,7 @@ >+ .B gnump3d.conf >+ .Sp >+ By default the configuration file lives in >+-.B /etc/gnump3d/gnump3d.conf >++.B %%PREFIX%%/etc/gnump3d/gnump3d.conf >+ but the server may instead read the personal configuration file >+ .B >+ ~/.gnump3drc >diff -urN /usr/ports/audio/gnump3d/files/patch-man_Makefile.in audio/gnump3d/files/patch-man_Makefile.in >--- /usr/ports/audio/gnump3d/files/patch-man_Makefile.in Thu Aug 15 06:42:10 2002 >+++ audio/gnump3d/files/patch-man_Makefile.in Thu Jan 1 09:00:00 1970 >@@ -1,14 +0,0 @@ >- >-$FreeBSD: ports/audio/gnump3d/files/patch-man_Makefile.in,v 1.1 2002/08/14 21:42:10 naddy Exp $ >- >---- man/Makefile.in.orig Wed Aug 14 02:19:33 2002 >-+++ man/Makefile.in Wed Aug 14 02:19:52 2002 >-@@ -85,7 +85,7 @@ >- STRIP = @STRIP@ >- VERSION = @VERSION@ >- >--man_MANS = gnump3d.1 gnump3d-top.1 gnump3d.conf.1 gnump3d-config.1 >-+man_MANS = gnump3d.1 gnump3d-top.1 gnump3d.conf.1 >- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs >- CONFIG_HEADER = ../src/config.h >- CONFIG_CLEAN_FILES = >diff -urN /usr/ports/audio/gnump3d/files/patch-plugins_bug.cc audio/gnump3d/files/patch-plugins_bug.cc >--- /usr/ports/audio/gnump3d/files/patch-plugins_bug.cc Thu Jan 2 11:10:13 2003 >+++ audio/gnump3d/files/patch-plugins_bug.cc Thu Jan 1 09:00:00 1970 >@@ -1,14 +0,0 @@ >---- plugins/bug.cc.orig Fri Nov 29 04:33:21 2002 >-+++ plugins/bug.cc Mon Dec 2 19:27:02 2002 >-@@ -40,6 +40,11 @@ >- #include <sys/utsname.h> >- >- >-+#ifdef HAVE_PTHREAD >-+# include <pthread.h> >-+#endif >-+ >-+ >- #include "debug.h" >- #include "iplugin.h" >- #include "request.h" >diff -urN /usr/ports/audio/gnump3d/files/patch-plugins_last20.cc audio/gnump3d/files/patch-plugins_last20.cc >--- /usr/ports/audio/gnump3d/files/patch-plugins_last20.cc Thu Jan 2 11:10:13 2003 >+++ audio/gnump3d/files/patch-plugins_last20.cc Thu Jan 1 09:00:00 1970 >@@ -1,14 +0,0 @@ >---- plugins/last20.cc.orig Fri Nov 29 04:33:21 2002 >-+++ plugins/last20.cc Mon Dec 2 19:29:11 2002 >-@@ -40,6 +40,11 @@ >- #include <fstream.h> >- >- >-+#ifdef HAVE_PTHREAD >-+# include <pthread.h> >-+#endif >-+ >-+ >- #include "debug.h" >- #include "files.h" >- #include "iplugin.h" >diff -urN /usr/ports/audio/gnump3d/files/patch-plugins_now.cc audio/gnump3d/files/patch-plugins_now.cc >--- /usr/ports/audio/gnump3d/files/patch-plugins_now.cc Thu Jan 2 11:10:13 2003 >+++ audio/gnump3d/files/patch-plugins_now.cc Thu Jan 1 09:00:00 1970 >@@ -1,14 +0,0 @@ >---- plugins/now.cc.orig Fri Nov 29 04:33:21 2002 >-+++ plugins/now.cc Mon Dec 2 19:30:10 2002 >-@@ -40,6 +40,11 @@ >- #include <fstream.h> >- >- >-+#ifdef HAVE_PTHREAD >-+# include <pthread.h> >-+#endif >-+ >-+ >- #include "debug.h" >- #include "iplugin.h" >- #include "files.h" >diff -urN /usr/ports/audio/gnump3d/files/patch-plugins_playlist.cc audio/gnump3d/files/patch-plugins_playlist.cc >--- /usr/ports/audio/gnump3d/files/patch-plugins_playlist.cc Thu Jan 2 11:10:13 2003 >+++ audio/gnump3d/files/patch-plugins_playlist.cc Thu Jan 1 09:00:00 1970 >@@ -1,15 +0,0 @@ >---- plugins/playlist.cc.orig Fri Nov 29 04:33:21 2002 >-+++ plugins/playlist.cc Mon Dec 2 19:35:39 2002 >-@@ -39,6 +39,12 @@ >- #include <stdio.h> >- #include <stdlib.h> >- >-+ >-+#ifdef HAVE_PTHREAD >-+# include <pthread.h> >-+#endif >-+ >-+ >- #include "debug.h" >- #include "iplugin.h" >- #include "files.h" >diff -urN /usr/ports/audio/gnump3d/files/patch-plugins_search.cc audio/gnump3d/files/patch-plugins_search.cc >--- /usr/ports/audio/gnump3d/files/patch-plugins_search.cc Thu Jan 2 11:10:13 2003 >+++ audio/gnump3d/files/patch-plugins_search.cc Thu Jan 1 09:00:00 1970 >@@ -1,15 +0,0 @@ >---- plugins/search.cc.orig Fri Nov 29 04:33:21 2002 >-+++ plugins/search.cc Mon Dec 2 19:31:03 2002 >-@@ -38,6 +38,12 @@ >- #include <stdio.h> >- #include <stdlib.h> >- >-+ >-+#ifdef HAVE_PTHREAD >-+# include <pthread.h> >-+#endif >-+ >-+ >- #include "files.h" >- #include "debug.h" >- #include "dirs.h" >diff -urN /usr/ports/audio/gnump3d/files/patch-plugins_stats.cc audio/gnump3d/files/patch-plugins_stats.cc >--- /usr/ports/audio/gnump3d/files/patch-plugins_stats.cc Thu Jan 2 11:10:13 2003 >+++ audio/gnump3d/files/patch-plugins_stats.cc Thu Jan 1 09:00:00 1970 >@@ -1,14 +0,0 @@ >---- plugins/stats.cc.orig Fri Nov 29 04:33:21 2002 >-+++ plugins/stats.cc Mon Dec 2 19:32:09 2002 >-@@ -39,6 +39,11 @@ >- #include <stdlib.h> >- >- >-+#ifdef HAVE_PTHREAD >-+# include <pthread.h> >-+#endif >-+ >-+ >- #include "debug.h" >- #include "request.h" >- #include "settings.h" >diff -urN /usr/ports/audio/gnump3d/files/patch-plugins_theme.cc audio/gnump3d/files/patch-plugins_theme.cc >--- /usr/ports/audio/gnump3d/files/patch-plugins_theme.cc Thu Jan 2 11:10:13 2003 >+++ audio/gnump3d/files/patch-plugins_theme.cc Thu Jan 1 09:00:00 1970 >@@ -1,15 +0,0 @@ >---- plugins/theme.cc.orig Fri Nov 29 04:33:21 2002 >-+++ plugins/theme.cc Mon Dec 2 19:34:54 2002 >-@@ -39,6 +39,12 @@ >- #include <stdio.h> >- #include <stdlib.h> >- >-+ >-+#ifdef HAVE_PTHREAD >-+# include <pthread.h> >-+#endif >-+ >-+ >- #include "debug.h" >- #include "dirs.h" >- #include "files.h" >diff -urN /usr/ports/audio/gnump3d/files/patch-plugins_version.cc audio/gnump3d/files/patch-plugins_version.cc >--- /usr/ports/audio/gnump3d/files/patch-plugins_version.cc Thu Jan 2 11:10:13 2003 >+++ audio/gnump3d/files/patch-plugins_version.cc Thu Jan 1 09:00:00 1970 >@@ -1,15 +0,0 @@ >---- plugins/version.cc.orig Fri Nov 29 04:33:21 2002 >-+++ plugins/version.cc Mon Dec 2 19:36:44 2002 >-@@ -38,6 +38,12 @@ >- #include <stdio.h> >- #include <stdlib.h> >- >-+ >-+#ifdef HAVE_PTHREAD >-+# include <pthread.h> >-+#endif >-+ >-+ >- #include "debug.h" >- #include "iplugin.h" >- #include "plugin.h" >diff -urN /usr/ports/audio/gnump3d/files/patch-scripts_Makefile.in audio/gnump3d/files/patch-scripts_Makefile.in >--- /usr/ports/audio/gnump3d/files/patch-scripts_Makefile.in Wed Aug 21 04:26:03 2002 >+++ audio/gnump3d/files/patch-scripts_Makefile.in Thu Jan 1 09:00:00 1970 >@@ -1,20 +0,0 @@ >- >-$FreeBSD: ports/audio/gnump3d/files/patch-scripts_Makefile.in,v 1.2 2002/08/20 19:26:03 naddy Exp $ >- >---- 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 $(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 $(DESTDIR)$(bindir)/gnump3d-config >diff -urN /usr/ports/audio/gnump3d/files/patch-scripts_gnump3d-top.in audio/gnump3d/files/patch-scripts_gnump3d-top.in >--- /usr/ports/audio/gnump3d/files/patch-scripts_gnump3d-top.in Mon Jan 6 15:53:19 2003 >+++ audio/gnump3d/files/patch-scripts_gnump3d-top.in Thu Jan 1 09:00:00 1970 >@@ -1,14 +0,0 @@ >- >-$FreeBSD: ports/audio/gnump3d/files/patch-scripts_gnump3d-top.in,v 1.2 2003/01/02 02:10:13 adamw Exp $ >- >---- scripts/gnump3d-top.in.orig Fri Nov 29 04:33:21 2002 >-+++ scripts/gnump3d-top.in Mon Dec 2 19:13:54 2002 >-@@ -30,7 +30,7 @@ >- >- # The default logfile which we read if there is no >- # --config options supplied on the command line. >--my $DEFAULT_CONFIG = "/etc/gnump3d/gnump3d.conf"; >-+my $DEFAULT_CONFIG = "@prefix@/etc/gnump3d/gnump3d.conf"; >- >- # >- # Options set by the command line arguments. >diff -urN /usr/ports/audio/gnump3d/files/patch-src_request.cc audio/gnump3d/files/patch-src_request.cc >--- /usr/ports/audio/gnump3d/files/patch-src_request.cc Thu Jan 2 11:10:13 2003 >+++ audio/gnump3d/files/patch-src_request.cc Thu Jan 1 09:00:00 1970 >@@ -1,13 +0,0 @@ >---- src/request.cc.orig Fri Nov 29 04:33:21 2002 >-+++ src/request.cc Mon Dec 2 19:25:06 2002 >-@@ -54,6 +54,10 @@ >- # include <unistd.h> >- #endif /* HAVE_UNISTD_H */ >- >-+#ifdef HAVE_PTHREAD >-+# include <pthread.h> >-+#endif >-+ >- >- #include "base64.h" >- #include "debug.h" >diff -urN /usr/ports/audio/gnump3d/files/patch-templates_Makefile.in audio/gnump3d/files/patch-templates_Makefile.in >--- /usr/ports/audio/gnump3d/files/patch-templates_Makefile.in Wed Aug 21 04:26:03 2002 >+++ audio/gnump3d/files/patch-templates_Makefile.in Thu Jan 1 09:00:00 1970 >@@ -1,14 +0,0 @@ >- >-$FreeBSD: ports/audio/gnump3d/files/patch-templates_Makefile.in,v 1.2 2002/08/20 19:26:03 naddy Exp $ >- >---- 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 $(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 -urN /usr/ports/audio/gnump3d/files/patch-templates_gnump3d.conf audio/gnump3d/files/patch-templates_gnump3d.conf >--- /usr/ports/audio/gnump3d/files/patch-templates_gnump3d.conf Thu Aug 15 06:42:10 2002 >+++ audio/gnump3d/files/patch-templates_gnump3d.conf Thu Jan 1 09:00:00 1970 >@@ -1,14 +0,0 @@ >- >-$FreeBSD: ports/audio/gnump3d/files/patch-templates_gnump3d.conf,v 1.1 2002/08/14 21:42:10 naddy Exp $ >- >---- templates/gnump3d.conf.orig Wed Aug 14 02:11:42 2002 >-+++ templates/gnump3d.conf Wed Aug 14 02:13:23 2002 >-@@ -143,7 +143,7 @@ >- # you run the server as a user such as 'nobody', and allow people read-only >- # access to your audio files. >- # >--user = nobody >-+user = www >- >- >- # >diff -urN /usr/ports/audio/gnump3d/pkg-plist audio/gnump3d/pkg-plist >--- /usr/ports/audio/gnump3d/pkg-plist Tue Jan 7 17:41:16 2003 >+++ audio/gnump3d/pkg-plist Mon Feb 10 08:58:01 2003 >@@ -1,74 +1,107 @@ > @comment $FreeBSD: ports/audio/gnump3d/pkg-plist,v 1.11 2003/01/07 01:28:49 adamw Exp $ > bin/gnump3d > bin/gnump3d-top >-etc/gnump3d/LaFrere/config.ini >-etc/gnump3d/LaFrere/error.html >-etc/gnump3d/LaFrere/index.html >-etc/gnump3d/LaFrere/logo.png >-etc/gnump3d/LaFrere/plugin.html >-etc/gnump3d/LaFrere/results.html >-etc/gnump3d/LaFrere/search.html >-etc/gnump3d/LaFrere/stats.html >-etc/gnump3d/default/error.html >-etc/gnump3d/default/index.html >-etc/gnump3d/default/plugin.html >-etc/gnump3d/default/results.html >-etc/gnump3d/default/search.html >-etc/gnump3d/default/stats.html >-etc/gnump3d/default/style.css >+bin/gnump3d2 > @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 >-etc/gnump3d/nausicaa/results.html >-etc/gnump3d/nausicaa/search.html >-etc/gnump3d/nausicaa/stats.html >-etc/gnump3d/nausicaa/style.css >-etc/gnump3d/redgrey/error.html >-etc/gnump3d/redgrey/index.html >-etc/gnump3d/redgrey/plugin.html >-etc/gnump3d/redgrey/results.html >-etc/gnump3d/redgrey/search.html >-etc/gnump3d/redgrey/stats.html >-etc/gnump3d/simple/config.ini >-etc/gnump3d/simple/error.html >-etc/gnump3d/simple/index.html >-etc/gnump3d/simple/plugin.html >-etc/gnump3d/simple/results.html >-etc/gnump3d/simple/search.html >-etc/gnump3d/simple/stats.html >-etc/gnump3d/split/config.ini >-etc/gnump3d/split/error.html >-etc/gnump3d/split/index.html >-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/now.la >-lib/gnump3d/now.so >-lib/gnump3d/playlist.la >-lib/gnump3d/playlist.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 >+etc/gnump3d/mime.types >+lib/perl5/site_perl/%%PERL_VER%%/gnump3d/IP.pm >+lib/perl5/site_perl/%%PERL_VER%%/gnump3d/base64.pm >+lib/perl5/site_perl/%%PERL_VER%%/gnump3d/config.pm >+lib/perl5/site_perl/%%PERL_VER%%/gnump3d/files.pm >+lib/perl5/site_perl/%%PERL_VER%%/gnump3d/mp3info.pm >+lib/perl5/site_perl/%%PERL_VER%%/gnump3d/oggtagreader.pm >+lib/perl5/site_perl/%%PERL_VER%%/gnump3d/playlist.pm >+lib/perl5/site_perl/%%PERL_VER%%/gnump3d/plugins/COPYING.pm >+lib/perl5/site_perl/%%PERL_VER%%/gnump3d/plugins/bug.pm >+lib/perl5/site_perl/%%PERL_VER%%/gnump3d/plugins/last.pm >+lib/perl5/site_perl/%%PERL_VER%%/gnump3d/plugins/playlist.pm >+lib/perl5/site_perl/%%PERL_VER%%/gnump3d/plugins/prefs.pm >+lib/perl5/site_perl/%%PERL_VER%%/gnump3d/plugins/search.pm >+lib/perl5/site_perl/%%PERL_VER%%/gnump3d/plugins/stats.pm >+share/gnump3d/LaFrere/AUTHOR >+share/gnump3d/LaFrere/config.ini >+share/gnump3d/LaFrere/error.html >+share/gnump3d/LaFrere/index.html >+share/gnump3d/LaFrere/logo.png >+share/gnump3d/LaFrere/plugin.html >+share/gnump3d/LaFrere/results.html >+share/gnump3d/LaFrere/search.html >+share/gnump3d/LaFrere/stats.html >+share/gnump3d/Thexder/AUTHOR >+share/gnump3d/Thexder/config.ini >+share/gnump3d/Thexder/dig_temp2_01.jpg >+share/gnump3d/Thexder/dig_temp2_02.jpg >+share/gnump3d/Thexder/dig_temp2_03.gif >+share/gnump3d/Thexder/dig_temp2_04.jpg >+share/gnump3d/Thexder/dig_temp2_06.jpg >+share/gnump3d/Thexder/dig_temp2_08.jpg >+share/gnump3d/Thexder/dig_temp2_10.jpg >+share/gnump3d/Thexder/dig_temp2_12.jpg >+share/gnump3d/Thexder/dig_temp2_14.jpg >+share/gnump3d/Thexder/error.html >+share/gnump3d/Thexder/hr.gif >+share/gnump3d/Thexder/index.html >+share/gnump3d/Thexder/link_1.jpg >+share/gnump3d/Thexder/link_2.jpg >+share/gnump3d/Thexder/link_3.jpg >+share/gnump3d/Thexder/link_4.jpg >+share/gnump3d/Thexder/link_5.jpg >+share/gnump3d/Thexder/logo7.jpg >+share/gnump3d/Thexder/plugin.html >+share/gnump3d/Thexder/results.html >+share/gnump3d/Thexder/search.html >+share/gnump3d/Thexder/spacer.gif >+share/gnump3d/Thexder/stats.html >+share/gnump3d/default/AUTHOR >+share/gnump3d/default/error.html >+share/gnump3d/default/index.html >+share/gnump3d/default/plugin.html >+share/gnump3d/default/results.html >+share/gnump3d/default/search.html >+share/gnump3d/default/stats.html >+share/gnump3d/default/style.css >+share/gnump3d/nausicaa/AUTHOR >+share/gnump3d/nausicaa/error.html >+share/gnump3d/nausicaa/index.html >+share/gnump3d/nausicaa/plugin.html >+share/gnump3d/nausicaa/results.html >+share/gnump3d/nausicaa/search.html >+share/gnump3d/nausicaa/stats.html >+share/gnump3d/nausicaa/style.css >+share/gnump3d/redgrey/AUTHOR >+share/gnump3d/redgrey/error.html >+share/gnump3d/redgrey/index.html >+share/gnump3d/redgrey/plugin.html >+share/gnump3d/redgrey/results.html >+share/gnump3d/redgrey/search.html >+share/gnump3d/redgrey/stats.html >+share/gnump3d/simple/AUTHOR >+share/gnump3d/simple/config.ini >+share/gnump3d/simple/error.html >+share/gnump3d/simple/index.html >+share/gnump3d/simple/plugin.html >+share/gnump3d/simple/results.html >+share/gnump3d/simple/search.html >+share/gnump3d/simple/stats.html >+share/gnump3d/split/AUTHOR >+share/gnump3d/split/config.ini >+share/gnump3d/split/error.html >+share/gnump3d/split/index.html >+share/gnump3d/split/plugin.html >+share/gnump3d/split/results.html >+share/gnump3d/split/search.html >+share/gnump3d/split/stats.html >+@dirrm share/gnump3d/split >+@dirrm share/gnump3d/simple >+@dirrm share/gnump3d/redgrey >+@dirrm share/gnump3d/nausicaa >+@dirrm share/gnump3d/default >+@dirrm share/gnump3d/Thexder >+@dirrm share/gnump3d/LaFrere >+@dirrm lib/perl5/site_perl/%%PERL_VER%%/gnump3d/plugins >+@dirrm lib/perl5/site_perl/%%PERL_VER%%/gnump3d >+@unexec rmdir %D/etc/gnump3d 2>/dev/null || true > @unexec rmdir /var/log/gnump3d 2>/dev/null || true >-@dirrm etc/gnump3d/split >-@dirrm etc/gnump3d/simple >-@dirrm etc/gnump3d/redgrey >-@dirrm etc/gnump3d/nausicaa >-@dirrm etc/gnump3d/default >-@dirrm etc/gnump3d/LaFrere >-@dirrm etc/gnump3d >+@exec mkdir -p /var/log/gnump3d
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 48146
: 28691