diff options
| author | miwi <miwi@FreeBSD.org> | 2008-04-20 01:56:05 +0800 |
|---|---|---|
| committer | miwi <miwi@FreeBSD.org> | 2008-04-20 01:56:05 +0800 |
| commit | bce9b81f9d6099820f3839d7809d6b08c1d2ae7b (patch) | |
| tree | f5dd7c3a8dbebad79bdb5e844aeb69c59a9fd12c /multimedia | |
| parent | 2eea5f1d2e44418020f8f4db08d40bea6915b6e8 (diff) | |
| download | freebsd-ports-gnome-bce9b81f9d6099820f3839d7809d6b08c1d2ae7b.tar.gz freebsd-ports-gnome-bce9b81f9d6099820f3839d7809d6b08c1d2ae7b.tar.zst freebsd-ports-gnome-bce9b81f9d6099820f3839d7809d6b08c1d2ae7b.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)
Diffstat (limited to 'multimedia')
83 files changed, 183 insertions, 215 deletions
diff --git a/multimedia/avidemux2/Makefile b/multimedia/avidemux2/Makefile index 7ccd0f213945..53f22a0ec7d8 100644 --- a/multimedia/avidemux2/Makefile +++ b/multimedia/avidemux2/Makefile @@ -28,10 +28,10 @@ USE_AUTOTOOLS= automake:19:env autoconf:261:env libtool:15 aclocal:19:env USE_GETTEXT= yes USE_GNOME= gnomeprefix gnomehack gtk20 WANT_SDL= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include \ -I${LOCALBASE}/include/a52dec" \ - LIBFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" \ + LIBFLAGS="-L${LOCALBASE}/lib" \ + LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ PTHREAD_LIBS=${PTHREAD_LIBS} \ PTHREAD_CFLAGS=${PTHREAD_CFLAGS} CONFIGURE_ARGS= --disable-warnings \ diff --git a/multimedia/avifile/Makefile b/multimedia/avifile/Makefile index 215995a2bbf7..919b33388697 100644 --- a/multimedia/avifile/Makefile +++ b/multimedia/avifile/Makefile @@ -49,7 +49,7 @@ VERSION= 0.7 # qt -- USE_QT_VER has to happen befor bsd.port.pre.mk .if !defined(WITHOUT_QT) -. if exists(${X11BASE}/include/qt2/qapp.h) +. if exists(${LOCALBASE}/include/qt2/qapp.h) USE_QT_VER= 2 . else USE_QT_VER= 3 @@ -237,11 +237,11 @@ post-patch: ${WRKSRC}/plugins/libmad/Makefile.in .endif .if !defined(WITHOUT_QT) -. if exists(${X11BASE}/include/qt2/qapp.h) +. if exists(${LOCALBASE}/include/qt2/qapp.h) @${REINPLACE_CMD} -e 's|qt-mt|qt2-mt|' ${WRKSRC}/configure . endif - @${REINPLACE_CMD} -e 's|QT_CFLAGS = \@QT_CFLAGS\@|QT_CFLAGS = -I${X11BASE}/include \@QT_CFLAGS\@|; \ - s|QT_LIBS = \@QT_LIBS\@|QT_LIBS = -L${X11BASE}/lib \@QT_LIBS\@|' \ + @${REINPLACE_CMD} -e 's|QT_CFLAGS = \@QT_CFLAGS\@|QT_CFLAGS = -I${LOCALBASE}/include \@QT_CFLAGS\@|; \ + s|QT_LIBS = \@QT_LIBS\@|QT_LIBS = -L${LOCALBASE}/lib \@QT_LIBS\@|' \ ${WRKSRC}/libavqt/Makefile.in .endif .if !defined(WITHOUT_XVID) diff --git a/multimedia/beep-media-player/Makefile b/multimedia/beep-media-player/Makefile index 1507504e9c97..12190345d27a 100644 --- a/multimedia/beep-media-player/Makefile +++ b/multimedia/beep-media-player/Makefile @@ -10,8 +10,7 @@ PORTVERSION= 0.9.7.1 PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= beepmp +MASTER_SITES= SF/beepmp DISTNAME= bmp-${PORTVERSION} MAINTAINER= ports@FreeBSD.org @@ -19,7 +18,7 @@ COMMENT= GTK2 multimedia player USE_GNOME= gtk20 libglade2 desktopfileutils WANT_GNOME= yes -USE_X_PREFIX= yes +USE_XORG= x11 USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes USE_GETTEXT= yes diff --git a/multimedia/bmpx/Makefile b/multimedia/bmpx/Makefile index 87663411f5a4..40c77f712051 100644 --- a/multimedia/bmpx/Makefile +++ b/multimedia/bmpx/Makefile @@ -7,7 +7,7 @@ PORTNAME= bmpx PORTVERSION= 0.40.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia MASTER_SITES= http://files.backtrace.info/releases/0.40/ @@ -31,6 +31,7 @@ CONFLICTS= bmpx-devel-[0-9]* USE_AUTOTOOLS= automake:19 autoconf:261 USE_BISON= build +USE_XORG= ice sm USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gtk20 libglade2 desktopfileutils @@ -46,8 +47,6 @@ CONFIGURE_ARGS+= --with-pkgconfig-dir=${PREFIX}/libdata/pkgconfig \ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" -CONFIGURE_ARGS+= --x-includes=${X11BASE}/include \ - --x-libraries=${X11BASE}/lib MAN1= beep-media-player-2.1 diff --git a/multimedia/camserv/Makefile b/multimedia/camserv/Makefile index dca1dbeca01f..6e5aac9de3df 100644 --- a/multimedia/camserv/Makefile +++ b/multimedia/camserv/Makefile @@ -26,7 +26,7 @@ USE_AUTOTOOLS= autoconf:261 libtool:15 libltdl:15 USE_EFL= imlib2 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \ +CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include \ -I${LOCALBASE}/include/gtk12 \ -I${LOCALBASE}/include/gdk-pixbuf-1.0 \ -I${LOCALBASE}/include/glib12" \ diff --git a/multimedia/dtv/Makefile b/multimedia/dtv/Makefile index c389bcb55691..6427a276ab25 100644 --- a/multimedia/dtv/Makefile +++ b/multimedia/dtv/Makefile @@ -7,16 +7,16 @@ PORTNAME= dtv PORTVERSION= 0.50 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= http://apollo.backplane.com/FreeBSDPorts/ MAINTAINER= ports@FreeBSD.org COMMENT= A client/server based TV capture/display program -USE_XLIB= yes RUN_DEPENDS= wish8.4:${PORTSDIR}/x11-toolkits/tk84 +USE_XORG= xau x11 xext xxf86dga NOT_FOR_ARCHS= sparc64 post-patch: diff --git a/multimedia/dvd-slideshow/Makefile b/multimedia/dvd-slideshow/Makefile index 1b02c681245a..b6345eb7d068 100644 --- a/multimedia/dvd-slideshow/Makefile +++ b/multimedia/dvd-slideshow/Makefile @@ -22,7 +22,7 @@ RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \ dvdauthor:${PORTSDIR}/multimedia/dvdauthor \ jhead:${PORTSDIR}/graphics/jhead \ flvtool2:${PORTSDIR}/multimedia/ruby-flvtool2 \ - ${X11BASE}/lib/X11/fonts/urwfonts-ttf/README:${PORTSDIR}/x11-fonts/urwfonts-ttf + ${LOCALBASE}/lib/X11/fonts/urwfonts-ttf/README:${PORTSDIR}/x11-fonts/urwfonts-ttf WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-1 @@ -78,7 +78,7 @@ PLIST_SUB+= NOPORTDOCS="" post-patch: .for FILE in dvd-slideshow dvd-menu dir2slideshow gallery1-to-slideshow jigl2slideshow @${REINPLACE_CMD} -e 's|!/bin/bash|!${PREFIX}/bin/bash|g ; \ - s|/usr/share/fonts/|${X11BASE}/lib/X11/fonts/|g ; \ + s|/usr/share/fonts/|${LOCALBASE}/lib/X11/fonts/|g ; \ s|seq |seq2 |g' \ ${WRKSRC}/${FILE} .ifdef(WITH_THEMES) diff --git a/multimedia/freevo/Makefile b/multimedia/freevo/Makefile index 9abc659638a1..c8fc3f5aa4a8 100644 --- a/multimedia/freevo/Makefile +++ b/multimedia/freevo/Makefile @@ -53,15 +53,15 @@ OPTIONS= MPLAYER "Enable mplayer video playback support" On \ # AUTODETECTION ### -.if exists(${X11BASE}/bin/xmame) && !defined(WITHOUT_MAME) +.if exists(${LOCALBASE}/bin/xmame) && !defined(WITHOUT_MAME) WITH_MAME= YES .endif -.if exists(${X11BASE}/bin/snes9x) && !defined(WITHOUT_SNES9X) +.if exists(${LOCALBASE}/bin/snes9x) && !defined(WITHOUT_SNES9X) WITH_SNES9X= YES .endif -.if exists(${X11BASE}/bin/zsnes) && !defined(WITHOUT_ZSNES) +.if exists(${LOCALBASE}/bin/zsnes) && !defined(WITHOUT_ZSNES) WITH_ZSNES= YES .endif diff --git a/multimedia/fxtv/Makefile b/multimedia/fxtv/Makefile index e4c952445716..48e73093a462 100644 --- a/multimedia/fxtv/Makefile +++ b/multimedia/fxtv/Makefile @@ -7,7 +7,7 @@ PORTNAME= fxtv PORTVERSION= 1.03 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= rhh @@ -19,8 +19,7 @@ COMMENT= X-based TV Display and Capture Application (for use with bt848 driver) LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm xf86vidmodeproto xxf86dga USE_GMAKE= yes MAKE_FLAGS= -e MAN1= fxtv.1 diff --git a/multimedia/goggles/Makefile b/multimedia/goggles/Makefile index 3d91d1f7b1a0..474916636f01 100644 --- a/multimedia/goggles/Makefile +++ b/multimedia/goggles/Makefile @@ -7,7 +7,7 @@ PORTNAME= goggles PORTVERSION= 0.8.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia MASTER_SITES= http://www.fifthplanet.net/files/ @@ -20,7 +20,7 @@ RUN_DEPENDS= ogle:${PORTSDIR}/multimedia/ogle USE_BZIP2= yes USE_GMAKE= yes -USE_XLIB= yes +USE_XORG= x11 xv pre-everything:: .ifndef(WITH_DVD_DEVICE) @@ -79,8 +79,6 @@ do-build: --prefix=${PREFIX} \ --fox-prefix=${LOCALBASE} \ --ogle-prefix=${LOCALBASE} \ - --x-includes=${X11BASE}/include \ - --x-libraries=${X11BASE}/lib \ --with-xv=yes post-build: diff --git a/multimedia/gopchop/Makefile b/multimedia/gopchop/Makefile index 17ca6893d89b..7bde9aeacab2 100644 --- a/multimedia/gopchop/Makefile +++ b/multimedia/gopchop/Makefile @@ -10,7 +10,7 @@ PORTNAME= gopchop PORTVERSION= 1.0.0 PORTREVISION= 5 CATEGORIES= multimedia -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ +MASTER_SITES= SF \ http://outflux.net/unix/software/GOPchop/download/ MASTER_SITE_SUBDIR= ${PORTNAME} DISTNAME= GOPchop-${PORTVERSION} @@ -25,8 +25,8 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --disable-sdl -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include -DHAVE_DECL_GETOPT -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib +CPPFLAGS= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT +LDFLAGS= -L${LOCALBASE}/lib .if defined(WITHOUT_NLS) CONFIGURE_ARGS+= --disable-nls diff --git a/multimedia/gstreamer-ffmpeg/Makefile b/multimedia/gstreamer-ffmpeg/Makefile index 706f953e0a2b..229a270b9507 100644 --- a/multimedia/gstreamer-ffmpeg/Makefile +++ b/multimedia/gstreamer-ffmpeg/Makefile @@ -8,6 +8,7 @@ PORTNAME= gstreamer PORTVERSION= 0.10.3 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-ffmpeg/ PKGNAMESUFFIX= -ffmpeg @@ -17,7 +18,6 @@ MAINTAINER= multimedia@FreeBSD.org COMMENT= GStreamer plug-in for manipulating MPEG video streams CFLAGS:= ${CFLAGS} -O2 -USE_XLIB= yes USE_BZIP2= yes USE_GMAKE= yes USE_LDCONFIG= yes diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile index c4f828cce63a..3c5394a8e6c2 100644 --- a/multimedia/gstreamer-plugins/Makefile +++ b/multimedia/gstreamer-plugins/Makefile @@ -56,8 +56,8 @@ USE_AUTOTOOLS= libtool:15 GST_PLUGIN?= base CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ - CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ - LDFLAGS="${LDFLAGS} -L${X11BASE}/lib -L${LOCALBASE}/lib ${EXTRA_LIBS} ${PTHREAD_LIBS}" + CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ + LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${EXTRA_LIBS} ${PTHREAD_LIBS}" DEFAULT_AUDIOSINK?= osssink DEFAULT_AUDIOSRC?= osssrc diff --git a/multimedia/gsubedit/Makefile b/multimedia/gsubedit/Makefile index 8e507bde72ec..6b11d2d4399f 100644 --- a/multimedia/gsubedit/Makefile +++ b/multimedia/gsubedit/Makefile @@ -8,16 +8,14 @@ PORTNAME= GSubEdit PORTVERSION= 0.4.p1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= multimedia gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME:L} +MASTER_SITES= SF/${PORTNAME:L} DISTNAME= ${PORTNAME:L}-${PORTVERSION:S/.p/pre/} MAINTAINER= ports@FreeBSD.org COMMENT= GNOME Subtitle Editor is a tool for editing/converting video subtitles -USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack gnomelibs GNU_CONFIGURE= yes diff --git a/multimedia/gtksubtitler/Makefile b/multimedia/gtksubtitler/Makefile index 762673b6bbd3..c5839c37e8c8 100644 --- a/multimedia/gtksubtitler/Makefile +++ b/multimedia/gtksubtitler/Makefile @@ -7,7 +7,7 @@ PORTNAME= GTKsubtitler PORTVERSION= 0.2.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia gnome MASTER_SITES= http://matrix.kamp.pl/~pawelb/gtksubtitler/download/ DISTNAME= ${PORTNAME}-v${PORTVERSION} @@ -15,7 +15,6 @@ DISTNAME= ${PORTNAME}-v${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= A small GNOME program for editing and converting subtitles -USE_X_PREFIX= yes USE_GNOME= gnomeprefix gnomelibs GNU_CONFIGURE= yes diff --git a/multimedia/gxanim/Makefile b/multimedia/gxanim/Makefile index d0a3d2321a90..cd2335106c2d 100644 --- a/multimedia/gxanim/Makefile +++ b/multimedia/gxanim/Makefile @@ -7,7 +7,7 @@ PORTNAME= gxanim PORTVERSION= 0.50 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia MASTER_SITES= http://www.rswarren.com/code/ DISTNAME= GXAnim-${PORTVERSION} @@ -21,7 +21,6 @@ PLIST_FILES= bin/gxanim WRKSRC= ${WRKDIR}/gxanim-${PORTVERSION} USE_BZIP2= yes -USE_XLIB= yes USE_GNOME= gtk12 .include <bsd.port.mk> diff --git a/multimedia/gxine/Makefile b/multimedia/gxine/Makefile index 1203900275b8..bc34b87c9158 100644 --- a/multimedia/gxine/Makefile +++ b/multimedia/gxine/Makefile @@ -7,6 +7,7 @@ PORTNAME= gxine PORTVERSION= 0.5.901 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= SF MASTER_SITE_SUBDIR= xine @@ -20,11 +21,12 @@ USE_BZIP2= yes USE_AUTOTOOLS= libtool:15 USE_GNOME= gtk20 gnomehier USE_GMAKE= yes +USE_XORG= x11 xaw ice MAKE_ARGS+= LDFLAGS=-shared-libgcc USE_GCC= 4.2 CNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -I${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS+= --without-hal INSTALLS_ICONS= yes diff --git a/multimedia/helixplayer/Makefile b/multimedia/helixplayer/Makefile index 9e6c5afe477c..2bc226208119 100644 --- a/multimedia/helixplayer/Makefile +++ b/multimedia/helixplayer/Makefile @@ -86,7 +86,7 @@ pre-configure: .for cf in ${CF2FIX} ${REINPLACE_CMD} -e "s|%%CC%%|${CC}|;s|%%CFLAGS%%|${CFLAGS}|" \ -e "s|%%CXX%%|${CXX}|;s|%%CXXFLAGS%%|${CXXFLAGS}|" \ - -e "s|/usr/X11R6|${X11BASE}|;s|/usr/local|${LOCALBASE}|" \ + -e "s|/usr/X11R6|${LOCALBASE}|;s|/usr/local|${LOCALBASE}|" \ -e "s|%%PREFIX%%|${PREFIX}|" \ -e "s|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|" \ -e "s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|" \ @@ -98,7 +98,7 @@ pre-configure: ${WRKSRC}/player/app/gtk/hxplay .if defined(WITH_PLUGIN) ${REINPLACE_CMD} -e 's|%%GECKO%%|${GECKO}|g' \ - -e 's|"%%GECKO_PREFIX%%/include\(.*\)"|"${LOCALBASE}/include\1", "${X11BASE}/include\1"|' \ + -e 's|"%%GECKO_PREFIX%%/include\(.*\)"|"${LOCALBASE}/include\1"|' \ ${WRKSRC}/player/app/plugin/unix.pcf .endif diff --git a/multimedia/helixplayer/files/msg.withplugin.in b/multimedia/helixplayer/files/msg.withplugin.in index d749736860d1..c8d2a06f9694 100644 --- a/multimedia/helixplayer/files/msg.withplugin.in +++ b/multimedia/helixplayer/files/msg.withplugin.in @@ -7,13 +7,13 @@ to your Mozilla plugins directory, which is usually found at - %%X11BASE%%/lib/mozilla/plugins + %%LOCALBASE%%/lib/mozilla/plugins To use it with Firefox, create the symbolic link to - %%X11BASE%%/lib/firefox/plugins + %%LOCALBASE%%/lib/firefox/plugins E.g. -ln -sf %%PREFIX%%/HelixPlayer/mozilla/nphelix.so %%X11BASE%%/lib/firefox/plugins +ln -sf %%PREFIX%%/HelixPlayer/mozilla/nphelix.so %%LOCALBASE%%/lib/firefox/plugins ================================================================================ diff --git a/multimedia/jahshaka/Makefile b/multimedia/jahshaka/Makefile index 362588d494f3..5fb14574c49a 100644 --- a/multimedia/jahshaka/Makefile +++ b/multimedia/jahshaka/Makefile @@ -7,10 +7,9 @@ PORTNAME= jahshaka PORTVERSION= 1.9a9 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME}fx +MASTER_SITES= SF/${PORTNAME}fx DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= ports@FreeBSD.org @@ -18,12 +17,10 @@ COMMENT= Video and film composing, editing and special fx system BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake LIB_DEPENDS= aviplay.0:${PORTSDIR}/multimedia/avifile \ - glut.4:${PORTSDIR}/graphics/libglut \ freetype.9:${PORTSDIR}/print/freetype2 \ jpeg.9:${PORTSDIR}/graphics/jpeg -USE_GL= yes -USE_X_PREFIX= yes +USE_GL= glut USE_QT_VER= 3 MAKE_ENV= QMAKESPEC=${QMAKESPEC} QTDIR=${QT_PREFIX} WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/multimedia/k9copy-kde4/Makefile b/multimedia/k9copy-kde4/Makefile index 019da58da729..30fc5cded317 100644 --- a/multimedia/k9copy-kde4/Makefile +++ b/multimedia/k9copy-kde4/Makefile @@ -24,7 +24,7 @@ USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes post-patch: @${REINPLACE_CMD} -e 's,-O2,,g ; \ diff --git a/multimedia/k9copy/Makefile b/multimedia/k9copy/Makefile index 019da58da729..30fc5cded317 100644 --- a/multimedia/k9copy/Makefile +++ b/multimedia/k9copy/Makefile @@ -24,7 +24,7 @@ USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes post-patch: @${REINPLACE_CMD} -e 's,-O2,,g ; \ diff --git a/multimedia/kaffeine-mozilla/Makefile b/multimedia/kaffeine-mozilla/Makefile index 00bc2fcfdadd..e021586db15b 100644 --- a/multimedia/kaffeine-mozilla/Makefile +++ b/multimedia/kaffeine-mozilla/Makefile @@ -8,20 +8,19 @@ PORTNAME= kaffeine-mozilla PORTVERSION= 0.2 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= multimedia -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= kaffeine +MASTER_SITES= SF/kaffeine MAINTAINER= ports@FreeBSD.org COMMENT= Kaffeine Mozilla plugin RUN_DEPENDS= kaffeine:${PORTSDIR}/multimedia/kaffeine -USE_XLIB= yes +USE_XORG= x11 xaw USE_BZIP2= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" USE_AUTOTOOLS= libtool:15 post-patch: diff --git a/multimedia/kino/Makefile b/multimedia/kino/Makefile index 5865e2bbdde3..98bbbc718a07 100644 --- a/multimedia/kino/Makefile +++ b/multimedia/kino/Makefile @@ -7,7 +7,7 @@ PORTNAME= kino PORTVERSION= 1.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -24,6 +24,7 @@ RUN_DEPENDS= mencoder:${PORTSDIR}/multimedia/mencoder \ OPTIONS= QUICKTIME "With Quicktime support" off \ FFMPEG_KINO "With ffmpeg-kino" off +USE_XORG= x11 xv ice USE_AUTOTOOLS= autoconf:261 USE_GETTEXT= yes USE_GMAKE= yes @@ -31,9 +32,9 @@ USE_GNOME= gnomehack gnomeprefix libglade2 libxml2 USE_ICONV= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/lqt \ - -I${LOCALBASE}/include -I${X11BASE}/include" \ + -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib/libquicktime \ - -L${LOCALBASE}/lib -L${X11BASE}/lib" \ + -L${LOCALBASE}/lib" \ PTHREAD_LIBS="${PTHREAD_LIBS}" CONFIGURE_ARGS= --with-dv1394 MAN1= kino.1 kino2raw.1 diff --git a/multimedia/libdv/Makefile b/multimedia/libdv/Makefile index 638c27a1d74a..883fb772ae49 100644 --- a/multimedia/libdv/Makefile +++ b/multimedia/libdv/Makefile @@ -22,13 +22,13 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ USE_GNOME= gnometarget WANT_GNOME= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-gtk-prefix="${X11BASE}" \ - --x-includes="${X11BASE}/include" \ - --x-libraries="${X11BASE}/lib" +CONFIGURE_ARGS= --with-gtk-prefix="${LOCALBASE}" \ + --x-includes="${LOCALBASE}/include" \ + --x-libraries="${LOCALBASE}/lib" CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ - PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${X11BASE}/libdata/pkgconfig -INSTALLS_SHLIB= yes + PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${LOCALBASE}/libdata/pkgconfig +USE_LDCONFIG= yes MAN1= dubdv.1 dvconnect.1 encodedv.1 @@ -67,7 +67,7 @@ post-patch: @${REINPLACE_CMD} -E \ -e 's|(pkgconfigdir =).+(/pkgconfig)|\1 ${PREFIX}/libdata\2|' \ ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -E -e 's|(-lXv)|\1 -lXext -L${X11BASE}/lib|; \ + @${REINPLACE_CMD} -E -e 's|(-lXv)|\1 -lXext -L${LOCALBASE}/lib|; \ /objformat=/s|=.*|=elf|; \ s@(PKG_CONFIG --(cflags|libs) )"\$$REQUIRES"@\1 gtk@' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} diff --git a/multimedia/libdvdcss/Makefile b/multimedia/libdvdcss/Makefile index 12c07a94966c..4d7a0f9fc15d 100644 --- a/multimedia/libdvdcss/Makefile +++ b/multimedia/libdvdcss/Makefile @@ -22,7 +22,7 @@ USE_AUTOTOOLS= libtool:15 USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .ifndef(WITH_DOXYGEN) NOPORTDOCS= yes diff --git a/multimedia/libdvdnav/Makefile b/multimedia/libdvdnav/Makefile index 4ca7a962ebd8..61c3d4d340b7 100644 --- a/multimedia/libdvdnav/Makefile +++ b/multimedia/libdvdnav/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= dvdread.5:${PORTSDIR}/multimedia/libdvdread CONFIGURE_ENV= THREAD_CFLAGS="${PTHREAD_CFLAGS}" \ THREAD_LIBS="${PTHREAD_LIBS}" CONFIGURE_ARGS= --program-transform-name='' -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 autoconf:261 automake:16 post-patch: diff --git a/multimedia/libmpeg2/Makefile b/multimedia/libmpeg2/Makefile index 0df457a440ed..53d59694a622 100644 --- a/multimedia/libmpeg2/Makefile +++ b/multimedia/libmpeg2/Makefile @@ -7,7 +7,7 @@ PORTNAME= libmpeg2 PORTVERSION= 0.4.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia MASTER_SITES= http://libmpeg2.sourceforge.net/files/ DISTNAME= mpeg2dec-${PORTVERSION} @@ -15,7 +15,6 @@ DISTNAME= mpeg2dec-${PORTVERSION} MAINTAINER= multimedia@FreeBSD.org COMMENT= A free library for decoding mpeg-2 and mpeg-1 video streams -USE_XLIB= yes USE_GNOME= gnometarget USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile index 620ea163d738..0bda1247f6a3 100644 --- a/multimedia/libquicktime/Makefile +++ b/multimedia/libquicktime/Makefile @@ -9,8 +9,7 @@ PORTNAME= libquicktime PORTVERSION= 1.0.2 PORTREVISION= 1 CATEGORIES= multimedia -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SFE MAINTAINER= multimedia@FreeBSD.org COMMENT= A library for reading and writing quicktime files @@ -22,8 +21,8 @@ USE_GNOME= gnometarget gnomehack pkgconfig USE_XORG= xaw xv USE_GMAKE= yes USE_AUTOTOOLS= autoconf:261 -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} -lintl" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ + LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl" CONFIGURE_ARGS= --with-x --enable-gpl CFLAGS+= -fPIC MAN1= lqtplay.1 diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile index b36d338573e9..21d77fef50e4 100644 --- a/multimedia/libxine/Makefile +++ b/multimedia/libxine/Makefile @@ -7,10 +7,9 @@ PORTNAME= xine PORTVERSION= 1.1.11 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia ipv6 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF PKGNAMEPREFIX= lib DISTNAME= ${PORTNAME}-lib-${PORTVERSION} @@ -33,20 +32,19 @@ LIB_DEPENDS= FLAC.10:${PORTSDIR}/audio/flac \ dca.0:${PORTSDIR}/multimedia/libdca USE_BZIP2= yes -USE_GCC= 3.4+ USE_GETTEXT= yes USE_ICONV= yes -USE_X_PREFIX= yes GNU_CONFIGURE= yes WANT_GNOME= yes USE_GNOME= gnomehack gnometarget USE_GMAKE= yes -USE_GL= yes +USE_XORG= x11 xv xinerama +USE_GL= gl glu USE_SDL= sdl USE_LDCONFIG= yes -CONFIGURE_ENV= CFLAGS="${CFLAGS} -fno-force-addr -I${LOCALBASE}/include -I${LOCALBASE}/include/dvdread -I${X11BASE}/include" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ +CONFIGURE_ENV= CFLAGS="${CFLAGS} -fno-force-addr -I${LOCALBASE}/include -I${LOCALBASE}/include/dvdread" \ + CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" \ THREAD_CFLAGS="${PTHREAD_CFLAGS}" \ THREAD_LIBS="${PTHREAD_LIBS}" \ EXTRA_X_LIBS="-lGL -lGLU -lXext -lX11 -lm" @@ -125,7 +123,7 @@ CONFIGURE_ARGS+= --without-pulseaudio .endif .if defined(WITH_XVMC) -.if defined(WITH_NVIDIA_GL) || exists(${X11BASE}/lib/libXvMCNVIDIA.so.1) +.if defined(WITH_NVIDIA_GL) || exists(${LOCALBASE}/lib/libXvMCNVIDIA.so.1) CONFIGURE_ARGS+= --with-xvmc-lib=XvMCNVIDIA LIB_DEPENDS+= XvMCNVIDIA.1:${PORTSDIR}/x11/nvidia-driver .else diff --git a/multimedia/linux-realplayer/Makefile b/multimedia/linux-realplayer/Makefile index 54e0f19286c2..c39ae39e5595 100644 --- a/multimedia/linux-realplayer/Makefile +++ b/multimedia/linux-realplayer/Makefile @@ -23,7 +23,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0:${PORTSDIR}/x11-toolkits/l WRKSRC= ${WRKDIR}/usr/local/RealPlayer ONLY_FOR_ARCHS= i386 amd64 USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes RESTRICTED= Redistribution not allowed NO_BUILD= yes WANT_GNOME= yes diff --git a/multimedia/linux-xmovie/Makefile b/multimedia/linux-xmovie/Makefile index 7306083308e5..c93f99c5bce7 100644 --- a/multimedia/linux-xmovie/Makefile +++ b/multimedia/linux-xmovie/Makefile @@ -9,8 +9,7 @@ PORTNAME= xmovie PORTVERSION= 1.9.8.1 PORTREVISION= 3 CATEGORIES= multimedia linux -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= heroines +MASTER_SITES= SF/heroines PKGNAMEPREFIX= linux- DISTNAME= ${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}.i386.rpm EXTRACT_SUFX= @@ -22,7 +21,7 @@ EXTRACT_DEPENDS=rpm2cpio:${PORTSDIR}/archivers/rpm ONLY_FOR_ARCHS= i386 USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes EXTRACT_CMD= rpm2cpio EXTRACT_BEFORE_ARGS= EXTRACT_AFTER_ARGS= | ${CPIO} -id --quiet diff --git a/multimedia/manencode/Makefile b/multimedia/manencode/Makefile index 7031cda613b1..588e73added0 100644 --- a/multimedia/manencode/Makefile +++ b/multimedia/manencode/Makefile @@ -47,7 +47,7 @@ DESKTOP_ENTRIES= "Manencode" \ do-configure: @cd ${WRKSRC} \ && ${SETENV} ${MAKE_ENV} ${QMAKE} -spec ${QMAKESPEC} \ - INCLUDEPATH+=${X11BASE}/include + INCLUDEPATH+=${LOCALBASE}/include pre-install: ${MKDIR} ${MANENCODEDIR}/Interface diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile index 92a28ee79bef..bdbe64fff0b9 100644 --- a/multimedia/mencoder/Makefile +++ b/multimedia/mencoder/Makefile @@ -118,7 +118,7 @@ post-patch: -e 's|[[:space:]]gcc[-[:digit:]\.]+| ${CC}|' \ -e 's|[[:space:]]gcc| ${CC}|' \ -e 's|\$$\(CC\)|${CC}|' \ - -e 's|/usr/X11R6|${X11BASE}|' + -e 's|/usr/X11R6|${LOCALBASE}|' @${FIND} ${WRKSRC}/DOCS/man -name "mplayer.1" | ${XARGS} ${REINPLACE_CMD} -E -e \ 's|/usr/\\:local/\\:etc/\\:mplayer|${DATADIR:S/\//\/\\\:/g}|g ; \ s|/dev/\\:(dvd[[:alnum:]]*[[:>:]])|${DEFAULT_DVD_DEVICE:S/dev\//dev\/\\\:/}|g ; \ diff --git a/multimedia/miro/Makefile b/multimedia/miro/Makefile index 25ea4d7f3667..bd0a850ebe32 100644 --- a/multimedia/miro/Makefile +++ b/multimedia/miro/Makefile @@ -32,7 +32,7 @@ USE_GSTREAMER= python INSTALLS_EGGINFO= yes BUILD_WRKSRC= ${WRKSRC}/platform/gtk-x11 -MAKE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" +MAKE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" DATADIR= ${PREFIX}/share/${PORTNAME:L} PLIST_SUB= VER=${PORTVERSION} PYTHON_VER=${_PYTHON_VERSION} \ @@ -47,7 +47,7 @@ MANCOMPRESSED= yes pre-configure: .for pyscr in setup.py platform/resources.py ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ - -e 's|/usr/X11R6|${X11BASE}|g' \ + -e 's|/usr/X11R6|${LOCALBASE}|g' \ -e 's|/usr/share|${PREFIX}/share|g' \ -e 's|/usr/libexec|${PREFIX}/libexec|g' \ -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile index e0bf391f16ab..3afa76de0b7b 100644 --- a/multimedia/mjpegtools/Makefile +++ b/multimedia/mjpegtools/Makefile @@ -7,10 +7,9 @@ PORTNAME= mjpegtools DISTVERSION= 1.9.0rc3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= mjpeg +MASTER_SITES= SF/mjpeg MAINTAINER= multimedia@FreeBSD.org COMMENT= Set of tools to record/playback/edit videos in MPEG format @@ -54,7 +53,7 @@ PLIST_SUB+= PNG:="@comment " .endif .if !defined(WITHOUT_X11) -USE_XLIB= yes +USE_XORG= x11 CONFIGURE_ARGS+=--with-x .else CONFIGURE_ARGS+=--without-x diff --git a/multimedia/mp4v2/Makefile b/multimedia/mp4v2/Makefile index 91402a6aea1b..c4542795fbf0 100644 --- a/multimedia/mp4v2/Makefile +++ b/multimedia/mp4v2/Makefile @@ -21,8 +21,8 @@ USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes USE_GNOME= gnometarget GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ + LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" USE_LDCONFIG= yes post-patch: diff --git a/multimedia/mpeg4ip-libmp4v2/Makefile b/multimedia/mpeg4ip-libmp4v2/Makefile index 91402a6aea1b..c4542795fbf0 100644 --- a/multimedia/mpeg4ip-libmp4v2/Makefile +++ b/multimedia/mpeg4ip-libmp4v2/Makefile @@ -21,8 +21,8 @@ USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes USE_GNOME= gnometarget GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ + LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" USE_LDCONFIG= yes post-patch: diff --git a/multimedia/mpegedit/Makefile b/multimedia/mpegedit/Makefile index 652c1c42eda1..ec4a750252b4 100644 --- a/multimedia/mpegedit/Makefile +++ b/multimedia/mpegedit/Makefile @@ -7,7 +7,7 @@ PORTNAME= mpegedit PORTVERSION= 2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= http://www.netsw.org/graphic/movie/mpeg/mpegedit/ DISTNAME= ${PORTNAME}_v${PORTVERSION} @@ -17,7 +17,7 @@ COMMENT= A program to edit encoded mpeg streams LIB_DEPENDS= netpbm.1:${PORTSDIR}/graphics/netpbm -USE_X_PREFIX= yes +USE_XORG= x11 xext USE_GCC= 2.95 PORTDOCS= README manual.ps PLIST_FILES= bin/mpeg_edit diff --git a/multimedia/mpegedit/files/patch-aj b/multimedia/mpegedit/files/patch-aj index 5f6ad7158183..2ee226bf7942 100644 --- a/multimedia/mpegedit/files/patch-aj +++ b/multimedia/mpegedit/files/patch-aj @@ -16,7 +16,7 @@ OBJS = main.o globals/version.o ARCHIVES = editor/editor.a ui/ui.a MpegCodec/mpeg.a - LIBS = -lXext -lX11 -lpnm -lppm -lpbm -lpgm -lm -+ LIBS = -L$(X11BASE)/lib -L$(LOCALBASE)/lib -lXext -lX11 -lnetpbm -lm ++ LIBS = -L$(LOCALBASE)/lib -L$(LOCALBASE)/lib -lXext -lX11 -lnetpbm -lm # # CPPFLAGS -Wall all warnings # -pipe speeds up compilation (remove only if not using g++) @@ -30,7 +30,7 @@ - -IMpegCodec/encoder -Ieditor -CPPFLAGS = -Wall -pipe -O4 -CFLAGS = -Wall -pipe -O4 -+ -IMpegCodec/encoder -Ieditor -I$(X11BASE)/include ++ -IMpegCodec/encoder -Ieditor -I$(LOCALBASE)/include +CPPFLAGS = ${CXXFLAGS} +#CFLAGS = -Wall -pipe -O4 SHMEM = -DSH_MEM diff --git a/multimedia/mpegedit/files/patch-ar b/multimedia/mpegedit/files/patch-ar index 0ce818430deb..04c4c362b93e 100644 --- a/multimedia/mpegedit/files/patch-ar +++ b/multimedia/mpegedit/files/patch-ar @@ -12,7 +12,7 @@ RANLIB = ranlib -INCLUDES = -I../ui -I../editor -I../globals -Iencoder -Idecoder -+INCLUDES = -I../ui -I../editor -I../globals -Iencoder -Idecoder -I$(X11BASE)/include ++INCLUDES = -I../ui -I../editor -I../globals -Iencoder -Idecoder -I$(LOCALBASE)/include DEPFILE = Dependancies SUBDIRS = decoder encoder HEADERS = bstream.H frame.H mpeg.H diff --git a/multimedia/mpegedit/files/patch-au b/multimedia/mpegedit/files/patch-au index f514b164212e..69f37c8c42b8 100644 --- a/multimedia/mpegedit/files/patch-au +++ b/multimedia/mpegedit/files/patch-au @@ -9,7 +9,7 @@ +#CC = gcc +CPP = ${CXX} RANLIB = ranlib -+INCLUDES = -I$(X11BASE)/include ++INCLUDES = -I$(LOCALBASE)/include DEPFILE = Dependencies CCOPTIMISATIONS = -O6 -funroll-loops -fomit-frame-pointer ANALYSIS = -DANALYSIS diff --git a/multimedia/mpegedit/files/patch-az b/multimedia/mpegedit/files/patch-az index a0a3117b1d5f..962200f5240c 100644 --- a/multimedia/mpegedit/files/patch-az +++ b/multimedia/mpegedit/files/patch-az @@ -12,7 +12,7 @@ RM = rm -f INCLUDES = -I../globals -I../ui -I../MpegCodec -I../MpegCodec/decoder \ - -I../MpegCodec/encoder -I$(PBMDIR) -+ -I../MpegCodec/encoder -I$(PBMDIR) -I$(X11BASE)/include ++ -I../MpegCodec/encoder -I$(PBMDIR) -I$(LOCALBASE)/include DEPFILE = Dependancies HEADERS = yuv.H 2x2_window.H mono_window.H bw_window.H effects.H \ diff --git a/multimedia/mpegedit/files/patch-ba b/multimedia/mpegedit/files/patch-ba index 041f337d9935..78af8152aa86 100644 --- a/multimedia/mpegedit/files/patch-ba +++ b/multimedia/mpegedit/files/patch-ba @@ -8,7 +8,7 @@ +CPP = ${CXX} RANLIB = ranlib RM = rm -f -+INCLUDES = -I../globals -I$(X11BASE)/include ++INCLUDES = -I../globals -I$(LOCALBASE)/include # CPPFLAGS -Wall all warnings # -pipe speeds up compilation (remove only if not using g++) diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index 665137d74bba..2acb914a056f 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -7,7 +7,7 @@ PORTNAME= mplayer PORTVERSION= ${MPLAYER_PORT_VERSION} -PORTREVISION= 3 +PORTREVISION= 4 COMMENT= High performance media player supporting many formats @@ -118,7 +118,7 @@ CONFIGURE_ARGS+= --disable-freetype .endif .if !defined(WITHOUT_X11) -USE_XLIB= yes +USE_XORG= x11 .else WITHOUT_GUI= yes CONFIGURE_ARGS+=--disable-x11 \ @@ -229,7 +229,7 @@ post-patch: -e 's|[[:space:]]gcc[-[:digit:]\.]+| ${CC}|' \ -e 's|[[:space:]]gcc| ${CC}|' \ -e 's|\$$\(CC\)|${CC}|' \ - -e 's|/usr/X11R6|${X11BASE}|' + -e 's|/usr/X11R6|${LOCALBASE}|' @${FIND} ${WRKSRC}/DOCS/man -name "mplayer.1" | ${XARGS} ${REINPLACE_CMD} -E -e \ 's|/usr/\\:local/\\:etc/\\:mplayer|${DATADIR:S/\//\/\\\:/g}|g ; \ s|/dev/\\:(dvd[[:alnum:]]*[[:>:]])|${DEFAULT_DVD_DEVICE:S/dev\//dev\/\\\:/}|g ; \ diff --git a/multimedia/mplayer/Makefile.options b/multimedia/mplayer/Makefile.options index 80cdedc60ecb..19e20b0b7934 100644 --- a/multimedia/mplayer/Makefile.options +++ b/multimedia/mplayer/Makefile.options @@ -147,7 +147,7 @@ CONFIGURE_ARGS+= --disable-speex .if defined(WITH_XANIM) BUILD_DEPENDS+= xanim:${PORTSDIR}/multimedia/xanim -CONFIGURE_ARGS+=--enable-xanim --with-xanimlibdir=${X11BASE}/lib/X11/xanim +CONFIGURE_ARGS+=--enable-xanim --with-xanimlibdir=${LOCALBASE}/lib/X11/xanim .else CONFIGURE_ARGS+=--disable-xanim .endif @@ -272,7 +272,7 @@ CONFIGURE_ARGS+= --disable-win32dll \ .if defined(WITH_REALPLAYER) CONFIGURE_ARGS+= --enable-real \ - --realcodecsdir=${X11BASE}/lib/RealPlayer/codecs + --realcodecsdir=${LOCALBASE}/lib/RealPlayer/codecs RUN_DEPENDS+= realplay:${PORTSDIR}/multimedia/linux-realplayer BUILD_DEPENDS+= realplay:${PORTSDIR}/multimedia/linux-realplayer .else diff --git a/multimedia/mplayerxp/Makefile b/multimedia/mplayerxp/Makefile index 6c2560b8f3a2..77530beb7c55 100644 --- a/multimedia/mplayerxp/Makefile +++ b/multimedia/mplayerxp/Makefile @@ -7,10 +7,9 @@ PORTNAME= mplayerxp PORTVERSION= 0.6.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia audio -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Multi-threaded branch of the well known mplayer media player @@ -24,10 +23,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/mplayer/fonts:${PORTSDIR}/multimedia/mplayer-fon ONLY_FOR_ARCHS= i386 USE_BZIP2= yes -#USE_GNOME= gtk12 -USE_GCC= 3.4+ USE_ICONV= yes -USE_XLIB= yes USE_GMAKE= yes HAS_CONFIGURE= yes WANT_SDL= yes @@ -46,8 +42,8 @@ BROKEN= Does not compile with GCC 4.2 # add this after <bsd.port.pre.mk> so that we inherit /etc/make.conf CONFIGURE_ARGS+= --with-extralibdir=${LOCALBASE}/lib \ --with-extraincdir=${LOCALBASE}/include \ - --with-x11incdir=${X11BASE}/include \ - --with-x11libdir=${X11BASE}/lib \ + --with-x11incdir=${LOCALBASE}/include \ + --with-x11libdir=${LOCALBASE}/lib \ --cc=${CC} \ --prefix=${PREFIX} \ --confdir=${PREFIX}/etc/${PORTNAME} \ diff --git a/multimedia/mplayerxp/files/patch-codecs__common.mak b/multimedia/mplayerxp/files/patch-codecs__common.mak index 61e5eb6c8bcd..44390ea66002 100644 --- a/multimedia/mplayerxp/files/patch-codecs__common.mak +++ b/multimedia/mplayerxp/files/patch-codecs__common.mak @@ -5,7 +5,7 @@ ifneq ($(TARGET_OS),WIN32) -LDFLAGS+=-Xlinker -rpath=$(BINDIR) -+LDFLAGS+=-L${LOCALBASE}/lib -L${X11BASE}/lib -Xlinker -rpath=$(BINDIR) ++LDFLAGS+=-L${LOCALBASE}/lib -Xlinker -rpath=$(BINDIR) endif ifeq ($(TARGET_ARCH_SPARC64),yes) diff --git a/multimedia/mythtv/Makefile b/multimedia/mythtv/Makefile index 964ef096bfb0..81082472f8a1 100644 --- a/multimedia/mythtv/Makefile +++ b/multimedia/mythtv/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= mp3lame.0:${PORTSDIR}/audio/lame \ BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake \ ${SITE_PERL}/${PERL_ARCH}/XML/Parser/Expat.pm:${PORTSDIR}/textproc/p5-XML-SAX-Expat RUN_DEPENDS= tv_check:${PORTSDIR}/textproc/p5-xmltv \ - ${X11BASE}/lib/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt-mysql-plugin \ + ${LOCALBASE}/lib/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt-mysql-plugin \ wget:${PORTSDIR}/ftp/wget BROKEN= Incorrect handling of user addition diff --git a/multimedia/netshow/Makefile b/multimedia/netshow/Makefile index b357670fd161..e67602d8d688 100644 --- a/multimedia/netshow/Makefile +++ b/multimedia/netshow/Makefile @@ -21,7 +21,7 @@ RESTRICTED= "Commercial software" ONLY_FOR_ARCHS= i386 USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes PLIST_FILES= bin/netshow pre-extract: diff --git a/multimedia/nuppelvideo/Makefile b/multimedia/nuppelvideo/Makefile index f692f21d6f7c..94d8e059b5c3 100644 --- a/multimedia/nuppelvideo/Makefile +++ b/multimedia/nuppelvideo/Makefile @@ -27,8 +27,8 @@ USE_GMAKE= yes PORTDOCS= README # find dependencies -CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include \ - -L${LOCALBASE}/lib -L${X11BASE}/lib +CFLAGS+= -I${LOCALBASE}/include \ + -L${LOCALBASE}/lib .include <bsd.port.pre.mk> diff --git a/multimedia/nxtvepg/Makefile b/multimedia/nxtvepg/Makefile index aa1db6113739..973a2132bdc5 100644 --- a/multimedia/nxtvepg/Makefile +++ b/multimedia/nxtvepg/Makefile @@ -9,8 +9,7 @@ PORTNAME= nxtvepg PORTVERSION= 2.7.6 PORTREVISION= 2 CATEGORIES= multimedia tcl tk -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR=${PORTNAME} +MASTER_SITES= SF/${PORTNAME} MAINTAINER= barner@FreeBSD.org COMMENT= Viewer for Nextview Electronic TV Programme Guide (needs bktr driver) @@ -19,7 +18,7 @@ LIB_DEPENDS= tk84.1:${PORTSDIR}/x11-toolkits/tk84 NOT_FOR_ARCHS= sparc64 USE_GMAKE= yes -USE_XLIB= yes +USE_XORG= x11 xmu MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS} WRKSRC=${WRKSRC} MAN1= nxtvepg.1 @@ -36,9 +35,9 @@ post-patch: .endif post-install: - ${INSTALL_PROGRAM} ${WRKSRC}/nxtvepg ${X11BASE}/bin - ${INSTALL_DATA} ${WRKSRC}/Nxtvepg.ad ${X11BASE}/lib/X11/app-defaults/Nxtvepg - ${INSTALL_MAN} ${WRKSRC}/nxtvepg.1 ${X11BASE}/man/man1 + ${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 .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} diff --git a/multimedia/nxtvepg/files/patch-Makefile b/multimedia/nxtvepg/files/patch-Makefile index 6fe995b92732..eebd9695872e 100644 --- a/multimedia/nxtvepg/files/patch-Makefile +++ b/multimedia/nxtvepg/files/patch-Makefile @@ -4,8 +4,8 @@ include Makefile.bsd else -+ifndef X11BASE -+ X11BASE=/usr/X11R6 ++ifndef LOCALBASE ++ LOCALBASE=/usr/X11R6 +endif + +ifndef LOCALBASE @@ -13,7 +13,7 @@ +endif + +ifndef PREFIX -+ PREFIX=$(X11BASE) ++ PREFIX=$(LOCALBASE) +endif + ROOT = @@ -23,7 +23,7 @@ bindir = $(ROOT)${exec_prefix}/bin mandir = $(ROOT)${prefix}/man/man1 -resdir = $(ROOT)/usr/X11R6/lib/X11 -+resdir = $(ROOT)$(X11BASE)/lib/X11 ++resdir = $(ROOT)$(LOCALBASE)/lib/X11 # if you have perl set the path here, else just leave it alone PERL = /usr/bin/perl diff --git a/multimedia/nxtvepg/files/patch-Makefile.bsd b/multimedia/nxtvepg/files/patch-Makefile.bsd index da5df9b00235..a8377b150b64 100644 --- a/multimedia/nxtvepg/files/patch-Makefile.bsd +++ b/multimedia/nxtvepg/files/patch-Makefile.bsd @@ -12,7 +12,7 @@ +mandir = ${prefix}/man/man1 ifeq ($(OS), FreeBSD) -resdir = $(ROOT)/usr/X11R6/lib/X11 -+resdir = ${X11BASE}/lib/X11 ++resdir = ${LOCALBASE}/lib/X11 else resdir = $(LOCALBASE)/lib/X11 endif diff --git a/multimedia/ogle-gui/Makefile b/multimedia/ogle-gui/Makefile index 11f4a3f00e8f..cf271fc8fc37 100644 --- a/multimedia/ogle-gui/Makefile +++ b/multimedia/ogle-gui/Makefile @@ -7,7 +7,7 @@ PORTNAME= ogle PORTVERSION= 0.9.2 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= multimedia gnome MASTER_SITES= http://www.dtek.chalmers.se/groups/dvd/dist/ PKGNAMESUFFIX= -gui @@ -22,13 +22,12 @@ LIB_DEPENDS= glade-2.0:${PORTSDIR}/devel/libglade2 \ RUN_DEPENDS= ogle:${PORTSDIR}/multimedia/ogle USE_GETTEXT= yes -USE_XLIB= yes USE_GNOME= gnomehack \ gnomehier \ gnomeprefix \ gtk20 WANT_GNOME= yes -USE_XPM= yes +USE_XORG= xpm USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" CONFIGURE_ARGS= --with-dvd-includes=${LOCALBASE}/include \ diff --git a/multimedia/ogle/Makefile b/multimedia/ogle/Makefile index 72a9dd9d23b4..1665c0880e15 100644 --- a/multimedia/ogle/Makefile +++ b/multimedia/ogle/Makefile @@ -7,7 +7,7 @@ PORTNAME= ogle PORTVERSION= 0.9.2 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= multimedia MASTER_SITES= http://www.dtek.chalmers.se/groups/dvd/dist/ @@ -21,8 +21,8 @@ LIB_DEPENDS= a52.0:${PORTSDIR}/audio/liba52 \ xml2.5:${PORTSDIR}/textproc/libxml2 USE_AUTOTOOLS= libtool:15 +USE_XORG= x11 xext sm USE_SUBMAKE= yes -USE_XLIB= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" @@ -30,7 +30,7 @@ CONFIGURE_ARGS= --with-libjpeg=${LOCALBASE} \ --with-dvdread=${LOCALBASE} \ --with-libmad=${LOCALBASE} \ --with-liba52=${LOCALBASE} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes DEFAULT_DVD_DEVICE?= /dev/acd0c @@ -47,7 +47,7 @@ post-patch: @${REINPLACE_CMD} -E -e "s|(DEFAULT_DVD_DEVICE=\")/dev/acd0c(\")|\1${DEFAULT_DVD_DEVICE}\2|" \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} .endif - @${REINPLACE_CMD} -e "s|%%X11BASE%%|${X11BASE}|" ${WRKSRC}/scripts/ogle.in + @${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|" ${WRKSRC}/scripts/ogle.in # hack to make ogle work with liba52 + djbfft # CFLAGS safeness @${REINPLACE_CMD} -E -e 's|(-la52)|\1 ${LIBA52_DEP_LIBS}|; \ diff --git a/multimedia/ogle/files/patch-ogle.in b/multimedia/ogle/files/patch-ogle.in index 513c6eba934f..b1d9fd1536ea 100644 --- a/multimedia/ogle/files/patch-ogle.in +++ b/multimedia/ogle/files/patch-ogle.in @@ -5,7 +5,7 @@ DVDP_UI=$DVDP_ROOT/ogle_gui$gui_debug else -DVDP_UI=$exec_prefix/bin/ogle_gui$gui_debug -+DVDP_UI=%%X11BASE%%/lib/ogle/ogle_gui$gui_debug ++DVDP_UI=%%LOCALBASE%%/lib/ogle/ogle_gui$gui_debug fi fi export DVDP_UI diff --git a/multimedia/py-gstreamer/Makefile b/multimedia/py-gstreamer/Makefile index 58843ab18ec2..34ccaf664477 100644 --- a/multimedia/py-gstreamer/Makefile +++ b/multimedia/py-gstreamer/Makefile @@ -27,8 +27,8 @@ USE_GNOME= pygtk2 gnomehack pkgconfig USE_GSTREAMER= yes GNU_CONFIGURE= yes PLIST_SUB= VERSION="${GST_VERSION}" -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ - LDFLAGS="-L${X11BASE}" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}" post-patch: @${REINPLACE_CMD} -e 's|DLFCN|dl|g' ${WRKSRC}/gst/__init__.py diff --git a/multimedia/py-pybmp/Makefile b/multimedia/py-pybmp/Makefile index 4607c6e7a3ea..af58aa028708 100644 --- a/multimedia/py-pybmp/Makefile +++ b/multimedia/py-pybmp/Makefile @@ -25,6 +25,6 @@ USE_PYTHON= yes USE_PYDISTUTILS= yes post-extract: - ${SED} -e 's|%%X11BASE%%|${X11BASE}|g' ${FILESDIR}/setup.cfg.port >> ${WRKSRC}/setup.cfg + ${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${FILESDIR}/setup.cfg.port >> ${WRKSRC}/setup.cfg .include <bsd.port.mk> diff --git a/multimedia/py-pybmp/files/setup.cfg.port b/multimedia/py-pybmp/files/setup.cfg.port index b1a359aba0c8..bfa2f0cfd7cd 100644 --- a/multimedia/py-pybmp/files/setup.cfg.port +++ b/multimedia/py-pybmp/files/setup.cfg.port @@ -2,5 +2,5 @@ # $FreeBSD$ # [build_ext] -include-dirs=%%X11BASE%%/include -library-dirs=%%X11BASE%%/lib +include-dirs=%%LOCALBASE%%/include +library-dirs=%%LOCALBASE%%/lib diff --git a/multimedia/qdvdauthor/Makefile b/multimedia/qdvdauthor/Makefile index 3713ad5c46a5..27b04fc0dd07 100644 --- a/multimedia/qdvdauthor/Makefile +++ b/multimedia/qdvdauthor/Makefile @@ -50,7 +50,7 @@ HAS_CONFIGURE= yes USE_QT_VER= 3 QT_NONSTANDARD= yes CONFIGURE_ENV= QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ -CONFIGURE_ARGS= --prefix=${PREFIX} --qt-dir=${X11BASE} --with-qt-lib=qt-mt \ +CONFIGURE_ARGS= --prefix=${PREFIX} --qt-dir=${LOCALBASE} --with-qt-lib=qt-mt \ --build-qslideshow --build-qplayer NO_BUILD= yes diff --git a/multimedia/quark/Makefile b/multimedia/quark/Makefile index ed9edea66e34..27242e529d28 100644 --- a/multimedia/quark/Makefile +++ b/multimedia/quark/Makefile @@ -6,7 +6,7 @@ PORTNAME= quark PORTVERSION= 3.21 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= multimedia gnome MASTER_SITES= http://quark.sunsite.dk/ \ http://demian.dyndns.org/src/ @@ -16,7 +16,6 @@ COMMENT= An audio player, for geeks, by geeks LIB_DEPENDS= xine.1:${PORTSDIR}/multimedia/libxine -USE_X_PREFIX= yes USE_GNOME= gnomehack gnomeprefix gnometarget gnomevfs2 USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/multimedia/quodlibet/Makefile b/multimedia/quodlibet/Makefile index 577a22d7ab30..53043e8eb14b 100644 --- a/multimedia/quodlibet/Makefile +++ b/multimedia/quodlibet/Makefile @@ -7,7 +7,7 @@ PORTNAME= quodlibet PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia audio python gnome MASTER_SITES= http://www.sacredchao.net/~piman/software/ \ http://www.tortall.net/mirrors/piman-software/ @@ -22,7 +22,6 @@ USE_PYTHON= 2.4+ USE_GNOME= pygtk2 USE_GETTEXT= yes USE_GMAKE= yes -USE_X_PREFIX= yes USE_GSTREAMER= gconf good python MAN1= exfalso.1 quodlibet.1 @@ -107,7 +106,7 @@ PLIST_SUB+= EXTENSIONS="@comment " .if defined(PACKAGE_BUILDING) BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} \ - ${X11BASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT} + ${LOCALBASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT} .endif do-configure: diff --git a/multimedia/smpeg-xmms/Makefile b/multimedia/smpeg-xmms/Makefile index 4c55d575cf43..c16e132fc19a 100644 --- a/multimedia/smpeg-xmms/Makefile +++ b/multimedia/smpeg-xmms/Makefile @@ -7,7 +7,7 @@ PORTNAME= smpeg-xmms PORTVERSION= 0.3.5 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= multimedia gnome MASTER_SITES= http://www.xmms.org/files/%SUBDIR%/ \ ftp://ftp.sunet.se/pub/multimedia/xmms/%SUBDIR%/ @@ -20,7 +20,6 @@ LIB_DEPENDS= smpeg.1:${PORTSDIR}/multimedia/smpeg \ xmms.4:${PORTSDIR}/multimedia/xmms PLIST_FILES= lib/xmms/Input/libsmpeg_xmms.so -USE_X_PREFIX= yes USE_SDL= sdl USE_GNOME= gnomehack gtk12 GNU_CONFIGURE= yes @@ -31,7 +30,7 @@ post-patch: @${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ ${WRKSRC}/configure -# This is to avoid libtool running ldconfig -m ${X11BASE}/lib/xmms/Input +# This is to avoid libtool running ldconfig -m ${LOCALBASE}/lib/xmms/Input do-install: ${MKDIR} ${PREFIX}/lib/xmms/Input ${INSTALL_PROGRAM} \ diff --git a/multimedia/smpeg/Makefile b/multimedia/smpeg/Makefile index 0453c1ac37de..81d4d0d0fc8d 100644 --- a/multimedia/smpeg/Makefile +++ b/multimedia/smpeg/Makefile @@ -22,8 +22,8 @@ USE_GMAKE= yes GNU_CONFIGURE= yes USE_SDL= sdl USE_LDCONFIG= yes -CONFIGURE_ENV= GLBASE="${X11BASE}" \ - CPPFLAGS="-I${X11BASE}/include" \ +CONFIGURE_ENV= GLBASE="${LOCALBASE}" \ + CPPFLAGS="-I${LOCALBASE}/include" \ CC="${CXX}" REAL_CC="${CC}" #If you want to try the opengl player (which doesn't seem to work) diff --git a/multimedia/subtitleripper/Makefile b/multimedia/subtitleripper/Makefile index dfb88e06258f..1f4358f05de1 100644 --- a/multimedia/subtitleripper/Makefile +++ b/multimedia/subtitleripper/Makefile @@ -55,7 +55,7 @@ post-patch: ${BUILD_WRKSRC}/${MAKEFILE} @${REINPLACE_CMD} -E \ -e 's|^(DB_PATH[[:space:]]*=).*$$|\1\$${HOME}/.db/|' \ - -e 's|^(IMAGE_VIWER[[:space:]]*=).*$$|\1${X11BASE}/bin/xv|' \ + -e 's|^(IMAGE_VIWER[[:space:]]*=).*$$|\1${LOCALBASE}/bin/xv|' \ -e 's|^(PATH_TO_LANGUAGE_FILTER[[:space:]]*=).*$$|\1${EXAMPLESDIR}/|' \ -e 's|(gocr[[:space:]]+)|${LOCALBASE}/bin/\1|' \ ${WRKSRC}/pgm2txt diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile index 45a7bd07a3b3..4cc1e52f6180 100644 --- a/multimedia/totem/Makefile +++ b/multimedia/totem/Makefile @@ -8,7 +8,7 @@ PORTNAME= totem PORTVERSION= 2.22.1 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= multimedia gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -26,7 +26,6 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-co USE_PYTHON= yes USE_BZIP2= yes USE_GETTEXT= yes -USE_XLIB= yes USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui desktopfileutils \ nautiluscdburner ltverhack pygtk2 GNOME_DESKTOP_VERSION=2 diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile index 3d8eadb660f3..895cd880bcfe 100644 --- a/multimedia/transcode/Makefile +++ b/multimedia/transcode/Makefile @@ -7,7 +7,7 @@ PORTNAME= transcode PORTVERSION= 1.0.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= http://transcode.kabewm.com/ \ http://fromani.exit1.org/ @@ -24,7 +24,6 @@ BUILD_DEPENDS= iconv:${PORTSDIR}/converters/libiconv USE_BZIP2= yes FAKEDIR= ${WRKDIR}/fake PLIST= ${WRKDIR}/plist -USE_XLIB= yes USE_GMAKE= yes USE_LDCONFIG= yes WANT_SDL= yes diff --git a/multimedia/vic/Makefile b/multimedia/vic/Makefile index b9a5417971ce..358a57848668 100644 --- a/multimedia/vic/Makefile +++ b/multimedia/vic/Makefile @@ -7,7 +7,7 @@ PORTNAME= vic PORTVERSION= 2.8.1.1.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mbone tk ipv6 MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/vic/2.8ucl1.1.6/ DISTNAME= ${PORTNAME}-2.8ucl1.1.6 @@ -16,15 +16,15 @@ MAINTAINER= mi@aldan.algebra.com COMMENT= MBONE video tool BUILD_DEPENDS+= v4l_compat>=1.0.20060801:${PORTSDIR}/multimedia/v4l_compat - LIB_DEPENDS= uclmmbase:${PORTSDIR}/devel/uclmmbase + USE_TK= yes USE_TK_BUILD= yes USE_AUTOTOOLS= autoconf:213 -USE_X_PREFIX= yes -CONFIGURE_ARGS= -x-libraries=${X11BASE}/lib \ - -x-includes=${X11BASE}/include \ +USE_XORG= xext +CONFIGURE_ARGS= -x-libraries=${LOCALBASE}/lib \ + -x-includes=${LOCALBASE}/include \ -without-ucltcl \ -with-tcl=${LOCALBASE} \ -without-ucltk \ diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile index b12fb9a3d0de..21cefc114fd3 100644 --- a/multimedia/vlc-devel/Makefile +++ b/multimedia/vlc-devel/Makefile @@ -28,7 +28,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_ LIB_DEPENDS= notify.1:${PORTSDIR}/devel/libnotify \ tar.0:${PORTSDIR}/devel/libtar \ avcodec.1:${PORTSDIR}/multimedia/ffmpeg -RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera +RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera OPTIONS+= A52 "a52 audio support, many DVDs use this" On OPTIONS+= AALIB "Aalib Console Graphics Support" Off @@ -70,7 +70,7 @@ OPTIONS+= X264 "Enable H.264/AVC codec support" On WRKSRC= ${WRKDIR}/${PORTNAME}-0.9.0-svn CONFLICTS= vlc-[0-9]* -WITH_VLC_DEFAULT_FONT?= ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf +WITH_VLC_DEFAULT_FONT?= ${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf USE_BZIP2= yes USE_GETTEXT= yes @@ -86,8 +86,8 @@ PLIST= ${WRKDIR}/plist USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${FAKEDIR}/include -I${WRKSRC}/include ${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include -I${LOCALBASE}/ffmpeg ${PTHREAD_CFLAGS} -DHAVE_POSTPROC_POSTPROCESS_H" \ - LDFLAGS="${LDFLAGS} -L${FAKEDIR}/lib -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} -lc" \ +CONFIGURE_ENV= CPPFLAGS="-I${FAKEDIR}/include -I${WRKSRC}/include ${CPPFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/ffmpeg ${PTHREAD_CFLAGS} -DHAVE_POSTPROC_POSTPROCESS_H" \ + LDFLAGS="${LDFLAGS} -L${FAKEDIR}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lc" \ LIBS="-lc" CONFIGURE_ARGS+= --enable-ffmpeg \ diff --git a/multimedia/vlc-devel/Makefile.inc b/multimedia/vlc-devel/Makefile.inc index 9c42fe8306f4..a1fa6ee0be22 100644 --- a/multimedia/vlc-devel/Makefile.inc +++ b/multimedia/vlc-devel/Makefile.inc @@ -218,7 +218,7 @@ # Disable ALL streaming plugins. # # WITH_VLC_DEFAULT_FONT=/path/to/font -# default: ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf +# default: ${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf # This option lets you change the default font for subtitles # # NOPORTDOCS=yes diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index 48b7e9974435..d58187c68c58 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -24,7 +24,7 @@ COMMENT= Multimedia streaming server and player for various audio/video formats BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat LIB_DEPENDS= notify.1:${PORTSDIR}/devel/libnotify \ avcodec.1:${PORTSDIR}/multimedia/ffmpeg -RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera +RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera OPTIONS+= A52 "a52 audio support, many DVDs use this" On OPTIONS+= AALIB "Aalib Console Graphics Support" Off @@ -63,7 +63,7 @@ OPTIONS+= X264 "Enable H.264/AVC codec support" On CONFLICTS= vlc-devel-[0-9]* -WITH_VLC_DEFAULT_FONT?= ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf +WITH_VLC_DEFAULT_FONT?= ${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf USE_BZIP2= yes USE_GETTEXT= yes @@ -79,8 +79,8 @@ PLIST= ${WRKDIR}/plist USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${FAKEDIR}/include -I${WRKSRC}/include ${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include -I${LOCALBASE}/ffmpeg ${PTHREAD_CFLAGS} -DHAVE_POSTPROC_POSTPROCESS_H" \ - LDFLAGS="${LDFLAGS} -L${FAKEDIR}/lib -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} -lc" \ +CONFIGURE_ENV= CPPFLAGS="-I${FAKEDIR}/include -I${WRKSRC}/include ${CPPFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/ffmpeg ${PTHREAD_CFLAGS} -DHAVE_POSTPROC_POSTPROCESS_H" \ + LDFLAGS="${LDFLAGS} -L${FAKEDIR}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lc" \ LIBS="-lc" CONFIGURE_ARGS+= --enable-ffmpeg \ diff --git a/multimedia/vlc/Makefile.inc b/multimedia/vlc/Makefile.inc index 4b2f5f97b984..295441ed64cc 100644 --- a/multimedia/vlc/Makefile.inc +++ b/multimedia/vlc/Makefile.inc @@ -218,7 +218,7 @@ # Disable ALL streaming plugins. # # WITH_VLC_DEFAULT_FONT=/path/to/font -# default: ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf +# default: ${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf # This option lets you change the default font for subtitles # # NOPORTDOCS=yes diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile index 91bc10ce8305..3adea294fd51 100644 --- a/multimedia/x264-devel/Makefile +++ b/multimedia/x264-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= x264 PORTVERSION= 0.0.20080409 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= multimedia MASTER_SITES= http://downloads.videolan.org/pub/videolan/x264/snapshots/ DISTNAME= ${PORTNAME}-snapshot-${PORTVERSION:S/0.0.//}-2245 @@ -29,8 +29,8 @@ HAS_CONFIGURE= yes OPTIONS= DEBUG "Enable Debugging" Off \ OPTIMIZED_CFLAGS "Enable Optimized CFLAGS" Off -CONFIGURE_ARGS+= --extra-cflags="${CPPFLAGS} ${CFLAGS} -fPIC -I${LOCALBASE}/include -I${X11BASE}/include" \ - --extra-ldflags="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib" \ +CONFIGURE_ARGS+= --extra-cflags="${CPPFLAGS} ${CFLAGS} -fPIC -I${LOCALBASE}/include -I${LOCALBASE}/include" \ + --extra-ldflags="${LDFLAGS} -L${LOCALBASE}/lib -L${LOCALBASE}/lib" \ --enable-shared .include <bsd.port.pre.mk> @@ -70,7 +70,7 @@ CONFIGURE_ARGS+= --enable-mp4-output .if defined(WITH_X11_OUTPUT) CONFIGURE_ARGS+= --enable-visualize -USE_XLIB= yes +USE_XORG= x11 .endif post-patch: diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile index 91bc10ce8305..3adea294fd51 100644 --- a/multimedia/x264/Makefile +++ b/multimedia/x264/Makefile @@ -7,7 +7,7 @@ PORTNAME= x264 PORTVERSION= 0.0.20080409 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= multimedia MASTER_SITES= http://downloads.videolan.org/pub/videolan/x264/snapshots/ DISTNAME= ${PORTNAME}-snapshot-${PORTVERSION:S/0.0.//}-2245 @@ -29,8 +29,8 @@ HAS_CONFIGURE= yes OPTIONS= DEBUG "Enable Debugging" Off \ OPTIMIZED_CFLAGS "Enable Optimized CFLAGS" Off -CONFIGURE_ARGS+= --extra-cflags="${CPPFLAGS} ${CFLAGS} -fPIC -I${LOCALBASE}/include -I${X11BASE}/include" \ - --extra-ldflags="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib" \ +CONFIGURE_ARGS+= --extra-cflags="${CPPFLAGS} ${CFLAGS} -fPIC -I${LOCALBASE}/include -I${LOCALBASE}/include" \ + --extra-ldflags="${LDFLAGS} -L${LOCALBASE}/lib -L${LOCALBASE}/lib" \ --enable-shared .include <bsd.port.pre.mk> @@ -70,7 +70,7 @@ CONFIGURE_ARGS+= --enable-mp4-output .if defined(WITH_X11_OUTPUT) CONFIGURE_ARGS+= --enable-visualize -USE_XLIB= yes +USE_XORG= x11 .endif post-patch: 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 diff --git a/multimedia/xdvshow/Makefile b/multimedia/xdvshow/Makefile index eba5f3f9d6dc..72e5071953fd 100644 --- a/multimedia/xdvshow/Makefile +++ b/multimedia/xdvshow/Makefile @@ -7,7 +7,7 @@ PORTNAME= xdvshow PORTVERSION= 00.2003.09.03 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= multimedia MASTER_SITES= http://www.sfc.wide.ad.jp/DVTS/software/xdvshow/ DISTNAME= ${PORTNAME} @@ -20,13 +20,12 @@ LIB_DEPENDS= dv.4:${PORTSDIR}/multimedia/libdv PLIST_FILES= bin/xdvshow GNU_CONFIGURE= YES USE_AUTOTOOLS= autoconf:261 -USE_XLIB= yes post-patch: @${REINPLACE_CMD} \ -e "s|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|g" \ -e "s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g" \ - -e "s|/usr/X11R6|${X11BASE}|g" \ + -e "s|/usr/X11R6|${LOCALBASE}|g" \ ${WRKSRC}/configure.in ${REINPLACE_CMD} -e "s|-Werror||" ${WRKSRC}/src/Makefile.in diff --git a/multimedia/xfce4-xmms-controller-plugin/Makefile b/multimedia/xfce4-xmms-controller-plugin/Makefile index 2b98268d1a18..d10bd8355f0c 100644 --- a/multimedia/xfce4-xmms-controller-plugin/Makefile +++ b/multimedia/xfce4-xmms-controller-plugin/Makefile @@ -23,7 +23,7 @@ DEPRECATED= Project is dead EXPIRATION_DATE=2008-03-31 IGNORE= Does not support xfce 4.4 USE_GNOME= gtk20 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --datadir=${PREFIX}/share/${PORTNAME} diff --git a/multimedia/xmms-avi/Makefile b/multimedia/xmms-avi/Makefile index c81d88549744..6b4d2ec6ecb4 100644 --- a/multimedia/xmms-avi/Makefile +++ b/multimedia/xmms-avi/Makefile @@ -39,7 +39,7 @@ post-patch: s|-O2||g ; \ s|$$(CC_OPTS)|@CFLAGS@|g' -# This is to avoid libtool running ldconfig -m ${X11BASE}/lib/xmms/Input +# This is to avoid libtool running ldconfig -m ${LOCALBASE}/lib/xmms/Input do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/.libs/libavixmms.so ${PREFIX}/lib/xmms/Input diff --git a/multimedia/xmps-win32-plugin/Makefile b/multimedia/xmps-win32-plugin/Makefile index 0e1b8ebab1ca..bdea573a28f5 100644 --- a/multimedia/xmps-win32-plugin/Makefile +++ b/multimedia/xmps-win32-plugin/Makefile @@ -7,7 +7,7 @@ PORTNAME= xmps-win32-plugin PORTVERSION= 0.0.4 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= multimedia MASTER_SITES= http://ftp.vin.bg.ac.yu/linux/mmedia/xmps/ @@ -21,7 +21,6 @@ USE_GETTEXT= yes USE_GMAKE= yes GNU_CONFIGURE= yes USE_GNOME= gtk12 -USE_XLIB= yes USE_LDCONFIG= yes #CODEC_PORT= ${PORTSDIR}/multimedia/win32-codecs diff --git a/multimedia/xtheater/Makefile b/multimedia/xtheater/Makefile index 0cea535c9c60..10052e8357b3 100644 --- a/multimedia/xtheater/Makefile +++ b/multimedia/xtheater/Makefile @@ -11,8 +11,7 @@ PORTVERSION= 1.0.0.p1 PORTREVISION= 6 PORTEPOCH= 1 CATEGORIES= multimedia -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= Xtheater-${PORTVERSION:S/.p/-pre/} MAINTAINER= ports@FreeBSD.org @@ -30,8 +29,8 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --enable-gl -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} +CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} post-patch: @${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ diff --git a/multimedia/xvid/Makefile b/multimedia/xvid/Makefile index 77acf091cf25..ba361f0ec9ba 100644 --- a/multimedia/xvid/Makefile +++ b/multimedia/xvid/Makefile @@ -18,7 +18,7 @@ COMMENT= An opensource MPEG-4 codec, based on OpenDivx BUILD_DEPENDS= ${LOCALBASE}/bin/nasm:${PORTSDIR}/devel/nasm GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_GCC?= 3.4+ WRKSRC= ${WRKDIR}/${DISTNAME}/build/generic |