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 /net | |
| 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 'net')
| -rw-r--r-- | net/ggsd/Makefile | 15 | ||||
| -rw-r--r-- | net/ggsd/files/patch-aa | 14 | ||||
| -rw-r--r-- | net/gicq/Makefile | 2 | ||||
| -rw-r--r-- | net/gicq/files/patch-ab | 2 |
4 files changed, 21 insertions, 12 deletions
diff --git a/net/ggsd/Makefile b/net/ggsd/Makefile index efb1d1cb2928..31c8982b32e1 100644 --- a/net/ggsd/Makefile +++ b/net/ggsd/Makefile @@ -18,18 +18,23 @@ MAINTAINER= dima@chg.ru LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 -WRKSRC= ${WRKDIR}/GGSD EXTRACT_CMD= ${TAR} EXTRACT_BEFORE_ARGS= -xf EXTRACT_AFTER_ARGS= # empty +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + +WRKSRC= ${WRKDIR}/GGSD + +MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" + do-install: - @ ${INSTALL_PROGRAM} ${WRKSRC}/ggsd ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/ggsd ${PREFIX}/bin .if !defined(NOPORTDOCS) - @ ${MKDIR} ${PREFIX}/share/doc/ggsd - @ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/ggsd - @ ${INSTALL_DATA} ${WRKSRC}/example.scr ${PREFIX}/share/doc/ggsd + @${MKDIR} ${PREFIX}/share/doc/ggsd + ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/ggsd + ${INSTALL_DATA} ${WRKSRC}/example.scr ${PREFIX}/share/doc/ggsd .endif .include <bsd.port.mk> diff --git a/net/ggsd/files/patch-aa b/net/ggsd/files/patch-aa index 8fe37df8a479..e2ebf9924a23 100644 --- a/net/ggsd/files/patch-aa +++ b/net/ggsd/files/patch-aa @@ -1,11 +1,13 @@ ---- Makefile.orig Fri Feb 12 02:22:22 1999 -+++ Makefile Sat Feb 27 12:37:20 1999 -@@ -1,5 +1,6 @@ - CC=gcc +--- Makefile.orig Fri Feb 12 16:22:22 1999 ++++ Makefile Sat Jul 1 18:31:53 2000 +@@ -1,6 +1,7 @@ +-CC=gcc -CFLAGS=-Wall -O -DUSE_GUI `gtk-config --cflags` -DVERSION=\"0.1\" -LIBS=`gtk-config --libs` ++CC?=gcc +CFLAGS?=-O -+CFLAGS+=-Wall -DUSE_GUI `gtk12-config --cflags` -DVERSION=\"0.1\" -+LIBS=`gtk12-config --libs` ++CFLAGS+=-DUSE_GUI `$(GTK_CONFIG) --cflags` -DVERSION=\"0.1\" ++LIBS=`$(GTK_CONFIG) --libs` all: + $(CC) $(CFLAGS) -o ggsd ggsd.c $(LIBS) diff --git a/net/gicq/Makefile b/net/gicq/Makefile index 5e1ee2216e59..e51496425fda 100644 --- a/net/gicq/Makefile +++ b/net/gicq/Makefile @@ -17,12 +17,14 @@ MAINTAINER= flathill@FreeBSD.org LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ icq.0:${PORTSDIR}/net/libicq +GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_X_PREFIX= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-gnome --disable-nls CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + GLIB_CONFIG="${GLIB_CONFIG}" \ GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" diff --git a/net/gicq/files/patch-ab b/net/gicq/files/patch-ab index cc30b78ef453..504578e8dcdb 100644 --- a/net/gicq/files/patch-ab +++ b/net/gicq/files/patch-ab @@ -5,7 +5,7 @@ else ac_save_LIBS="$LIBS" -LIBS="-licq "`glib-config --libs`" $LIBS" -+LIBS="-licq "`glib12-config --libs`" $LIBS" ++LIBS="-licq "`$GLIB_CONFIG --libs`" $LIBS" cat > conftest.$ac_ext <<EOF #line 3985 "configure" #include "confdefs.h" |