diff options
| author | steve <steve@FreeBSD.org> | 2000-07-08 03:59:26 +0800 |
|---|---|---|
| committer | steve <steve@FreeBSD.org> | 2000-07-08 03:59:26 +0800 |
| commit | 7879264d29ab2a706345ab21de9f9cd3139efc7a (patch) | |
| tree | 0fb8a7b052271f54c6bdf617de3027472d998225 /audio/lame | |
| parent | c691dd330a3da8e70bfc74508b9fb3b585604a4d (diff) | |
| download | freebsd-ports-gnome-7879264d29ab2a706345ab21de9f9cd3139efc7a.tar.gz freebsd-ports-gnome-7879264d29ab2a706345ab21de9f9cd3139efc7a.tar.zst freebsd-ports-gnome-7879264d29ab2a706345ab21de9f9cd3139efc7a.zip | |
- 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/lame')
| -rw-r--r-- | audio/lame/Makefile | 5 | ||||
| -rw-r--r-- | audio/lame/files/patch-aa | 16 |
2 files changed, 15 insertions, 6 deletions
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 |