Attachment #100540 for bug #139835

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

Lines 6-13 Link Here

(-)Makefile (-2 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= nxtvepg	8	PORTNAME= nxtvepg
9	PORTVERSION= 2.7.6	9	PORTVERSION= 2.8.0
10	PORTREVISION= 2
11	CATEGORIES= multimedia tcl tk	10	CATEGORIES= multimedia tcl tk
12	MASTER_SITES= SF	11	MASTER_SITES= SF
13		12

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (nxtvepg-2.7.6.tar.gz) = c7ceb0546502ae17ea7ce46c49bddace	1	MD5 (nxtvepg-2.8.0.tar.gz) = fcd9acdaf8b82da1db2981d670d196a8
2	SHA256 (nxtvepg-2.7.6.tar.gz) = 2048df1ff9ca2d7d76639318f1a7bc3814b905e30fd3a109e6eae43c1bf6acf5	2	SHA256 (nxtvepg-2.8.0.tar.gz) = d762581a7335dffe84d9680d02e17c7c00d04f1f5a9e51b8ac0f411f570f7c71
3	SIZE (nxtvepg-2.7.6.tar.gz) = 1430471	3	SIZE (nxtvepg-2.8.0.tar.gz) = 1821231




--- Makefile.orig	2007-12-31 21:20:33.000000000 -0200
+++ Makefile	2009-10-21 22:24:56.000000000 -0200
@@ -45,12 +45,24 @@
 include Makefile.bsd
 else
 

 exec_prefix = ${prefix}
 bindir  = $(ROOT)${exec_prefix}/bin
 mandir  = $(ROOT)${prefix}/man/man1
-resdir  = $(ROOT)/etc/X11
+resdir  = $(ROOT)$(LOCALBASE)/lib/X11
 
 # if you have perl and/or flex set their path here, else just leave them alone
 PERL    = /usr/bin/perl
@@ -110,6 +122,8 @@
 # The database directory can be either in the user's $HOME (or relative to any
 # other env variable) or at a global place like /var/spool (world-writable)
 # -> uncomment 2 lines below to put the databases in the user's home
 #USER_DBDIR  = .nxtvdb
 #DEFS       += -DEPG_DB_ENV=\"HOME\" -DEPG_DB_DIR=\"$(USER_DBDIR)\"
+USER_DBDIR  = .nxtvdb
+DEFS       += -DEPG_DB_ENV=\"HOME\" -DEPG_DB_DIR=\"$(USER_DBDIR)\"
 ifndef USER_DBDIR
 SYS_DBDIR    = /var/tmp/nxtvdb
+SYS_DBDIR    = /var/tmp/nxtvdb
 DEFS        += -DEPG_DB_DIR=\"$(SYS_DBDIR)\"
@@ -127,7 +141,7 @@
 LDFLAGS += -lm
 #LDFLAGS += -pg
 CFLAGS += $(WARN) $(INCS) $(DEFS)
 #LDLIBS += -pg
 
-BUILD_DIR  = build-$(shell uname -m | sed -e 's/i.86/i386/' -e 's/ppc/powerpc/')
+BUILD_DIR  ?= build-$(shell uname -m | sed -e 's/i.86/i386/' -e 's/ppc/powerpc/')

Lines 1-6 Link Here

(-)files/patch-Makefile.bsd (-14 / +17 lines)
1	--- Makefile.bsd.orig Tue Mar 29 18:49:22 2005	1	--- Makefile.bsd.orig 2005-01-01 16:35:26.000000000 -0200
2	+++ Makefile.bsd Sat Dec 2 12:45:13 2006	2	+++ Makefile.bsd 2009-10-21 22:28:33.000000000 -0200
3	@@ -69,12 +69,11 @@	3	@@ -69,15 +69,10 @@
4	ECHO ?= @echo	4	ECHO ?= @echo
5		5
6	# Paths	6	# Paths
Lines 8-22 Link Here
8	exec_prefix = ${prefix}	8	exec_prefix = ${prefix}
9	-bindir = $(ROOT)${exec_prefix}/bin	9	-bindir = $(ROOT)${exec_prefix}/bin
10	-mandir = $(ROOT)${prefix}/man/man1	10	-mandir = $(ROOT)${prefix}/man/man1
		11	-ifeq ($(OS), FreeBSD)
		12	-resdir = $(ROOT)/usr/X11R6/lib/X11
		13	-else
11	+bindir = ${exec_prefix}/bin	14	+bindir = ${exec_prefix}/bin
12	+mandir = ${prefix}/man/man1	15	+mandir = ${prefix}/man/man1
13	ifeq ($(OS), FreeBSD)
14	-resdir = $(ROOT)/usr/X11R6/lib/X11
15	+resdir = ${LOCALBASE}/lib/X11
16	else
17	resdir = $(LOCALBASE)/lib/X11	16	resdir = $(LOCALBASE)/lib/X11
18	endif	17	-endif
19	@@ -117,7 +116,7 @@	18
		19	# other settings
		20	OPTFLAGS = -O -pipe -g
		21	@@ -117,7 +112,7 @@
20		22
21	ifndef USER_DBDIR	23	ifndef USER_DBDIR
22	DEFS += -DEPG_DB_DIR=\"$(SYS_DBDIR)\"	24	DEFS += -DEPG_DB_DIR=\"$(SYS_DBDIR)\"
Lines 25-35 Link Here
25	INST_DB_PERM = 0777	27	INST_DB_PERM = 0777
26	endif	28	endif
27		29
28	@@ -127,6 +126,7 @@	30	@@ -128,7 +123,7 @@
29	CFLAGS ?= $(OPTFLAGS)
30	CFLAGS += $(WARN) $(INCS) $(DEFS)	31	CFLAGS += $(WARN) $(INCS) $(DEFS)
31	#LDLIBS += -pg	32	LDFLAGS += -lm
32	+BUILD_DIR= ${WRKSRC}	33	#LDFLAGS += -pg
33		34	-
		35	+BUILD_DIR= ${WRKSRC}
34		36
35	all :: printconfig	37	all :: printconfig
		38

Return to bug 139835

Lines 1-6 Link Here

(-)files/patch-Makefile (-17 / +12 lines)
1	--- Makefile.orig Sun Jul 18 15:00:26 2004	1	--- Makefile.orig 2007-12-31 21:20:33.000000000 -0200
2	+++ Makefile Fri Jul 30 16:34:23 2004	2	+++ Makefile 2009-10-21 22:24:56.000000000 -0200
3	@@ -43,12 +43,24 @@	3	@@ -45,12 +45,24 @@
4	include Makefile.bsd	4	include Makefile.bsd
5	else	5	else
6		6
Lines 22-49 Link Here
22	exec_prefix = ${prefix}	22	exec_prefix = ${prefix}
23	bindir = $(ROOT)${exec_prefix}/bin	23	bindir = $(ROOT)${exec_prefix}/bin
24	mandir = $(ROOT)${prefix}/man/man1	24	mandir = $(ROOT)${prefix}/man/man1
25	-resdir = $(ROOT)/usr/X11R6/lib/X11	25	-resdir = $(ROOT)/etc/X11
26	+resdir = $(ROOT)$(LOCALBASE)/lib/X11	26	+resdir = $(ROOT)$(LOCALBASE)/lib/X11
27		27
28	# if you have perl set the path here, else just leave it alone	28	# if you have perl and/or flex set their path here, else just leave them alone
29	PERL = /usr/bin/perl	29	PERL = /usr/bin/perl
30	@@ -104,10 +116,10 @@	30	@@ -110,6 +122,8 @@
31	# The database directory can be either in the user's $HOME (or relative to any
32	# other env variable) or at a global place like /var/spool (world-writable)
33	# -> uncomment 2 lines below to put the databases in the user's home	31	# -> uncomment 2 lines below to put the databases in the user's home
34	-#USER_DBDIR = .nxtvdb	32	#USER_DBDIR = .nxtvdb
35	-#DEFS += -DEPG_DB_ENV=\"HOME\" -DEPG_DB_DIR=\"$(USER_DBDIR)\"	33	#DEFS += -DEPG_DB_ENV=\"HOME\" -DEPG_DB_DIR=\"$(USER_DBDIR)\"
36	+USER_DBDIR = .nxtvdb	34	+USER_DBDIR = .nxtvdb
37	+DEFS += -DEPG_DB_ENV=\"HOME\" -DEPG_DB_DIR=\"$(USER_DBDIR)\"	35	+DEFS += -DEPG_DB_ENV=\"HOME\" -DEPG_DB_DIR=\"$(USER_DBDIR)\"
38	ifndef USER_DBDIR	36	ifndef USER_DBDIR
39	-SYS_DBDIR = /usr/tmp/nxtvdb	37	SYS_DBDIR = /var/tmp/nxtvdb
40	+SYS_DBDIR = /var/tmp/nxtvdb
41	DEFS += -DEPG_DB_DIR=\"$(SYS_DBDIR)\"	38	DEFS += -DEPG_DB_DIR=\"$(SYS_DBDIR)\"
42	INST_DB_DIR = $(ROOT)$(SYS_DBDIR)	39	@@ -127,7 +141,7 @@
43	INST_DB_PERM = 0777	40	LDFLAGS += -lm
44	@@ -121,7 +133,7 @@	41	#LDFLAGS += -pg
45	CFLAGS += $(WARN) $(INCS) $(DEFS)
46	#LDLIBS += -pg
47		42
48	-BUILD_DIR = build-$(shell uname -m \| sed -e 's/i.86/i386/' -e 's/ppc/powerpc/')	43	-BUILD_DIR = build-$(shell uname -m \| sed -e 's/i.86/i386/' -e 's/ppc/powerpc/')
49	+BUILD_DIR ?= build-$(shell uname -m \| sed -e 's/i.86/i386/' -e 's/ppc/powerpc/')	44	+BUILD_DIR ?= build-$(shell uname -m \| sed -e 's/i.86/i386/' -e 's/ppc/powerpc/')