diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
| commit | 3e4ed01146cfe2bdca465bd0e4d199341f62a0b6 (patch) | |
| tree | d573ea09b2bf6be67cb497df199932da9e2707c4 /multimedia/xawtv | |
| parent | 40049f4af2200d0dcf33596508688623fc75f764 (diff) | |
| download | ports-3e4ed01146cfe2bdca465bd0e4d199341f62a0b6.tar.gz ports-3e4ed01146cfe2bdca465bd0e4d199341f62a0b6.zip | |
- Remove unneeded dependency from gtk12/gtk20 [1]
- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG
- Remove X11BASE support in favor of LOCALBASE or PREFIX
- Use USE_LDCONFIG instead of INSTALLS_SHLIB
- Remove unneeded USE_GCC 3.4+
Thanks to all Helpers:
Dmitry Marakasov, Chess Griffin, beech@, dinoex, rafan, gahr,
ehaupt, nox, itetcu, flz, pav
PR: 116263
Tested on: pointyhat
Approved by: portmgr (pav)
Notes
Notes:
svn path=/head/; revision=211584
Diffstat (limited to 'multimedia/xawtv')
| -rw-r--r-- | multimedia/xawtv/Makefile | 15 | ||||
| -rw-r--r-- | multimedia/xawtv/pkg-plist | 1 |
2 files changed, 7 insertions, 9 deletions
diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile index e682367d373e..43cff382e2f2 100644 --- a/multimedia/xawtv/Makefile +++ b/multimedia/xawtv/Makefile @@ -7,7 +7,7 @@ PORTNAME= xawtv PORTVERSION= 3.95 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= multimedia MASTER_SITES= http://dl.bytesex.org/releases/xawtv/ @@ -15,11 +15,10 @@ MAINTAINER= oliver@FreeBSD.org COMMENT= A TV viewing application and a few TV utilities BUILD_DEPENDS= iconv:${PORTSDIR}/converters/libiconv \ - ${X11BASE}/lib/X11/fonts/misc/led-iso8859-1.pcf.gz:${PORTSDIR}/x11-fonts/tv-fonts + ${LOCALBASE}/lib/X11/fonts/misc/led-iso8859-1.pcf.gz:${PORTSDIR}/x11-fonts/tv-fonts RUN_DEPENDS= iconv:${PORTSDIR}/converters/libiconv \ - ${X11BASE}/lib/X11/fonts/misc/led-iso8859-1.pcf.gz:${PORTSDIR}/x11-fonts/tv-fonts -LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d \ - png.5:${PORTSDIR}/graphics/png \ + ${LOCALBASE}/lib/X11/fonts/misc/led-iso8859-1.pcf.gz:${PORTSDIR}/x11-fonts/tv-fonts +LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg OPTIONS= AA "Enable AA support" on \ @@ -32,7 +31,7 @@ USE_MOTIF= yes GNU_CONFIGURE= yes USE_GMAKE= yes USE_PERL5= yes -USE_XORG= x11 +USE_XORG= x11 xaw CONFIGURE_ENV= LIBS="-L${PREFIX}/lib -L${LOCALBASE}/lib" \ CFLAGS="-I${WRKSRC}/common" MAKE_ENV= verbose=yes @@ -95,10 +94,10 @@ CONFIGURE_ARGS+=--enable-quicktime=no PLIST_SUB+= QT="@comment " .endif -PLIST_SUB+= X11PREFIX=${X11BASE} +PLIST_SUB+= X11PREFIX=${LOCALBASE} post-patch: - @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g; \ + @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g; \ s|/usr/local|${LOCALBASE}|g; \ s|-lpthread|${PTHREAD_LIBS}|g; \ s|-lquicktime|-L${LOCALBASE}/lib &|g' \ diff --git a/multimedia/xawtv/pkg-plist b/multimedia/xawtv/pkg-plist index a0dda1b718cc..2601e261f48f 100644 --- a/multimedia/xawtv/pkg-plist +++ b/multimedia/xawtv/pkg-plist @@ -81,7 +81,6 @@ share/xawtv/secam-france.list share/xawtv/secam-russia.list share/xawtv/uhf.list @dirrm share/xawtv -@cwd %%X11BASE%% lib/X11/app-defaults/MoTV lib/X11/app-defaults/Xawtv lib/X11/app-defaults/mtt |