diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2006-10-14 08:54:54 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2006-10-14 08:54:54 +0000 |
| commit | 29747f458a1eb2ce23b4594b09d0256dd62760b8 (patch) | |
| tree | 1b71ba5d9ffdd308b6c18130f7c116f5bab5dc12 /multimedia/vlc | |
| parent | - Add goocanvas (diff) | |
Chase the GNOME X11BASE to LOCALBASE move, and fix the build with the
new freetype2 where needed.
Submitted by: mezz, ahze, pav, and many others
Approved by: portmgr (implicit, kris)
Notes
Notes:
svn path=/head/; revision=175261
Diffstat (limited to 'multimedia/vlc')
| -rw-r--r-- | multimedia/vlc/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/vlc/Makefile.inc | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index ab43d0fe3aff..c544495a7fb1 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -3,7 +3,7 @@ # Whom: Brian Somers <brian@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/multimedia/vlc-devel/Makefile,v 1.5 2006/05/06 06:06:47 ahze Exp $ +# $MCom: ports/multimedia/vlc/Makefile,v 1.4 2006/10/01 16:05:06 ahze Exp $ # # *** PLEASE READ Makefile.inc for more information on knobs *** # @@ -27,7 +27,6 @@ CONFLICTS= vlc-devel-[0-9]* WITH_VLC_DEFAULT_FONT?= ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf USE_BZIP2= yes -USE_X_PREFIX= yes USE_GETOPT_LONG=yes USE_GETTEXT= yes USE_GMAKE= yes diff --git a/multimedia/vlc/Makefile.inc b/multimedia/vlc/Makefile.inc index 63d77f5d7c97..36f81c870e66 100644 --- a/multimedia/vlc/Makefile.inc +++ b/multimedia/vlc/Makefile.inc @@ -5,7 +5,7 @@ # and will be autodetected to enable # # $FreeBSD$ -# $MCom: ports/multimedia/vlc-devel/Makefile.inc,v 1.1 2006/05/06 06:06:47 ahze Exp $ +# $MCom: ports/multimedia/vlc/Makefile.inc,v 1.3 2006/09/30 18:15:02 ahze Exp $ # # If you define for example WITH_FAAD and WITHOUT_FAAD # the WITHOUT_ will always over ride the WITH_. @@ -294,6 +294,7 @@ pre-install: .endif cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} prefix=${FAKEDIR} + ${RM} -f ${FAKEDIR}/share/locale/locale.alias cd ${FAKEDIR}/bin && ${FIND} -s * | \ ${SED} -e 's|^|bin/|' >> ${PLIST} cd ${FAKEDIR}/include && ${FIND} -s * -type f -o -type l | \ @@ -310,6 +311,7 @@ pre-install: && ${FIND} -d * -type d | \ ${SED} -e 's|^|@dirrm share/${dir}/|' >> ${PLIST} .endfor + ${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST} .if !defined(NOPORTDOCS) cd ${FAKEDIR}/share/doc && ${FIND} -s * -type f -o -type l | \ ${SED} -e 's|^|share/doc/|' >> ${PLIST} \ |