aboutsummaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorJuergen Lock <nox@FreeBSD.org>2013-07-10 17:44:45 +0000
committerJuergen Lock <nox@FreeBSD.org>2013-07-10 17:44:45 +0000
commit9b7a8fe71c604a05a1d86fb4d6a629700e7132bb (patch)
tree21e034dd2ad31f67e319d91f5a97e2059838393c /multimedia
parent5e9abf64b79ca5fb339b14ea4f0404c5a1c4550a (diff)
downloadports-9b7a8fe71c604a05a1d86fb4d6a629700e7132bb.tar.gz
ports-9b7a8fe71c604a05a1d86fb4d6a629700e7132bb.zip
- Fix multimedia/vdr-plugin-markad build by fixing .include order.
- Switch to USES= gmake. - Remove 7.x cruft. Submitted by: pointyhat via miwi
Notes
Notes: svn path=/head/; revision=322722
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/vdr-plugin-markad/Makefile8
-rw-r--r--multimedia/vdr-plugin-xineliboutput/Makefile4
-rw-r--r--multimedia/vdr/Makefile3
-rw-r--r--multimedia/vdr/Makefile.plugins3
4 files changed, 5 insertions, 13 deletions
diff --git a/multimedia/vdr-plugin-markad/Makefile b/multimedia/vdr-plugin-markad/Makefile
index 4ba087970310..1f30bee28014 100644
--- a/multimedia/vdr-plugin-markad/Makefile
+++ b/multimedia/vdr-plugin-markad/Makefile
@@ -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>
diff --git a/multimedia/vdr-plugin-xineliboutput/Makefile b/multimedia/vdr-plugin-xineliboutput/Makefile
index abaa10ac31c3..1ece62fe799a 100644
--- a/multimedia/vdr-plugin-xineliboutput/Makefile
+++ b/multimedia/vdr-plugin-xineliboutput/Makefile
@@ -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}
diff --git a/multimedia/vdr/Makefile b/multimedia/vdr/Makefile
index a44f76d12000..f26586ade356 100644
--- a/multimedia/vdr/Makefile
+++ b/multimedia/vdr/Makefile
@@ -22,10 +22,9 @@ DVBPATCH_DESC= DVB audio patch for some countries
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
diff --git a/multimedia/vdr/Makefile.plugins b/multimedia/vdr/Makefile.plugins
index a87b8d3cf9fa..da68d1719612 100644
--- a/multimedia/vdr/Makefile.plugins
+++ b/multimedia/vdr/Makefile.plugins
@@ -10,8 +10,7 @@ RUN_DEPENDS+= vdr:${PORTSDIR}/multimedia/vdr
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