aboutsummaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorJeremy Lea <reg@FreeBSD.org>2000-10-05 06:47:41 +0000
committerJeremy Lea <reg@FreeBSD.org>2000-10-05 06:47:41 +0000
commit3707e5b7408ecadb0bda141dd82ec9bbca5d0267 (patch)
treef1d64a9e396a97d08c7dc5b7eed24efc11a3fa10 /audio
parent99290b0d61db9bcb3c960f5507a8ccb0126a0cf9 (diff)
downloadports-3707e5b7408ecadb0bda141dd82ec9bbca5d0267.tar.gz
ports-3707e5b7408ecadb0bda141dd82ec9bbca5d0267.zip
Implment WANT_GTK.
Notes
Notes: svn path=/head/; revision=33426
Diffstat (limited to 'audio')
-rw-r--r--audio/aumix/Makefile20
-rw-r--r--audio/lame/Makefile26
-rw-r--r--audio/lame/files/patch-aa2
-rw-r--r--audio/teknap/Makefile45
-rw-r--r--audio/teknap/files/patch-aa9
5 files changed, 47 insertions, 55 deletions
diff --git a/audio/aumix/Makefile b/audio/aumix/Makefile
index bba2065cf6f7..9a2df4de4299 100644
--- a/audio/aumix/Makefile
+++ b/audio/aumix/Makefile
@@ -16,29 +16,23 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= cpiazza@FreeBSD.org
LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
-.if !defined(WITHOUT_X11)
-LIB_DEPENDS+= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
-USE_X_PREFIX= yes
-GTK_CONFIG= ${X11BASE}/bin/gtk12-config
-.endif
+WANT_GTK= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --includedir="${LOCALBASE}/include" \
--enable-own-labels \
--libdir="${LOCALBASE}/lib"
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GTK_CONFIG="${GTK_CONFIG}" \
LDFLAGS="-L${LOCALBASE}/lib"
MAN1= aumix.1 xaumix.1
-.if defined(WITHOUT_X11)
-CONFIGURE_ARGS+= --without-gtk
+.include <bsd.port.pre.mk>
+
+.if defined(HAVE_GTK)
+USE_GTK= yes
.else
-pre-fetch:
- @${ECHO_MSG} -n "To build this port without X11 (and without the GUI),"
- @${ECHO_MSG} " define \"WITHOUT_X11\"."
+CONFIGURE_ARGS+=--without-gtk
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index d057d7209b25..a3f3762a601e 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -16,35 +16,27 @@ PATCHFILES= lame${PORTVERSION}.patch.gz
MAINTAINER= yoshiaki@kt.rim.or.jp
-.if !defined(WITHOUT_X11)
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-.endif
-
PATCH_DIST_STRIP = -p1
WRKSRC= ${WRKDIR}/dist10/lsf/encoder/
-USE_GMAKE= YES
-MAKE_ENV= WITHOUT_X11=${WITHOUT_X11}
+USE_GMAKE= yes
+WANT_GTK= yes
ALL_TARGET= lame
RESTRICTED= Condition is not clear
-.if !defined(WITHOUT_X11)
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-MAKE_ENV+= GTK_CONFIG="${GTK_CONFIG}"
-.endif
-
MAN1= lame.1
-do-install:
- @( cd ${WRKSRC}; ${INSTALL_PROGRAM} lame ${PREFIX}/bin )
- @( cd ${WRKSRC}; ${INSTALL_MAN} doc/man/lame.1 \
- ${PREFIX}/man/man1 )
+.include <bsd.port.pre.mk>
+
+.if defined(HAVE_GTK)
+USE_GTK= yes
+.endif
post-install:
.if !defined(NOPORTDOCS)
@${MKDIR} ${PREFIX}/share/doc/lame
- @${INSTALL_MAN} ${WRKSRC}/doc/html/*.html \
+ ${INSTALL_DATA} ${WRKSRC}/doc/html/*.html \
${WRKSRC}/doc/html/*.css ${PREFIX}/share/doc/lame
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/audio/lame/files/patch-aa b/audio/lame/files/patch-aa
index 47cbc6de3f76..e04f0d348fed 100644
--- a/audio/lame/files/patch-aa
+++ b/audio/lame/files/patch-aa
@@ -17,7 +17,7 @@
# remove if you do not have GTK or do not want the GTK frame analyzer
- GTK = -DHAVEGTK `gtk12-config --cflags`
- GTKLIBS = `gtk12-config --libs`
-+ifndef WITHOUT_X11
++ifdef HAVE_GTK
+ GTK = -DHAVEGTK `$(GTK_CONFIG) --cflags`
+ GTKLIBS = `$(GTK_CONFIG) --libs`
+endif
diff --git a/audio/teknap/Makefile b/audio/teknap/Makefile
index 7959f730ac34..54476d48a136 100644
--- a/audio/teknap/Makefile
+++ b/audio/teknap/Makefile
@@ -13,9 +13,6 @@ MASTER_SITES= ftp://ftp.teknap.com/pub/TekNap/ \
MAINTAINER= cj@vallcom.net
-.if defined(WITH_GTK)
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-.endif
.if defined(WITH_MP3)
BUILD_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
.endif
@@ -23,41 +20,41 @@ BUILD_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
BUILD_DEPENDS= xmms:${PORTSDIR}/audio/xmms
.endif
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
WRKSRC= ${WRKDIR}/TekNap
-GNU_CONFIGURE= yes
+
+PLIST_SUB+= PORTVERSION="${PORTVERSION}"
+
USE_GMAKE= yes
+WANT_GTK= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LIBS="-L${LOCALBASE}/lib"
-.if defined(WITH_GTK)
-CONFIGURE_ARGS+= --with-gtk
+.include <bsd.port.pre.mk>
+
+.if defined(HAVE_GTK)
+USE_GTK= yes
+CONFIGURE_ARGS+=--with-gtk
+.else
+CONFIGURE_ARGS+=--without-gtk
.endif
+
.if defined(WITH_MP3)
-CONFIGURE_ARGS+= --enable-mp3
+CONFIGURE_ARGS+=--enable-mp3
.endif
+
.if defined(WITH_XMMS)
-CONFIGURE_ARGS+= --enable-xmms
+CONFIGURE_ARGS+=--enable-xmms
.endif
-CONFIGURE_ARGS+= --exec-prefix="${PREFIX}/share" \
- --bindir="${PREFIX}/bin" \
- --datadir="${PREFIX}/share" \
- --libdir="${PREFIX}/share"
-
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GLIB_CONFIG="${GLIB_CONFIG}" \
- GTK_CONFIG="${GTK_CONFIG}"
-MAKE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
- INSTALL_DATA="${INSTALL_DATA}"
-PLIST_SUB+= PORTVERSION="${PORTVERSION}"
pre-extract:
@${ECHO} "Available switches:"
@${ECHO} "-------------------"
- @${ECHO} "WITH_GTK - Add GTK support"
@${ECHO} "WITH_MP3 - Support MP3 playback"
@${ECHO} "WITH_XMMS - Support XMMS"
+
pre-configure:
- ${PERL} -pi -e "s:-lc_r:-pthread:g" ${WRKSRC}/configure
+ @${PERL} -pi -e "s:-lc_r:-pthread:g" ${WRKSRC}/configure
post-install:
.if !defined(NOPORTDOCS)
@@ -70,4 +67,4 @@ post-install:
@${ECHO}
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/audio/teknap/files/patch-aa b/audio/teknap/files/patch-aa
index fac576d842ec..9ce74dbfd745 100644
--- a/audio/teknap/files/patch-aa
+++ b/audio/teknap/files/patch-aa
@@ -1,5 +1,14 @@
--- Makefile.in.orig Thu Jun 22 11:32:39 2000
+++ Makefile.in Thu Jul 6 01:10:22 2000
+@@ -34,7 +34,7 @@
+ NAPLIB = @NAPLIB@
+
+ CC = @CC@
+-DEFS = -I$$(srcdir)/../include -I$(topdir)/include
++DEFS = -I. -I$(topdir)/include -I-
+ LIBS = @LIBS@
+ INCLUDES = @INCLUDES@
+
@@ -58,8 +58,8 @@
# This command will be used to install the BitchX help files. If you don't