Date: Mon, 16 Jun 2014 12:50:51 +0000 (UTC) From: Pawel Pekala <pawel@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r357984 - in branches/2014Q2/multimedia/nxtvepg: . files Message-ID: <201406161250.s5GCopCb088259@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pawel Date: Mon Jun 16 12:50:51 2014 New Revision: 357984 URL: http://svnweb.freebsd.org/changeset/ports/357984 QAT: https://qat.redports.org/buildarchive/r357984/ Log: MFH: r357969 - Fix build with clang (include <wait.h> -> <sys/wait.h>) - Add staging support - Convert to new options framework, USES=tk Approved by: portmgr (swills) Modified: branches/2014Q2/multimedia/nxtvepg/Makefile branches/2014Q2/multimedia/nxtvepg/files/patch-Makefile.bsd branches/2014Q2/multimedia/nxtvepg/pkg-plist Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/multimedia/nxtvepg/Makefile ============================================================================== --- branches/2014Q2/multimedia/nxtvepg/Makefile Mon Jun 16 12:49:00 2014 (r357983) +++ branches/2014Q2/multimedia/nxtvepg/Makefile Mon Jun 16 12:50:51 2014 (r357984) @@ -9,33 +9,23 @@ MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Viewer for Nextview Electronic TV Programme Guide (needs bktr driver) -LIB_DEPENDS= tk84.1:${PORTSDIR}/x11-toolkits/tk84 - NOT_FOR_ARCHS= sparc64 USE_GMAKE= yes USE_XORG= x11 xmu +MAKE_ARGS= ROOT=${STAGEDIR} MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS} WRKSRC=${WRKSRC} X11BASE=${LOCALBASE} -MAN1= nxtvepg.1 nxtvepgd.1 -MYPORTDOCS= README TODO CHANGES manual.html +OPTIONS_DEFINE= DOCS -NO_STAGE= yes post-patch: - ${REINPLACE_CMD} -e "s,machine/ioctl_bt848.h,dev/bktr/ioctl_bt848.h,; \ + @${REINPLACE_CMD} -e "s,machine/ioctl_bt848.h,dev/bktr/ioctl_bt848.h,; \ s,machine/ioctl_meteor.h,dev/bktr/ioctl_meteor.h," \ ${WRKSRC}/epgvbi/btdrv4linux.c ${WRKSRC}/tvsim/tvsim_main.c + @${REINPLACE_CMD} 's|wait.h|sys/&|' ${WRKSRC}/epgdb/ttxgrab.c 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} -.for file in ${MYPORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} -.endfor -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} README TODO CHANGES manual.html \ + ${STAGEDIR}${DOCSDIR}) .include <bsd.port.mk> Modified: branches/2014Q2/multimedia/nxtvepg/files/patch-Makefile.bsd ============================================================================== --- branches/2014Q2/multimedia/nxtvepg/files/patch-Makefile.bsd Mon Jun 16 12:49:00 2014 (r357983) +++ branches/2014Q2/multimedia/nxtvepg/files/patch-Makefile.bsd Mon Jun 16 12:50:51 2014 (r357984) @@ -1,37 +1,31 @@ ---- 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 --ROOT = +--- Makefile.bsd.orig 2005-01-01 19:35:26.000000000 +0100 ++++ Makefile.bsd 2014-06-16 12:41:56.046094882 +0200 +@@ -73,11 +73,7 @@ exec_prefix = ${prefix} --bindir = $(ROOT)${exec_prefix}/bin --mandir = $(ROOT)${prefix}/man/man1 + 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 - resdir = $(LOCALBASE)/lib/X11 +-resdir = $(LOCALBASE)/lib/X11 -endif ++resdir = $(ROOT)${prefix}/lib/X11 # other settings OPTFLAGS = -O -pipe -g -@@ -117,7 +112,7 @@ - - ifndef USER_DBDIR - DEFS += -DEPG_DB_DIR=\"$(SYS_DBDIR)\" --INST_DB_DIR = $(ROOT)$(SYS_DBDIR) -+INST_DB_DIR = $(SYS_DBDIR) - INST_DB_PERM = 0777 - endif - -@@ -128,7 +123,7 @@ - CFLAGS += $(WARN) $(INCS) $(DEFS) +@@ -96,7 +92,7 @@ + DEFS += -DTK_LIBRARY_PATH=\"$(TK_LIBRARY_PATH)\" + DEFS += -DTCL_LIBRARY_PATH=\"$(TCL_LIBRARY_PATH)\" + +-DEFS += -DX11_APP_DEFAULTS=\"$(resdir)/app-defaults/Nxtvepg\" ++DEFS += -DX11_APP_DEFAULTS=\"$(LOCALBASE)/lib/X11/app-defaults/Nxtvepg\" + + # enable use of multi-threading + ifdef WANT_THREADS +@@ -129,6 +125,7 @@ LDFLAGS += -lm #LDFLAGS += -pg -- + +BUILD_DIR= ${WRKSRC} all :: printconfig Modified: branches/2014Q2/multimedia/nxtvepg/pkg-plist ============================================================================== --- branches/2014Q2/multimedia/nxtvepg/pkg-plist Mon Jun 16 12:49:00 2014 (r357983) +++ branches/2014Q2/multimedia/nxtvepg/pkg-plist Mon Jun 16 12:50:51 2014 (r357984) @@ -1,6 +1,8 @@ bin/nxtvepg bin/nxtvepgd lib/X11/app-defaults/Nxtvepg +man/man1/nxtvepg.1.gz +man/man1/nxtvepgd.1.gz %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/TODO %%PORTDOCS%%%%DOCSDIR%%/CHANGES
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406161250.s5GCopCb088259>