Attachment #22331 for bug #38779

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

Lines 7-14 Link Here

(-)audio/gnump3d/Makefile (-2 / +1 lines)
7	#	7	#
8		8
9	PORTNAME= gnump3d	9	PORTNAME= gnump3d
10	PORTVERSION= 0.9.9.7	10	PORTVERSION= 0.9.9.8
11	PORTREVISION= 1
12	CATEGORIES= audio	11	CATEGORIES= audio
13	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
14	MASTER_SITE_SUBDIR= ${PORTNAME}	13	MASTER_SITE_SUBDIR= ${PORTNAME}

Line 1 Link Here

(-)audio/gnump3d/distinfo (-1 / +1 lines)
1	MD5 (gnump3d-0.9.9.7.tar.gz) = 3aaf16eabf4f4517fd0c89cc1aeb3718	1	MD5 (gnump3d-0.9.9.8.tar.gz) = 8f9ca0da7c720f12309a737375c9f7bc




--- mkfiles/freebsd.orig	Thu May 30 03:58:51 2002
+++ mkfiles/freebsd	Fri May 31 21:18:56 2002
@@ -6,8 +6,8 @@
 # if you wish you may change PREFIX to be /usr/local,
 # for example

+LIBS   = ${PTHREAD_LIBS}
 
 
-DEFAULT_CFLAGS = -I.  -D_THREAD_SAFE -D_REENTRANT -DBINARY_DIR="\"$(BINARYDIR)\"" -DSYSCONFDIR="\"$(CONFIGDIR)\"" -DVERSION="\"0.9.9.8\""
-CFLAGS  = $(DEFAULT_CFLAGS) -Wall -DFREEBSD=1 -DOS_TYPE="\"FreeBSD\""
+DEFAULT_CFLAGS = -I.  ${PTHREAD_CFLAGS} -D_REENTRANT -DBINARY_DIR="\"$(BINARYDIR)\"" -DSYSCONFDIR="\"$(CONFIGDIR)\"" -DVERSION="\"0.9.9.8\""
+CFLAGS  += $(DEFAULT_CFLAGS) -Wall -DFREEBSD=1 -DOS_TYPE="\"FreeBSD\""
 
 
 #
@@ -113,19 +113,25 @@
 #  Install the software.
 #
 install: $(PROG)

-	install ../mp3d $(BINARYDIR)
-	install ../contrib/stats/mp3d-top $(BINARYDIR)
-	install ../mp3d.conf $(CONFIGDIR)
+	-mkdir -p $(BINARYDIR) $(CONFIGDIR) $(TEMPLATEDIR)
+	${BSD_INSTALL_PROGRAM} ../mp3d $(BINARYDIR)
+	${BSD_INSTALL_SCRIPT} ../contrib/stats/mp3d-top $(BINARYDIR)
+	${BSD_INSTALL_DATA} ../mp3d.conf $(CONFIGDIR)
 	# Install all the theme directories.
-	for i in ../templates/*/; do cp -R ../templates/$$i $(TEMPLATEDIR); done
-	cp -R ../templates/default/ $(TEMPLATEDIR)
+	mkdir -p $(TEMPLATEDIR)/default
+	${BSD_INSTALL_DATA} ../templates/default/* $(TEMPLATEDIR)/default
 	# Simple template
-	install -d $(TEMPLATEDIR)/simple 
-	cp -R ../templates/simple/ $(TEMPLATEDIR)
-	install ../templates/README $(TEMPLATEDIR)
-	chmod -R 555 $(TEMPLATEDIR)
+	-mkdir -p $(TEMPLATEDIR)/default 
+	${BSD_INSTALL_DATA} ../templates/default/* $(TEMPLATEDIR)/default
+	-mkdir -p $(TEMPLATEDIR)/nausicaa
+	${BSD_INSTALL_DATA} ../templates/nausicaa/* $(TEMPLATEDIR)/nausicaa
+	-mkdir -p $(TEMPLATEDIR)/simple 
+	${BSD_INSTALL_DATA} ../templates/simple/* $(TEMPLATEDIR)/simple
+	-mkdir -p $(TEMPLATEDIR)/split
+	${BSD_INSTALL_DATA} ../templates/split/* $(TEMPLATEDIR)/split
+	${BSD_INSTALL_DATA} ../templates/README $(TEMPLATEDIR)
 	# Man pages.
-	install -d $(MANDIR)
-	install ../doc/mp3d.1 $(MANDIR)
-	install ../doc/mp3d.conf.1 $(MANDIR)
-	install ../doc/mp3d-top.1 $(MANDIR)
+	-mkdir -p $(MANDIR)
+	${BSD_INSTALL_MAN} ../doc/mp3d.1 $(MANDIR)
+	${BSD_INSTALL_MAN} ../doc/mp3d.conf.1 $(MANDIR)
+	${BSD_INSTALL_MAN} ../doc/mp3d-top.1 $(MANDIR)
 
 
 #

Lines 1-10 Link Here

(-)audio/gnump3d/files/patch-server.c (-4 / +4 lines)
1	--- src/server.c.orig Mon May 27 20:51:04 2002	1	--- src/server.c.orig Thu May 30 03:58:51 2002
2	+++ src/server.c Mon May 27 20:51:22 2002	2	+++ src/server.c Fri May 31 19:35:18 2002
3	@@ -32,6 +32,7 @@	3	@@ -32,6 +32,7 @@
4	*/	4	*/
5		5
6		6
7	+#include <sys/types.h>	7	+#include <sys/types.h>
8	#include <arpa/inet.h>
9	#include <ctype.h>	8	#include <ctype.h>
10	#include <netinet/in.h>	9	#include <netdb.h>
		10	#include <pwd.h>

Lines 4-17 Link Here

(-)audio/gnump3d/pkg-plist (-4 / +18 lines)
4	etc/mp3d/README	4	etc/mp3d/README
5	etc/mp3d/default/error.html	5	etc/mp3d/default/error.html
6	etc/mp3d/default/index.html	6	etc/mp3d/default/index.html
		7	etc/mp3d/default/results.html
7	etc/mp3d/default/search.html	8	etc/mp3d/default/search.html
8	etc/mp3d/default/stats.html	9	etc/mp3d/default/stats.html
9	etc/mp3d/default/results.html	10	etc/mp3d/nausicaa/error.html
10	etc/mp3d/simple/index.html	11	etc/mp3d/nausicaa/index.html
		12	etc/mp3d/nausicaa/results.html
		13	etc/mp3d/nausicaa/search.html
		14	etc/mp3d/nausicaa/stats.html
		15	etc/mp3d/simple/config.ini
11	etc/mp3d/simple/error.html	16	etc/mp3d/simple/error.html
		17	etc/mp3d/simple/index.html
		18	etc/mp3d/simple/results.html
12	etc/mp3d/simple/search.html	19	etc/mp3d/simple/search.html
13	etc/mp3d/simple/stats.html	20	etc/mp3d/simple/stats.html
14	etc/mp3d/simple/results.html	21	etc/mp3d/split/config.ini
15	@dirrm etc/mp3d/default	22	etc/mp3d/split/error.html
		23	etc/mp3d/split/index.html
		24	etc/mp3d/split/results.html
		25	etc/mp3d/split/search.html
		26	etc/mp3d/split/stats.html
		27	@dirrm etc/mp3d/split
16	@dirrm etc/mp3d/simple	28	@dirrm etc/mp3d/simple
		29	@dirrm etc/mp3d/nausicaa
		30	@dirrm etc/mp3d/default
17	@dirrm etc/mp3d	31	@dirrm etc/mp3d

Return to bug 38779

Lines 1-5 Link Here

(-)audio/gnump3d/files/patch-freebsd (-19 / +20 lines)
1	--- mkfiles/freebsd.orig Thu May 16 18:08:35 2002	1	--- mkfiles/freebsd.orig Thu May 30 03:58:51 2002
2	+++ mkfiles/freebsd Tue May 28 02:00:05 2002	2	+++ mkfiles/freebsd Fri May 31 21:18:56 2002
3	@@ -6,8 +6,8 @@	3	@@ -6,8 +6,8 @@
4	# if you wish you may change PREFIX to be /usr/local,	4	# if you wish you may change PREFIX to be /usr/local,
5	# for example	5	# for example
Lines 30-43 Link Here
30	+LIBS = ${PTHREAD_LIBS}	30	+LIBS = ${PTHREAD_LIBS}
31		31
32		32
33	-DEFAULT_CFLAGS = -I. -D_THREAD_SAFE -D_REENTRANT -DBINARY_DIR="\"$(BINARYDIR)\"" -DSYSCONFDIR="\"$(CONFIGDIR)\"" -DVERSION="\"0.9.9.7\""	33	-DEFAULT_CFLAGS = -I. -D_THREAD_SAFE -D_REENTRANT -DBINARY_DIR="\"$(BINARYDIR)\"" -DSYSCONFDIR="\"$(CONFIGDIR)\"" -DVERSION="\"0.9.9.8\""
34	-CFLAGS = $(DEFAULT_CFLAGS) -Wall -DFREEBSD=1 -DOS_TYPE="\"FreeBSD\""	34	-CFLAGS = $(DEFAULT_CFLAGS) -Wall -DFREEBSD=1 -DOS_TYPE="\"FreeBSD\""
35	+DEFAULT_CFLAGS = -I. ${PTHREAD_CFLAGS} -D_REENTRANT -DBINARY_DIR="\"$(BINARYDIR)\"" -DSYSCONFDIR="\"$(CONFIGDIR)\"" -DVERSION="\"0.9.9.7\""	35	+DEFAULT_CFLAGS = -I. ${PTHREAD_CFLAGS} -D_REENTRANT -DBINARY_DIR="\"$(BINARYDIR)\"" -DSYSCONFDIR="\"$(CONFIGDIR)\"" -DVERSION="\"0.9.9.8\""
36	+CFLAGS += $(DEFAULT_CFLAGS) -Wall -DFREEBSD=1 -DOS_TYPE="\"FreeBSD\""	36	+CFLAGS += $(DEFAULT_CFLAGS) -Wall -DFREEBSD=1 -DOS_TYPE="\"FreeBSD\""
37		37
38		38
39	#	39	#
40	@@ -110,22 +110,22 @@	40	@@ -113,19 +113,25 @@
41	# Install the software.	41	# Install the software.
42	#	42	#
43	install: $(PROG)	43	install: $(PROG)
Lines 45-75 Link Here
45	- install ../mp3d $(BINARYDIR)	45	- install ../mp3d $(BINARYDIR)
46	- install ../contrib/stats/mp3d-top $(BINARYDIR)	46	- install ../contrib/stats/mp3d-top $(BINARYDIR)
47	- install ../mp3d.conf $(CONFIGDIR)	47	- install ../mp3d.conf $(CONFIGDIR)
48	+ mkdir -p $(BINARYDIR) $(CONFIGDIR) $(TEMPLATEDIR)	48	+ -mkdir -p $(BINARYDIR) $(CONFIGDIR) $(TEMPLATEDIR)
49	+ ${BSD_INSTALL_PROGRAM} ../mp3d $(BINARYDIR)	49	+ ${BSD_INSTALL_PROGRAM} ../mp3d $(BINARYDIR)
50	+ ${BSD_INSTALL_SCRIPT} ../contrib/stats/mp3d-top $(BINARYDIR)	50	+ ${BSD_INSTALL_SCRIPT} ../contrib/stats/mp3d-top $(BINARYDIR)
51	+ ${BSD_INSTALL_DATA} ../mp3d.conf $(CONFIGDIR)	51	+ ${BSD_INSTALL_DATA} ../mp3d.conf $(CONFIGDIR)
52	# Default template.	52	# Install all the theme directories.
53	- install -d $(TEMPLATEDIR)/default	53	- for i in ../templates/*/; do cp -R ../templates/$$i $(TEMPLATEDIR); done
54	- cp -R ../templates/default/ $(TEMPLATEDIR)
55	+ mkdir -p $(TEMPLATEDIR)/default
56	+ ${BSD_INSTALL_DATA} ../templates/default/* $(TEMPLATEDIR)/default
57	# Simple template
58	- install -d $(TEMPLATEDIR)/simple
59	- cp -R ../templates/simple/ $(TEMPLATEDIR)
60	- install ../templates/README $(TEMPLATEDIR)	54	- install ../templates/README $(TEMPLATEDIR)
61	+ mkdir -p $(TEMPLATEDIR)/simple	55	- chmod -R 555 $(TEMPLATEDIR)
		56	+ -mkdir -p $(TEMPLATEDIR)/default
		57	+ ${BSD_INSTALL_DATA} ../templates/default/* $(TEMPLATEDIR)/default
		58	+ -mkdir -p $(TEMPLATEDIR)/nausicaa
		59	+ ${BSD_INSTALL_DATA} ../templates/nausicaa/* $(TEMPLATEDIR)/nausicaa
		60	+ -mkdir -p $(TEMPLATEDIR)/simple
62	+ ${BSD_INSTALL_DATA} ../templates/simple/* $(TEMPLATEDIR)/simple	61	+ ${BSD_INSTALL_DATA} ../templates/simple/* $(TEMPLATEDIR)/simple
		62	+ -mkdir -p $(TEMPLATEDIR)/split
		63	+ ${BSD_INSTALL_DATA} ../templates/split/* $(TEMPLATEDIR)/split
63	+ ${BSD_INSTALL_DATA} ../templates/README $(TEMPLATEDIR)	64	+ ${BSD_INSTALL_DATA} ../templates/README $(TEMPLATEDIR)
64	# Man pages.	65	# Man pages.
65	- install -d $(MANDIR)	66	- install -d $(MANDIR)
66	- install ../doc/mp3d.1 $(MANDIR)	67	- install ../doc/mp3d.1 $(MANDIR)
67	- install ../doc/mp3d.conf.1 $(MANDIR)	68	- install ../doc/mp3d.conf.1 $(MANDIR)
68	- install ../doc/mp3d-top.1 $(MANDIR)	69	- install ../doc/mp3d-top.1 $(MANDIR)
69	+ mkdir -p $(MANDIR)	70	+ -mkdir -p $(MANDIR)
70	+ ${BSD_INSTALL_DATA} ../doc/mp3d.1 $(MANDIR)	71	+ ${BSD_INSTALL_MAN} ../doc/mp3d.1 $(MANDIR)
71	+ ${BSD_INSTALL_DATA} ../doc/mp3d.conf.1 $(MANDIR)	72	+ ${BSD_INSTALL_MAN} ../doc/mp3d.conf.1 $(MANDIR)
72	+ ${BSD_INSTALL_DATA} ../doc/mp3d-top.1 $(MANDIR)	73	+ ${BSD_INSTALL_MAN} ../doc/mp3d-top.1 $(MANDIR)
73		74
74		75
75	#	76	#