svn commit: r322722 - in head/multimedia: vdr vdr-plugin-markad vdr-plugin-xineliboutput
Juergen Lock
nox at FreeBSD.org
Wed Jul 10 17:44:46 UTC 2013
Author: nox
Date: Wed Jul 10 17:44:45 2013
New Revision: 322722
URL: http://svnweb.freebsd.org/changeset/ports/322722
Log:
- Fix multimedia/vdr-plugin-markad build by fixing .include order.
- Switch to USES= gmake.
- Remove 7.x cruft.
Submitted by: pointyhat via miwi
Modified:
head/multimedia/vdr-plugin-markad/Makefile
head/multimedia/vdr-plugin-xineliboutput/Makefile
head/multimedia/vdr/Makefile
head/multimedia/vdr/Makefile.plugins
Modified: head/multimedia/vdr-plugin-markad/Makefile
==============================================================================
--- head/multimedia/vdr-plugin-markad/Makefile Wed Jul 10 17:32:49 2013 (r322721)
+++ head/multimedia/vdr-plugin-markad/Makefile Wed Jul 10 17:44:45 2013 (r322722)
@@ -29,14 +29,8 @@ MAN1= markad.1
RESTRICTED= installs station logos
-.include <bsd.port.pre.mk>
-
.include "${.CURDIR}/../vdr/Makefile.plugins"
-.if ${OSVERSION} < 800000
-IGNORE= needs getline(3)
-.endif
-
# for libexecinfo: (so that __builtin_frame_address() finds the top
# of the stack)
.if ${ARCH} == "amd64"
@@ -53,4 +47,4 @@ post-install: post-install-pluginlocales
(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/multimedia/vdr-plugin-xineliboutput/Makefile
==============================================================================
--- head/multimedia/vdr-plugin-xineliboutput/Makefile Wed Jul 10 17:32:49 2013 (r322721)
+++ head/multimedia/vdr-plugin-xineliboutput/Makefile Wed Jul 10 17:44:45 2013 (r322722)
@@ -29,10 +29,10 @@ PORTEXAMPLES= xine
MAKE_JOBS_SAFE= yes
WRKSRC= ${WRKDIR}/vdr-${PLUGIN}
-.include "${.CURDIR}/../vdr/Makefile.plugins"
-
OPTIONS_DEFINE= LIBBLURAY LIBEXTRACTOR
+.include "${.CURDIR}/../vdr/Makefile.plugins"
+
.include <bsd.port.pre.mk>
.if ${PORT_OPTIONS:MLIBEXTRACTOR}
Modified: head/multimedia/vdr/Makefile
==============================================================================
--- head/multimedia/vdr/Makefile Wed Jul 10 17:32:49 2013 (r322721)
+++ head/multimedia/vdr/Makefile Wed Jul 10 17:44:45 2013 (r322722)
@@ -22,10 +22,9 @@ DVBPATCH_DESC= DVB audio patch for some
STB0899_SIGNAL_DESC= STB0899 signal strength patch
OPTIONS_DEFAULT= IPTVPATCH TTXPATCH
-USES= pkgconfig gettext iconv
+USES= pkgconfig gettext iconv gmake
DIST_SUBDIR= vdr
USE_BZIP2= yes
-USE_GMAKE= yes
PORTDOCS= COPYING INSTALL MANUAL README HISTORY
MAKE_JOBS_SAFE= yes
MAN1= vdr.1
Modified: head/multimedia/vdr/Makefile.plugins
==============================================================================
--- head/multimedia/vdr/Makefile.plugins Wed Jul 10 17:32:49 2013 (r322721)
+++ head/multimedia/vdr/Makefile.plugins Wed Jul 10 17:44:45 2013 (r322722)
@@ -10,8 +10,7 @@ RUN_DEPENDS+= vdr:${PORTSDIR}/multimedia
APIVERSION= 1.7.29
DIST_SUBDIR= vdr
PATCH_SUBDIR= vdr
-USE_GMAKE= yes
-USES+= gettext
+USES+= gettext gmake
VDRDIR= ${LOCALBASE}/include/vdr
VDRINCDIR= ${LOCALBASE}/include
USE_CSTD?= gnu89
More information about the svn-ports-head
mailing list