From 9d77dbda8e977cbcfe36ec2e77004cf4b4b5ca4e Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Fri, 30 Oct 2009 01:35:30 +0000 Subject: [PATCH] - Update to 2.8.0 PR: 139835 Submitted by: Sylvio Cesar --- multimedia/nxtvepg/Makefile | 6 ++-- multimedia/nxtvepg/distinfo | 6 ++-- multimedia/nxtvepg/files/patch-Makefile | 29 ++++++++----------- multimedia/nxtvepg/files/patch-Makefile.bsd | 31 +++++++++++---------- multimedia/nxtvepg/pkg-plist | 1 + 5 files changed, 36 insertions(+), 37 deletions(-) diff --git a/multimedia/nxtvepg/Makefile b/multimedia/nxtvepg/Makefile index 7fdc9608dd0b..d810d3f7ff8e 100644 --- a/multimedia/nxtvepg/Makefile +++ b/multimedia/nxtvepg/Makefile @@ -6,8 +6,7 @@ # PORTNAME= nxtvepg -PORTVERSION= 2.7.6 -PORTREVISION= 2 +PORTVERSION= 2.8.0 CATEGORIES= multimedia tcl tk MASTER_SITES= SF @@ -21,7 +20,7 @@ USE_GMAKE= yes USE_XORG= x11 xmu MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS} WRKSRC=${WRKSRC} -MAN1= nxtvepg.1 +MAN1= nxtvepg.1 nxtvepgd.1 MYPORTDOCS= README TODO CHANGES manual.html post-patch: @@ -33,6 +32,7 @@ post-install: ${INSTALL_PROGRAM} ${WRKSRC}/nxtvepg ${LOCALBASE}/bin ${INSTALL_DATA} ${WRKSRC}/Nxtvepg.ad ${LOCALBASE}/lib/X11/app-defaults/Nxtvepg ${INSTALL_MAN} ${WRKSRC}/nxtvepg.1 ${LOCALBASE}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/nxtvepgd.1 ${LOCALBASE}/man/man1 .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} diff --git a/multimedia/nxtvepg/distinfo b/multimedia/nxtvepg/distinfo index 58807d8962c5..d0d1d3faba93 100644 --- a/multimedia/nxtvepg/distinfo +++ b/multimedia/nxtvepg/distinfo @@ -1,3 +1,3 @@ -MD5 (nxtvepg-2.7.6.tar.gz) = c7ceb0546502ae17ea7ce46c49bddace -SHA256 (nxtvepg-2.7.6.tar.gz) = 2048df1ff9ca2d7d76639318f1a7bc3814b905e30fd3a109e6eae43c1bf6acf5 -SIZE (nxtvepg-2.7.6.tar.gz) = 1430471 +MD5 (nxtvepg-2.8.0.tar.gz) = fcd9acdaf8b82da1db2981d670d196a8 +SHA256 (nxtvepg-2.8.0.tar.gz) = d762581a7335dffe84d9680d02e17c7c00d04f1f5a9e51b8ac0f411f570f7c71 +SIZE (nxtvepg-2.8.0.tar.gz) = 1821231 diff --git a/multimedia/nxtvepg/files/patch-Makefile b/multimedia/nxtvepg/files/patch-Makefile index eebd9695872e..1b3b9492675f 100644 --- a/multimedia/nxtvepg/files/patch-Makefile +++ b/multimedia/nxtvepg/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig Sun Jul 18 15:00:26 2004 -+++ Makefile Fri Jul 30 16:34:23 2004 -@@ -43,12 +43,24 @@ +--- 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 @@ -22,28 +22,23 @@ exec_prefix = ${prefix} bindir = $(ROOT)${exec_prefix}/bin mandir = $(ROOT)${prefix}/man/man1 --resdir = $(ROOT)/usr/X11R6/lib/X11 +-resdir = $(ROOT)/etc/X11 +resdir = $(ROOT)$(LOCALBASE)/lib/X11 - # if you have perl set the path here, else just leave it alone + # if you have perl and/or flex set their path here, else just leave them alone PERL = /usr/bin/perl -@@ -104,10 +116,10 @@ - # 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) +@@ -110,6 +122,8 @@ # -> 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)\" +USER_DBDIR = .nxtvdb +DEFS += -DEPG_DB_ENV=\"HOME\" -DEPG_DB_DIR=\"$(USER_DBDIR)\" ifndef USER_DBDIR --SYS_DBDIR = /usr/tmp/nxtvdb -+SYS_DBDIR = /var/tmp/nxtvdb + SYS_DBDIR = /var/tmp/nxtvdb DEFS += -DEPG_DB_DIR=\"$(SYS_DBDIR)\" - INST_DB_DIR = $(ROOT)$(SYS_DBDIR) - INST_DB_PERM = 0777 -@@ -121,7 +133,7 @@ - CFLAGS += $(WARN) $(INCS) $(DEFS) - #LDLIBS += -pg +@@ -127,7 +141,7 @@ + LDFLAGS += -lm + #LDFLAGS += -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/') diff --git a/multimedia/nxtvepg/files/patch-Makefile.bsd b/multimedia/nxtvepg/files/patch-Makefile.bsd index a8377b150b64..6b92722d9b9f 100644 --- a/multimedia/nxtvepg/files/patch-Makefile.bsd +++ b/multimedia/nxtvepg/files/patch-Makefile.bsd @@ -1,6 +1,6 @@ ---- Makefile.bsd.orig Tue Mar 29 18:49:22 2005 -+++ Makefile.bsd Sat Dec 2 12:45:13 2006 -@@ -69,12 +69,11 @@ +--- Makefile.bsd.orig 2005-01-01 16:35:26.000000000 -0200 ++++ Makefile.bsd 2009-10-21 22:28:33.000000000 -0200 +@@ -69,15 +69,10 @@ ECHO ?= @echo # Paths @@ -8,15 +8,17 @@ exec_prefix = ${prefix} -bindir = $(ROOT)${exec_prefix}/bin -mandir = $(ROOT)${prefix}/man/man1 +-ifeq ($(OS), FreeBSD) +-resdir = $(ROOT)/usr/X11R6/lib/X11 +-else +bindir = ${exec_prefix}/bin +mandir = ${prefix}/man/man1 - ifeq ($(OS), FreeBSD) --resdir = $(ROOT)/usr/X11R6/lib/X11 -+resdir = ${LOCALBASE}/lib/X11 - else resdir = $(LOCALBASE)/lib/X11 - endif -@@ -117,7 +116,7 @@ +-endif + + # other settings + OPTFLAGS = -O -pipe -g +@@ -117,7 +112,7 @@ ifndef USER_DBDIR DEFS += -DEPG_DB_DIR=\"$(SYS_DBDIR)\" @@ -25,11 +27,12 @@ INST_DB_PERM = 0777 endif -@@ -127,6 +126,7 @@ - CFLAGS ?= $(OPTFLAGS) +@@ -128,7 +123,7 @@ CFLAGS += $(WARN) $(INCS) $(DEFS) - #LDLIBS += -pg -+BUILD_DIR= ${WRKSRC} - + LDFLAGS += -lm + #LDFLAGS += -pg +- ++BUILD_DIR= ${WRKSRC} all :: printconfig + diff --git a/multimedia/nxtvepg/pkg-plist b/multimedia/nxtvepg/pkg-plist index 432a05a1dd76..999e68e3ef4a 100644 --- a/multimedia/nxtvepg/pkg-plist +++ b/multimedia/nxtvepg/pkg-plist @@ -1,4 +1,5 @@ bin/nxtvepg +bin/nxtvepgd lib/X11/app-defaults/Nxtvepg %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/TODO