Attachment 26992 Details for Bug 45922 – file.diff

[patch] file.diff

file.diff (text/plain), 9.78 KB, created by tkato on 2002-12-02 22:20:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2002-12-02 22:20:02 UTC

Size: 9.78 KB

patch

obsolete

>diff -urN /usr/ports/audio/gnump3d/Makefile audio/gnump3d/Makefile
>--- /usr/ports/audio/gnump3d/Makefile	Mon Nov 11 18:58:53 2002
>+++ audio/gnump3d/Makefile	Mon Dec  2 19:37:47 2002
>@@ -7,26 +7,26 @@
> #
> 
> PORTNAME=	gnump3d
>-PORTVERSION=	1.0.p1
>+PORTVERSION=	1.0
> CATEGORIES=	audio
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	${PORTNAME}
>-DISTNAME=	${PORTNAME}-1.0-pre1
> 
> MAINTAINER=	ports@FreeBSD.org
> 
>-BUILD_DEPENDS=	autoconf:${PORTSDIR}/devel/autoconf
>-
> USE_BZIP2=	yes
> USE_PERL5=	yes
> USE_REINPLACE=	yes
> USE_GMAKE=	yes
>-GNU_CONFIGURE=	yes
>+USE_AUTOCONF_VER=	253
> CONFIGURE_TARGET=	--build=${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
> 
>@@ -44,15 +44,13 @@
> .endif
> 
> post-patch:
>-	@${TOUCH} -r ${WRKSRC}/aclocal.m4 ${WRKSRC}/aclocal.m4.time
> 	@${REINPLACE_CMD} -e 's|-D_THREAD_SAFE|${PTHREAD_CFLAGS}|g ; \
> 		 s|-pthread|${PTHREAD_LIBS}|g' ${WRKSRC}/aclocal.m4
>-# Avoid triggering automake
>-	@${TOUCH} -r ${WRKSRC}/aclocal.m4.time ${WRKSRC}/aclocal.m4
> 
> pre-configure:
>-.for dir in . mplib libltdl
>-	@cd ${WRKSRC}/${dir} && ${LOCALBASE}/bin/autoconf
>+.for dir in libltdl mplib
>+	@(cd ${WRKSRC}/${dir} && ${SETENV} ${AUTOCONF_ENV} ${AUTOCONF} \
>+		${AUTOCONF_ARGS})
> .endfor
> 
> post-install:
>diff -urN /usr/ports/audio/gnump3d/distinfo audio/gnump3d/distinfo
>--- /usr/ports/audio/gnump3d/distinfo	Wed Aug 21 04:26:02 2002
>+++ audio/gnump3d/distinfo	Mon Dec  2 19:20:21 2002
>@@ -1 +1 @@
>-MD5 (gnump3d-1.0-pre1.tar.bz2) = bd89ca74bc354ad65827be3cd572dad9
>+MD5 (gnump3d-1.0.tar.bz2) = 842d03a1e0421422c1a94c2c86273991
>diff -urN /usr/ports/audio/gnump3d/files/patch-config::ltmain.sh audio/gnump3d/files/patch-config::ltmain.sh
>--- /usr/ports/audio/gnump3d/files/patch-config::ltmain.sh	Wed Aug 21 04:26:02 2002
>+++ audio/gnump3d/files/patch-config::ltmain.sh	Mon Dec  2 19:58:54 2002
>@@ -11,12 +11,3 @@
>  	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
>- 	    ;;
>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  1 09:00:00 1970
>+++ audio/gnump3d/files/patch-plugins_bug.cc	Mon Dec  2 19:27:22 2002
>@@ -0,0 +1,14 @@
>+--- 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  1 09:00:00 1970
>+++ audio/gnump3d/files/patch-plugins_last20.cc	Mon Dec  2 19:29:34 2002
>@@ -0,0 +1,14 @@
>+--- 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  1 09:00:00 1970
>+++ audio/gnump3d/files/patch-plugins_now.cc	Mon Dec  2 19:30:35 2002
>@@ -0,0 +1,14 @@
>+--- 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  1 09:00:00 1970
>+++ audio/gnump3d/files/patch-plugins_playlist.cc	Mon Dec  2 19:35:51 2002
>@@ -0,0 +1,15 @@
>+--- 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  1 09:00:00 1970
>+++ audio/gnump3d/files/patch-plugins_search.cc	Mon Dec  2 19:31:18 2002
>@@ -0,0 +1,15 @@
>+--- 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  1 09:00:00 1970
>+++ audio/gnump3d/files/patch-plugins_stats.cc	Mon Dec  2 19:32:20 2002
>@@ -0,0 +1,14 @@
>+--- 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  1 09:00:00 1970
>+++ audio/gnump3d/files/patch-plugins_theme.cc	Mon Dec  2 19:35:04 2002
>@@ -0,0 +1,15 @@
>+--- 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  1 09:00:00 1970
>+++ audio/gnump3d/files/patch-plugins_version.cc	Mon Dec  2 19:36:53 2002
>@@ -0,0 +1,15 @@
>+--- 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_gnump3d-top.in audio/gnump3d/files/patch-scripts_gnump3d-top.in
>--- /usr/ports/audio/gnump3d/files/patch-scripts_gnump3d-top.in	Thu Aug 15 06:42:10 2002
>+++ audio/gnump3d/files/patch-scripts_gnump3d-top.in	Mon Dec  2 19:14:24 2002
>@@ -1,13 +1,13 @@
> 
> $FreeBSD: ports/audio/gnump3d/files/patch-scripts_gnump3d-top.in,v 1.1 2002/08/14 21:42:10 naddy Exp $
> 
>---- scripts/gnump3d-top.in.orig	Wed Aug 14 18:45:33 2002
>-+++ scripts/gnump3d-top.in	Wed Aug 14 18:46:04 2002
>-@@ -16,7 +16,7 @@
>+--- 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/mp3d/mp3d.conf";
>+-my $DEFAULT_CONFIG = "/etc/gnump3d/gnump3d.conf";
> +my $DEFAULT_CONFIG = "@prefix@/etc/gnump3d/gnump3d.conf";
>  
>  #
>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  1 09:00:00 1970
>+++ audio/gnump3d/files/patch-src_request.cc	Mon Dec  2 19:27:37 2002
>@@ -0,0 +1,13 @@
>+--- 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/pkg-plist audio/gnump3d/pkg-plist
>--- /usr/ports/audio/gnump3d/pkg-plist	Tue Sep 17 18:01:26 2002
>+++ audio/gnump3d/pkg-plist	Mon Dec  2 19:54:23 2002
>@@ -1,6 +1,14 @@
> @comment $FreeBSD: ports/audio/gnump3d/pkg-plist,v 1.8 2002/09/15 23:31:56 kris 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
>@@ -18,6 +26,12 @@
> 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
>@@ -36,6 +50,10 @@
> 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
>@@ -49,6 +67,8 @@
> @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

Actions: View | Diff

Attachments on bug 45922: 26992