diff options
| author | steve <steve@FreeBSD.org> | 2000-07-07 19:59:26 +0000 |
|---|---|---|
| committer | steve <steve@FreeBSD.org> | 2000-07-07 19:59:26 +0000 |
| commit | 7879264d29ab2a706345ab21de9f9cd3139efc7a (patch) | |
| tree | 0fb8a7b052271f54c6bdf617de3027472d998225 /audio/xmixer/files | |
| parent | c691dd330a3da8e70bfc74508b9fb3b585604a4d (diff) | |
| download | FreeBSD-ports-7879264d29ab2a706345ab21de9f9cd3139efc7a.zip FreeBSD-ports-7879264d29ab2a706345ab21de9f9cd3139efc7a.tar.gz | |
- 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>
Diffstat (limited to 'audio/xmixer/files')
| -rw-r--r-- | audio/xmixer/files/patch-aa | 31 | ||||
| -rw-r--r-- | audio/xmixer/files/patch-ab | 19 |
2 files changed, 27 insertions, 23 deletions
diff --git a/audio/xmixer/files/patch-aa b/audio/xmixer/files/patch-aa index 98a2fd7..1f75338 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 ff41943..32a6ffc 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" |
