Attachment #26992 for bug #45922

View | Details | Raw Unified | Return to bug 45922
Collapse All | Expand All




#

PORTNAME=	gnump3d
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
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


.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 libltdl mplib
	@(cd ${WRKSRC}/${dir} && ${SETENV} ${AUTOCONF_ENV} ${AUTOCONF} \
		${AUTOCONF_ARGS})
.endfor

post-install:

Line 1 Link Here

(-)audio/gnump3d/distinfo (-1 / +1 lines)
1	MD5 (gnump3d-1.0-pre1.tar.bz2) = bd89ca74bc354ad65827be3cd572dad9	1	MD5 (gnump3d-1.0.tar.bz2) = 842d03a1e0421422c1a94c2c86273991




 	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
 	    ;;




--- 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"




--- 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"




--- 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"




--- 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"




--- 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"




--- 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"




--- 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"




--- 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"





$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	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";
 
 #




--- 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"

Lines 1-6 Link Here

(-)audio/gnump3d/pkg-plist (+20 lines)
1	@comment $FreeBSD: ports/audio/gnump3d/pkg-plist,v 1.8 2002/09/15 23:31:56 kris Exp $	1	@comment $FreeBSD: ports/audio/gnump3d/pkg-plist,v 1.8 2002/09/15 23:31:56 kris Exp $
2	bin/gnump3d	2	bin/gnump3d
3	bin/gnump3d-top	3	bin/gnump3d-top
		4	etc/gnump3d/LaFrere/config.ini
		5	etc/gnump3d/LaFrere/error.html
		6	etc/gnump3d/LaFrere/index.html
		7	etc/gnump3d/LaFrere/logo.png
		8	etc/gnump3d/LaFrere/plugin.html
		9	etc/gnump3d/LaFrere/results.html
		10	etc/gnump3d/LaFrere/search.html
		11	etc/gnump3d/LaFrere/stats.html
4	etc/gnump3d/default/error.html	12	etc/gnump3d/default/error.html
5	etc/gnump3d/default/index.html	13	etc/gnump3d/default/index.html
6	etc/gnump3d/default/plugin.html	14	etc/gnump3d/default/plugin.html
Lines 18-23 Link Here
18	etc/gnump3d/nausicaa/search.html	26	etc/gnump3d/nausicaa/search.html
19	etc/gnump3d/nausicaa/stats.html	27	etc/gnump3d/nausicaa/stats.html
20	etc/gnump3d/nausicaa/style.css	28	etc/gnump3d/nausicaa/style.css
		29	etc/gnump3d/redgrey/error.html
		30	etc/gnump3d/redgrey/index.html
		31	etc/gnump3d/redgrey/plugin.html
		32	etc/gnump3d/redgrey/results.html
		33	etc/gnump3d/redgrey/search.html
		34	etc/gnump3d/redgrey/stats.html
21	etc/gnump3d/simple/config.ini	35	etc/gnump3d/simple/config.ini
22	etc/gnump3d/simple/error.html	36	etc/gnump3d/simple/error.html
23	etc/gnump3d/simple/index.html	37	etc/gnump3d/simple/index.html
Lines 36-41 Link Here
36	lib/gnump3d/bug.so	50	lib/gnump3d/bug.so
37	lib/gnump3d/last20.la	51	lib/gnump3d/last20.la
38	lib/gnump3d/last20.so	52	lib/gnump3d/last20.so
		53	lib/gnump3d/now.la
		54	lib/gnump3d/now.so
		55	lib/gnump3d/playlist.la
		56	lib/gnump3d/playlist.so
39	lib/gnump3d/search.la	57	lib/gnump3d/search.la
40	lib/gnump3d/search.so	58	lib/gnump3d/search.so
41	lib/gnump3d/stats.la	59	lib/gnump3d/stats.la
Lines 49-54 Link Here
49	@unexec rmdir /var/log/gnump3d 2>/dev/null \|\| true	67	@unexec rmdir /var/log/gnump3d 2>/dev/null \|\| true
50	@dirrm etc/gnump3d/split	68	@dirrm etc/gnump3d/split
51	@dirrm etc/gnump3d/simple	69	@dirrm etc/gnump3d/simple
		70	@dirrm etc/gnump3d/redgrey
52	@dirrm etc/gnump3d/nausicaa	71	@dirrm etc/gnump3d/nausicaa
53	@dirrm etc/gnump3d/default	72	@dirrm etc/gnump3d/default
		73	@dirrm etc/gnump3d/LaFrere
54	@dirrm etc/gnump3d	74	@dirrm etc/gnump3d

Return to bug 45922

Lines 7-32 Link Here

(-)audio/gnump3d/Makefile (-10 / +8 lines)
7	#	7	#
8		8
9	PORTNAME= gnump3d	9	PORTNAME= gnump3d
10	PORTVERSION= 1.0.p1	10	PORTVERSION= 1.0
11	CATEGORIES= audio	11	CATEGORIES= audio
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= ${PORTNAME}	13	MASTER_SITE_SUBDIR= ${PORTNAME}
14	DISTNAME= ${PORTNAME}-1.0-pre1
15		14
16	MAINTAINER= ports@FreeBSD.org	15	MAINTAINER= ports@FreeBSD.org
17		16
18	BUILD_DEPENDS= autoconf:${PORTSDIR}/devel/autoconf
19
20	USE_BZIP2= yes	17	USE_BZIP2= yes
21	USE_PERL5= yes	18	USE_PERL5= yes
22	USE_REINPLACE= yes	19	USE_REINPLACE= yes
23	USE_GMAKE= yes	20	USE_GMAKE= yes
24	GNU_CONFIGURE= yes	21	USE_AUTOCONF_VER= 253
25	CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}	22	CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
26	CONFIGURE_ENV= CONFIG_SHELL="${SH}" \	23	CONFIGURE_ENV= CONFIG_SHELL="${SH}" \
27	CPPFLAGS="-I${LOCALBASE}/include" \	24	CPPFLAGS="-I${LOCALBASE}/include" \
28	LDFLAGS="-L${LOCALBASE}/lib"	25	LDFLAGS="-L${LOCALBASE}/lib"
29	CONFIGURE_ARGS= --libdir=${PREFIX}/lib/gnump3d	26	CONFIGURE_ARGS= --libdir=${PREFIX}/lib/gnump3d
		27	# Avoid triggering automake
		28	MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOHEADER="${TRUE}" \
		29	AUTOMAKE="${TRUE}"
30		30
31	MAN1= gnump3d.1 gnump3d.conf.1 gnump3d-top.1	31	MAN1= gnump3d.1 gnump3d.conf.1 gnump3d-top.1
32		32
Lines 44-58 Link Here
44	.endif	44	.endif
45		45
46	post-patch:	46	post-patch:
47	@${TOUCH} -r ${WRKSRC}/aclocal.m4 ${WRKSRC}/aclocal.m4.time
48	@${REINPLACE_CMD} -e 's\|-D_THREAD_SAFE\|${PTHREAD_CFLAGS}\|g ; \	47	@${REINPLACE_CMD} -e 's\|-D_THREAD_SAFE\|${PTHREAD_CFLAGS}\|g ; \
49	s\|-pthread\|${PTHREAD_LIBS}\|g' ${WRKSRC}/aclocal.m4	48	s\|-pthread\|${PTHREAD_LIBS}\|g' ${WRKSRC}/aclocal.m4
50	# Avoid triggering automake
51	@${TOUCH} -r ${WRKSRC}/aclocal.m4.time ${WRKSRC}/aclocal.m4
52		49
53	pre-configure:	50	pre-configure:
54	.for dir in . mplib libltdl	51	.for dir in libltdl mplib
55	@cd ${WRKSRC}/${dir} && ${LOCALBASE}/bin/autoconf	52	@(cd ${WRKSRC}/${dir} && ${SETENV} ${AUTOCONF_ENV} ${AUTOCONF} \
		53	${AUTOCONF_ARGS})
56	.endfor	54	.endfor
57		55
58	post-install:	56	post-install:

Lines 11-22 Link Here

(-)audio/gnump3d/files/patch-config::ltmain.sh (-9 lines)
11	avoid_version=yes	11	avoid_version=yes
12	continue	12	continue
13	;;	13	;;
14	@@ -1061,7 +1062,7 @@
15	esac
16	elif test "X$arg" = "X-lc_r"; then
17	case $host in
18	- --openbsd* \| --freebsd*)
19	+ --openbsd*)
20	# Do not include libc_r directly, use -pthread flag.
21	continue
22	;;

Line 0 Link Here

(-)audio/gnump3d/files/patch-plugins_bug.cc (+14 lines)
	1	--- plugins/bug.cc.orig Fri Nov 29 04:33:21 2002
	2	+++ plugins/bug.cc Mon Dec 2 19:27:02 2002
	3	@@ -40,6 +40,11 @@
	4	#include <sys/utsname.h>
	5
	6
	7	+#ifdef HAVE_PTHREAD
	8	+# include <pthread.h>
	9	+#endif
	10	+
	11	+
	12	#include "debug.h"
	13	#include "iplugin.h"
	14	#include "request.h"

Line 0 Link Here

(-)audio/gnump3d/files/patch-plugins_last20.cc (+14 lines)
	1	--- plugins/last20.cc.orig Fri Nov 29 04:33:21 2002
	2	+++ plugins/last20.cc Mon Dec 2 19:29:11 2002
	3	@@ -40,6 +40,11 @@
	4	#include <fstream.h>
	5
	6
	7	+#ifdef HAVE_PTHREAD
	8	+# include <pthread.h>
	9	+#endif
	10	+
	11	+
	12	#include "debug.h"
	13	#include "files.h"
	14	#include "iplugin.h"

Line 0 Link Here

(-)audio/gnump3d/files/patch-plugins_now.cc (+14 lines)
	1	--- plugins/now.cc.orig Fri Nov 29 04:33:21 2002
	2	+++ plugins/now.cc Mon Dec 2 19:30:10 2002
	3	@@ -40,6 +40,11 @@
	4	#include <fstream.h>
	5
	6
	7	+#ifdef HAVE_PTHREAD
	8	+# include <pthread.h>
	9	+#endif
	10	+
	11	+
	12	#include "debug.h"
	13	#include "iplugin.h"
	14	#include "files.h"

Line 0 Link Here

(-)audio/gnump3d/files/patch-plugins_playlist.cc (+15 lines)
	1	--- plugins/playlist.cc.orig Fri Nov 29 04:33:21 2002
	2	+++ plugins/playlist.cc Mon Dec 2 19:35:39 2002
	3	@@ -39,6 +39,12 @@
	4	#include <stdio.h>
	5	#include <stdlib.h>
	6
	7	+
	8	+#ifdef HAVE_PTHREAD
	9	+# include <pthread.h>
	10	+#endif
	11	+
	12	+
	13	#include "debug.h"
	14	#include "iplugin.h"
	15	#include "files.h"

Line 0 Link Here

(-)audio/gnump3d/files/patch-plugins_search.cc (+15 lines)
	1	--- plugins/search.cc.orig Fri Nov 29 04:33:21 2002
	2	+++ plugins/search.cc Mon Dec 2 19:31:03 2002
	3	@@ -38,6 +38,12 @@
	4	#include <stdio.h>
	5	#include <stdlib.h>
	6
	7	+
	8	+#ifdef HAVE_PTHREAD
	9	+# include <pthread.h>
	10	+#endif
	11	+
	12	+
	13	#include "files.h"
	14	#include "debug.h"
	15	#include "dirs.h"

Line 0 Link Here

(-)audio/gnump3d/files/patch-plugins_stats.cc (+14 lines)
	1	--- plugins/stats.cc.orig Fri Nov 29 04:33:21 2002
	2	+++ plugins/stats.cc Mon Dec 2 19:32:09 2002
	3	@@ -39,6 +39,11 @@
	4	#include <stdlib.h>
	5
	6
	7	+#ifdef HAVE_PTHREAD
	8	+# include <pthread.h>
	9	+#endif
	10	+
	11	+
	12	#include "debug.h"
	13	#include "request.h"
	14	#include "settings.h"

Line 0 Link Here

(-)audio/gnump3d/files/patch-plugins_theme.cc (+15 lines)
	1	--- plugins/theme.cc.orig Fri Nov 29 04:33:21 2002
	2	+++ plugins/theme.cc Mon Dec 2 19:34:54 2002
	3	@@ -39,6 +39,12 @@
	4	#include <stdio.h>
	5	#include <stdlib.h>
	6
	7	+
	8	+#ifdef HAVE_PTHREAD
	9	+# include <pthread.h>
	10	+#endif
	11	+
	12	+
	13	#include "debug.h"
	14	#include "dirs.h"
	15	#include "files.h"

Line 0 Link Here

(-)audio/gnump3d/files/patch-plugins_version.cc (+15 lines)
	1	--- plugins/version.cc.orig Fri Nov 29 04:33:21 2002
	2	+++ plugins/version.cc Mon Dec 2 19:36:44 2002
	3	@@ -38,6 +38,12 @@
	4	#include <stdio.h>
	5	#include <stdlib.h>
	6
	7	+
	8	+#ifdef HAVE_PTHREAD
	9	+# include <pthread.h>
	10	+#endif
	11	+
	12	+
	13	#include "debug.h"
	14	#include "iplugin.h"
	15	#include "plugin.h"

Lines 1-13 Link Here

(-)audio/gnump3d/files/patch-scripts_gnump3d-top.in (-4 / +4 lines)
1		1
2	$FreeBSD: ports/audio/gnump3d/files/patch-scripts_gnump3d-top.in,v 1.1 2002/08/14 21:42:10 naddy Exp $	2	$FreeBSD: ports/audio/gnump3d/files/patch-scripts_gnump3d-top.in,v 1.1 2002/08/14 21:42:10 naddy Exp $
3		3
4	--- scripts/gnump3d-top.in.orig Wed Aug 14 18:45:33 2002	4	--- scripts/gnump3d-top.in.orig Fri Nov 29 04:33:21 2002
5	+++ scripts/gnump3d-top.in Wed Aug 14 18:46:04 2002	5	+++ scripts/gnump3d-top.in Mon Dec 2 19:13:54 2002
6	@@ -16,7 +16,7 @@	6	@@ -30,7 +30,7 @@
7		7
8	# The default logfile which we read if there is no	8	# The default logfile which we read if there is no
9	# --config options supplied on the command line.	9	# --config options supplied on the command line.
10	-my $DEFAULT_CONFIG = "/etc/mp3d/mp3d.conf";	10	-my $DEFAULT_CONFIG = "/etc/gnump3d/gnump3d.conf";
11	+my $DEFAULT_CONFIG = "@prefix@/etc/gnump3d/gnump3d.conf";	11	+my $DEFAULT_CONFIG = "@prefix@/etc/gnump3d/gnump3d.conf";
12		12
13	#	13	#

Line 0 Link Here

(-)audio/gnump3d/files/patch-src_request.cc (+13 lines)
	1	--- src/request.cc.orig Fri Nov 29 04:33:21 2002
	2	+++ src/request.cc Mon Dec 2 19:25:06 2002
	3	@@ -54,6 +54,10 @@
	4	# include <unistd.h>
	5	#endif /* HAVE_UNISTD_H */
	6
	7	+#ifdef HAVE_PTHREAD
	8	+# include <pthread.h>
	9	+#endif
	10	+
	11
	12	#include "base64.h"
	13	#include "debug.h"