summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorSteve Price <steve@FreeBSD.org>2000-07-07 19:59:26 +0000
committerSteve Price <steve@FreeBSD.org>2000-07-07 19:59:26 +0000
commit89b7d2a4465628b128b8f5f7fde5f2a3e2b2a8df (patch)
treedab293772a4c12d5e7f6c0f30c1e8ae09e1cfe4d /audio
parentLocation on MASTER_SITE has changed. (diff)
- Use GTK_CONFIG/GLIB_CONFIG instead of hardcoded gtk12-config/glib12-config
- Support CC/CFLAGS/PREIFX/LOCALBASE/X11BASE/MAKE/etc. properly PR: 19623 Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp>
Notes
Notes: svn path=/head/; revision=30342
Diffstat (limited to 'audio')
-rw-r--r--audio/gmixer/Makefile6
-rw-r--r--audio/gmixer/files/patch-aa2
-rw-r--r--audio/lame/Makefile5
-rw-r--r--audio/lame/files/patch-aa16
-rw-r--r--audio/xmixer/Makefile8
-rw-r--r--audio/xmixer/files/patch-aa31
-rw-r--r--audio/xmixer/files/patch-ab19
7 files changed, 53 insertions, 34 deletions
diff --git a/audio/gmixer/Makefile b/audio/gmixer/Makefile
index 88626fbb6cf9..60ea5c32c97c 100644
--- a/audio/gmixer/Makefile
+++ b/audio/gmixer/Makefile
@@ -15,12 +15,14 @@ MAINTAINER= cpiazza@FreeBSD.org
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
+
+MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}"
ALL_TARGET= gmixer
-pre-install:
- @ ${MKDIR} ${PREFIX}/share/pixmaps
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/gmixer ${PREFIX}/bin
+ @${MKDIR} ${PREFIX}/share/pixmaps
${INSTALL_DATA} ${WRKSRC}/icons/gmixer.xpm ${PREFIX}/share/pixmaps
.include <bsd.port.mk>
diff --git a/audio/gmixer/files/patch-aa b/audio/gmixer/files/patch-aa
index fa5b831ae2a9..688a6fc98822 100644
--- a/audio/gmixer/files/patch-aa
+++ b/audio/gmixer/files/patch-aa
@@ -8,7 +8,7 @@
gmixer: gmixer.c
- $(CC) $(FLAGS) `gtk-config --cflags` `gtk-config --libs` gmixer.c -o gmixer
-+ $(CC) $(CFLAGS) `gtk12-config --cflags` `gtk12-config --libs` gmixer.c -o gmixer
++ $(CC) $(CFLAGS) `$(GTK_CONFIG) --cflags` `$(GTK_CONFIG) --libs` gmixer.c -o gmixer
install: gmixer
install -s -m 755 -o 0 -g 0 gmixer /usr/X11R6/bin/
install -m 644 -o 0 -g 0 icons/gmixer.xpm /usr/share/pixmaps/
diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index 0e8e5b3c7f36..d057d7209b25 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -28,6 +28,11 @@ MAKE_ENV= WITHOUT_X11=${WITHOUT_X11}
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:
diff --git a/audio/lame/files/patch-aa b/audio/lame/files/patch-aa
index e13ac22e4320..47cbc6de3f76 100644
--- a/audio/lame/files/patch-aa
+++ b/audio/lame/files/patch-aa
@@ -1,10 +1,12 @@
---- Makefile.orig Thu Apr 20 01:50:18 2000
-+++ Makefile Thu Apr 20 01:50:39 2000
-@@ -12,7 +12,7 @@
+--- Makefile.orig Sat Jul 1 15:31:35 2000
++++ Makefile Sat Jul 1 15:36:07 2000
+@@ -11,8 +11,8 @@
+
# defaults:
PGM = lame
- CC = gcc
+-CC = gcc
-CC_OPTS = -O
++CC ?= gcc
+CC_OPTS = ${CFLAGS}
GTK =
GTKLIBS =
@@ -13,9 +15,11 @@
##########################################################################
ifeq ($(UNAME),FreeBSD)
# 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
- GTK = -DHAVEGTK `gtk12-config --cflags`
- GTKLIBS = `gtk12-config --libs`
++ GTK = -DHAVEGTK `$(GTK_CONFIG) --cflags`
++ GTKLIBS = `$(GTK_CONFIG) --libs`
+endif
# Comment out next 2 lines if you want to remove VBR histogram capability
BRHIST_SWITCH = -DBRHIST
diff --git a/audio/xmixer/Makefile b/audio/xmixer/Makefile
index 67b3407924e4..06a392cbb231 100644
--- a/audio/xmixer/Makefile
+++ b/audio/xmixer/Makefile
@@ -15,10 +15,14 @@ MAINTAINER= trevor@jpj.net
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-WRKSRC= ${WRKDIR}/xmixer
+GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
+
+WRKSRC= ${WRKDIR}/${PORTNAME}
-GNU_CONFIGURE= yes
USE_GMAKE= yes
+USE_AUTOCONF= yes
+CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}"
+MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}"
MAN1= xmixer.1
diff --git a/audio/xmixer/files/patch-aa b/audio/xmixer/files/patch-aa
index 98a2fd7643bb..1f753385bb25 100644
--- a/audio/xmixer/files/patch-aa
+++ b/audio/xmixer/files/patch-aa
@@ -1,11 +1,20 @@
---- Makefile.in.orig Sat Aug 21 15:25:07 1999
-+++ Makefile.in Wed Oct 27 06:02:28 1999
-@@ -33,16 +33,18 @@
+--- Makefile.in.orig Sun Aug 22 07:25:07 1999
++++ Makefile.in Sat Jul 1 15:58:55 2000
+@@ -13,7 +13,7 @@
+ DEF_MIXER = /dev/mixer
+ VERSION = 0.9.3
+
+-CFLAGS = -O -Wall @CFLAGS@ @X_CFLAGS@ -DDEFAULT_MIXER=\"$(DEF_MIXER)\" \
++CFLAGS = @CFLAGS@ @X_CFLAGS@ -DDEFAULT_MIXER=\"$(DEF_MIXER)\" \
+ -DOSS -I$(top_srcdir) -I$(top_srcdir)/icons \
+ -DVERSION=\"$(VERSION)\"
+ LDFLAGS = @LDFLAGS@
+@@ -33,27 +33,29 @@
mkfb.pl < XMixer.ad > fallback.h
gui_gtk.o: gui_gtk.c
- $(CC) $(CFLAGS) $(INCS) `gtk-config --cflags` -c $<
-+ $(CC) $(CFLAGS) $(INCS) `gtk12-config --cflags` -c $<
++ $(CC) $(CFLAGS) $(INCS) `$(GTK_CONFIG) --cflags` -c $<
%.o: %.c
$(CC) $(CFLAGS) $(INCS) -c $<
@@ -17,20 +26,22 @@
gmixer: $(G_OBJS)
- $(LD) $(LDFLAGS) -o $@ $(G_OBJS) `gtk-config --libs`
-+ $(LD) $(LDFLAGS) -o $@ $(G_OBJS) `gtk12-config --libs`
++ $(LD) $(LDFLAGS) -o $@ $(G_OBJS) `$(GTK_CONFIG) --libs`
Xw/libXw.a:
- cd Xw && make libXw.a
-@@ -51,9 +53,9 @@
+- cd Xw && make libXw.a
++ cd Xw && $(MAKE) libXw.a
+
+ README: index.html
lynx -dump http://www/~rasca/xmixer/index.html | sed "s%//www/%//home.pages.de/%" > README
install: $(PROGS)
- install -o bin xmixer $(bindir)
- install xmixer.man $(mandir)/xmixer.1
- install -o bin gmixer $(bindir)
-+ install -c -o bin xmixer $(bindir)
-+ install -c xmixer.man $(mandir)/xmixer.1
-+ install -c -o bin gmixer $(bindir)
++ ${BSD_INSTALL_PROGRAM} xmixer $(bindir)
++ ${BSD_INSTALL_MAN} xmixer.man $(mandir)/xmixer.1
++ ${BSD_INSTALL_PROGRAM} gmixer $(bindir)
install.lib: libmixer.a
install libsmixer.a $(LIBDIR)
diff --git a/audio/xmixer/files/patch-ab b/audio/xmixer/files/patch-ab
index ff41943f5d59..32a6ffcd799e 100644
--- a/audio/xmixer/files/patch-ab
+++ b/audio/xmixer/files/patch-ab
@@ -1,28 +1,21 @@
---- configure.in.orig Sat Aug 21 05:46:55 1999
-+++ configure.in Tue Oct 26 23:48:36 1999
-@@ -17,21 +17,21 @@
- AC_PATH_X
- AC_PATH_XTRA
- LDFLAGS="$LDFLAGS -L$x_libraries/"
--CFLAGS="$CFLAGS -I$x_includes/"
-+CFLAGS="$CFLAGS -I$x_includes/ -I/usr/X11R6/include/gtk12/"
-
- AC_CHECK_LIB(Xt, XtVaSetValues)
+--- configure.in.orig Sat Aug 21 21:46:55 1999
++++ configure.in Sat Jul 1 15:47:39 2000
+@@ -23,15 +23,15 @@
AC_CHECK_LIB(Xaw, XawPanedGetNumSub)
__cflags=$CFLAGS
-CFLAGS="$CFLAGS `gtk-config --cflags`"
-+CFLAGS="$CFLAGS `gtk12-config --cflags`"
++CFLAGS="$CFLAGS `$GTK_CONFIG --cflags`"
__libs=$LIBS
-LIBS="$LIBS `gtk-config --libs`"
-+LIBS="$LIBS `gtk12-config --libs`"
++LIBS="$LIBS `$GTK_CONFIG --libs`"
AC_CHECK_LIB(gdk, gdk_init)
AC_CHECK_LIB(gtk, gtk_main)
CFLAGS=$__cflags
LIBS=$__libs
-__gtk=`gtk-config --version`
-+__gtk=`gtk12-config --version`
++__gtk=`$GTK_CONFIG --version`
case "$__gtk" in
1.2*)
x_progs="xmixer gmixer"
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-03 22:26:05 +0000