Attachment 30829 Details for Bug 51691 – file.diff

[patch] file.diff

file.diff (text/plain), 7.49 KB, created by Kirill Ponomarew on 2003-05-02 15:30:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kirill Ponomarew

Created: 2003-05-02 15:30:10 UTC

Size: 7.49 KB

patch

obsolete

>diff -ruN gnump3d.orig/Makefile gnump3d/Makefile
>--- gnump3d.orig/Makefile	Fri May  2 11:39:03 2003
>+++ gnump3d/Makefile	Fri May  2 15:57:27 2003
>@@ -7,7 +7,7 @@
> #
> 
> PORTNAME=	gnump3d
>-PORTVERSION=	2.3
>+PORTVERSION=	2.4
> CATEGORIES=	audio
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	${PORTNAME}
>diff -ruN gnump3d.orig/distinfo gnump3d/distinfo
>--- gnump3d.orig/distinfo	Fri May  2 11:39:03 2003
>+++ gnump3d/distinfo	Fri May  2 15:57:52 2003
>@@ -1 +1 @@
>-MD5 (gnump3d-2.3.tar.bz2) = 35f795d8ad2b5c1164456330ac52fa21
>+MD5 (gnump3d-2.4.tar.bz2) = df712073eed1bdd259d66a7df5015aa8
>diff -ruN gnump3d.orig/files/patch-bin::gnump3d-top gnump3d/files/patch-bin::gnump3d-top
>--- gnump3d.orig/files/patch-bin::gnump3d-top	Tue Feb 11 21:59:31 2003
>+++ gnump3d/files/patch-bin::gnump3d-top	Fri May  2 16:05:18 2003
>@@ -1,6 +1,6 @@
>---- 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 @@
>+--- bin/gnump3d-top.orig	Fri May  2 16:03:38 2003
>++++ bin/gnump3d-top	Fri May  2 16:04:22 2003
>+@@ -64,12 +64,12 @@
>  {
>      $DEFAULT_CONFIG = $ENV{"HOME"} . "/.gnump3drc";
>  }
>diff -ruN gnump3d.orig/files/patch-bin::gnump3d2 gnump3d/files/patch-bin::gnump3d2
>--- gnump3d.orig/files/patch-bin::gnump3d2	Fri May  2 11:39:03 2003
>+++ gnump3d/files/patch-bin::gnump3d2	Fri May  2 16:02:54 2003
>@@ -1,18 +1,18 @@
>---- bin/gnump3d2.orig	Tue Apr 29 06:18:15 2003
>-+++ bin/gnump3d2	Tue Apr 29 06:21:39 2003
>-@@ -2234,9 +2234,9 @@
>+--- bin/gnump3d2.orig	Fri May  2 15:59:42 2003
>++++ bin/gnump3d2	Fri May  2 16:02:49 2003
>+@@ -2457,9 +2457,9 @@
>    {
>        $CONFIG_FILE = $ENV{"HOME"} . "/.gnump3drc";
>    }
> -  elsif ( -e "/etc/gnump3d/gnump3d.conf" )
>-+  elsif ( -e "%%PREFIX%%/etc/gnump3d/gnump3d.conf" )
>++  elsif ( -e "%%PREFIX%%/gnump3d/gnump3d.conf" )
>    {
> -      $CONFIG_FILE = "/etc/gnump3d/gnump3d.conf";
>-+      $CONFIG_FILE = "%%PREFIX%%/etc/gnump3d/gnump3d.conf";
>++      $CONFIG_FILE = "%%PREFIX%%/gnump3d/gnump3d.conf";
>    }
>    elsif ( -e "gnump3d.conf" )
>    {
>-@@ -2371,8 +2371,8 @@
>+@@ -2599,8 +2599,8 @@
>    $PORT          = getConfig( "port", 8888 );
>    $bind_address  = getConfig( "binding_host", "" );
>    $host          = getConfig( "hostname", "localhost" );
>@@ -23,15 +23,14 @@
>    $always_stream = getConfig( "always_stream", 1 );
>    $access_log    = getConfig( "logfile", "/var/log/gnump3d/access.log" );
>    $error_log     = getConfig( "errorlog", "/var/log/gnump3d/error.log" );
>-@@ -2380,11 +2380,11 @@
>+@@ -2608,10 +2608,10 @@
>    $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_arguments", "" );
>-   $play_all      = getConfig( "play_all_text", "Play All" );
>-   $play_rec      = getConfig( "play_recursively_text",  "Play Recursively" );
>+   $play_rec      = getConfig( "play_recursively_text",  "Play" );
> -  $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 );
>diff -ruN gnump3d.orig/files/patch-etc::gnump3d.conf gnump3d/files/patch-etc::gnump3d.conf
>--- gnump3d.orig/files/patch-etc::gnump3d.conf	Fri May  2 11:39:03 2003
>+++ gnump3d/files/patch-etc::gnump3d.conf	Fri May  2 16:09:36 2003
>@@ -1,6 +1,6 @@
>---- etc/gnump3d.conf.orig	Tue Apr 29 06:18:15 2003
>-+++ etc/gnump3d.conf	Tue Apr 29 06:26:17 2003
>-@@ -163,7 +163,7 @@
>+--- etc/gnump3d.conf.orig	Fri May  2 16:06:07 2003
>++++ etc/gnump3d.conf	Fri May  2 16:09:14 2003
>+@@ -173,7 +173,7 @@
>  # path if you don't have it installed upon the $PATH of the user
>  # who starts the server:
>  #
>@@ -9,7 +9,7 @@
>  #
>  #
>  #  For example you may change the default number of lines which are
>-@@ -382,13 +382,13 @@
>+@@ -388,13 +388,13 @@
>  # theme variable below you specify which set of templates you wish
>  # the server to use.
>  #
>@@ -26,7 +26,7 @@
>  #      should set theme to be 'twin'
>  #
>  #  When the server is running you may set the theme from your browser
>-@@ -415,7 +415,7 @@
>+@@ -421,7 +421,7 @@
>  # location.
>  #
>  ##
>@@ -35,28 +35,28 @@
>  ##
>  
>  
>-@@ -568,13 +568,13 @@
>- #
>- #
>- #
>--#downsample_high_mp3   = /usr/bin/lame  --mp3input --resample 32 -b 33 
>--#downsample_medium_mp3 = /usr/bin/lame  --mp3input --resample 24 -b 24
>--#downsample_low_mp3    = /usr/bin/lame  --mp3input --resample 16 -b 16 
>+@@ -582,13 +582,13 @@
>+ # the string '$FILENAME' will be replaced by the file the user is
>+ # requesting.
>+ #
>+-#downsample_high_mp3   = /usr/bin/lame  --mp3input -b 56 $FILENAME -
>+-#downsample_medium_mp3 = /usr/bin/lame  --mp3input -b 33 $FILENAME -
>+-#downsample_low_mp3    = /usr/bin/lame  --mp3input -b 16 $FILENAME -
> -#
>--#downsample_high_ogg   = /usr/bin/oggenc --mp3input --resample 32 -b 44
>--#downsample_medium_ogg = /usr/bin/oggenc --mp3input --resample 24 -b 44
>--#downsample_low_ogg    = /usr/bin/oggenc --mp3input --resample 16 -b 44
>-+#downsample_high_mp3   = %%LOCALBASE%%/bin/lame  --mp3input --resample 32 -b 33 
>-+#downsample_medium_mp3 = %%LOCALBASE%%/bin/lame  --mp3input --resample 24 -b 24
>-+#downsample_low_mp3    = %%LOCALBASE%%/bin/lame  --mp3input --resample 16 -b 16 
>+-#downsample_high_ogg   = /usr/bin/oggenc --mp3input $FILENAME --resample 32 -b 44
>+-#downsample_medium_ogg = /usr/bin/oggenc --mp3input $FILENAME --resample 24 -b 44
>+-#downsample_low_ogg    = /usr/bin/oggenc --mp3input $FILENAME --resample 16 -b 44
>++#downsample_high_mp3   = %%LOCALBASE%%/bin/lame  --mp3input -b 56 $FILENAME -
>++#downsample_medium_mp3 = %%LOCALBASE%%/bin/lame  --mp3input -b 33 $FILENAME -
>++#downsample_low_mp3    = %%LOCALBASE%%/bin/lame  --mp3input -b 16 $FILENAME -
> +#
>-+#downsample_high_ogg   = %%LOCALBASE%%/bin/oggenc --mp3input --resample 32 -b 44
>-+#downsample_medium_ogg = %%LOCALBASE%%/bin/oggenc --mp3input --resample 24 -b 44
>-+#downsample_low_ogg    = %%LOCALBASE%%/bin/oggenc --mp3input --resample 16 -b 44
>++#downsample_high_ogg   = %%LOCALBASE%%/bin/oggenc --mp3input $FILENAME --resample 32 -b 44
>++#downsample_medium_ogg = %%LOCALBASE%%/bin/oggenc --mp3input $FILENAME --resample 24 -b 44
>++#downsample_low_ogg    = %%LOCALBASE%%/bin/oggenc --mp3input $FILENAME --resample 16 -b 44
>  #
>  
>  #
>-@@ -597,7 +597,7 @@
>+@@ -611,7 +611,7 @@
>  #  This next setting allows you to change the location from which the
>  # plugins are loaded.
>  #
>@@ -65,7 +65,7 @@
>  #
>  #
>  #  NOTE: the following directory should be correctly filled in by
>-@@ -669,7 +669,7 @@
>+@@ -683,7 +683,7 @@
>  # used by default.  If not point this next file to wherever your mime
>  # types file is located:
>  #
>@@ -73,4 +73,13 @@
> +#  mime_file = %%PREFIX%%/etc/gnump3d/mime.types
>  #
>  #
>+ 
>+@@ -771,7 +771,7 @@
>+ ##
>+ #
>+ #  jukebox_mode   = 1
>+-#  jukebox_player = /usr/bin/mpg123 $FILENAME
>++#  jukebox_player = %%PREFIX%%/bin/mpg123 $FILENAME
>+ #
>+ ##
>  
>diff -ruN gnump3d.orig/pkg-plist gnump3d/pkg-plist
>--- gnump3d.orig/pkg-plist	Fri May  2 11:39:03 2003
>+++ gnump3d/pkg-plist	Fri May  2 16:22:01 2003
>@@ -16,7 +16,6 @@
> 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/info.pm
>-lib/perl5/site_perl/%%PERL_VER%%/gnump3d/plugins/last.pm
> lib/perl5/site_perl/%%PERL_VER%%/gnump3d/plugins/now.pm
> lib/perl5/site_perl/%%PERL_VER%%/gnump3d/plugins/playlist.pm
> lib/perl5/site_perl/%%PERL_VER%%/gnump3d/plugins/prefs.pm

Actions: View | Diff

Attachments on bug 51691: 30829