summaryrefslogtreecommitdiff
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
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
-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
-rw-r--r--biology/xmolwt/Makefile24
-rw-r--r--biology/xmolwt/files/patch-aa22
-rw-r--r--databases/gtksql/Makefile5
-rw-r--r--databases/gtksql/files/patch-aa33
-rw-r--r--databases/gtksql/pkg-plist1
-rw-r--r--editors/gxedit/Makefile9
-rw-r--r--editors/gxedit/files/patch-aa6
-rw-r--r--editors/gxedit/files/patch-ab47
-rw-r--r--editors/gxedit/files/patch-ae4
-rw-r--r--editors/gxedit/pkg-plist1
-rw-r--r--editors/vim/Makefile2
-rw-r--r--editors/vim/files/patch-0214
-rw-r--r--editors/vim5/Makefile2
-rw-r--r--editors/vim5/files/patch-0214
-rw-r--r--editors/vim6/Makefile2
-rw-r--r--editors/vim6/files/patch-0214
-rw-r--r--emulators/xsystem35/Makefile16
-rw-r--r--emulators/xsystem35/files/patch-af4
-rw-r--r--ftp/IglooFTP/Makefile21
-rw-r--r--ftp/IglooFTP/files/patch-aa2
-rw-r--r--ftp/IglooFTP/files/patch-ab24
-rw-r--r--ftp/IglooFTP/files/patch-ac2
-rw-r--r--games/hex/Makefile31
-rw-r--r--games/hex/files/patch-ac4
-rw-r--r--games/hex/pkg-plist9
-rw-r--r--games/xqf/Makefile9
-rw-r--r--games/xqf/files/patch-aa6
-rw-r--r--irc/olirc/Makefile8
-rw-r--r--irc/olirc/files/patch-ab14
-rw-r--r--japanese/gicq/Makefile6
-rw-r--r--japanese/gicq/files/patch-ab2
-rw-r--r--korean/ami/Makefile21
-rw-r--r--korean/ami/files/patch-ca11
-rw-r--r--korean/ami/pkg-plist1
-rw-r--r--korean/gau/Makefile8
-rw-r--r--korean/gau/files/patch-bb4
-rw-r--r--math/geg/Makefile15
-rw-r--r--math/geg/files/patch-ac12
-rw-r--r--misc/snowflake/Makefile3
-rw-r--r--misc/snowflake/files/patch-aa28
-rw-r--r--net-im/gicq/Makefile2
-rw-r--r--net-im/gicq/files/patch-ab2
-rw-r--r--net/ggsd/Makefile15
-rw-r--r--net/ggsd/files/patch-aa14
-rw-r--r--net/gicq/Makefile2
-rw-r--r--net/gicq/files/patch-ab2
-rw-r--r--security/gpasman/Makefile3
-rw-r--r--security/gpasman/files/patch-ab13
-rw-r--r--textproc/gdict/Makefile4
-rw-r--r--textproc/gdict/files/patch-aa2
-rw-r--r--www/erwn/Makefile2
-rw-r--r--www/erwn/files/patch-aa25
-rw-r--r--www/nscache/Makefile11
-rw-r--r--www/nscache/files/patch-aa21
-rw-r--r--www/nscache/files/patch-ab19
-rw-r--r--www/nscache/pkg-plist3
-rw-r--r--x11-clocks/asclock-gtk/Makefile6
-rw-r--r--x11-clocks/asclock-gtk/files/patch-aa34
-rw-r--r--x11-themes/xenophilia/Makefile5
-rw-r--r--x11-themes/xenophilia/files/patch-aa4
-rw-r--r--x11-toolkits/xenophilia/Makefile5
-rw-r--r--x11-toolkits/xenophilia/files/patch-aa4
-rw-r--r--x11-wm/spager/Makefile19
-rw-r--r--x11-wm/spager/files/patch-aa14
-rw-r--r--x11-wm/spager/files/patch-ab4
-rw-r--r--x11/gmessage/Makefile3
-rw-r--r--x11/gmessage/files/patch-aa13
-rw-r--r--x11/gyroscope/Makefile8
-rw-r--r--x11/gyroscope/files/patch-aa26
76 files changed, 515 insertions, 318 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"
diff --git a/biology/xmolwt/Makefile b/biology/xmolwt/Makefile
index e43a19ef0440..10eee7611305 100644
--- a/biology/xmolwt/Makefile
+++ b/biology/xmolwt/Makefile
@@ -1,6 +1,6 @@
-# New ports collection makefile for: xmolwt/gmolwt
-# Date created: 1999-08-30
-# Whom: Ryo MIYAMOTO <rmiya@cc.hirosaki-u.ac.jp>
+# New ports collection makefile for: xmolwt/gmolwt
+# Date created: 1999-08-30
+# Whom: Ryo MIYAMOTO <rmiya@cc.hirosaki-u.ac.jp>
#
# $FreeBSD$
@@ -13,25 +13,25 @@ MAINTAINER= rmiya@cc.hirosaki-u.ac.jp
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-USE_GMAKE= yes
-WRKSRC= ${WRKDIR}/${DISTNAME}
+GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-post-configure:
- (cd ${WRKSRC}; ${CP} Makefile.gtk Makefile)
+WRKSRC= ${WRKDIR}/${DISTNAME}
-pre-install:
- (cd ${WRKSRC}; strip gmolwt)
- ${RM} -rf ${PREFIX}/share/doc/xmolwt
- ${MKDIR} ${PREFIX}/share/doc/xmolwt
+USE_GMAKE= yes
+MAKEFILE= Makefile.gtk
+MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}"
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/gmolwt ${PREFIX}/bin
- (cd ${PREFIX}/bin; ln -s gmolwt molwt)
+ ${LN} -sf gmolwt ${PREFIX}/bin/molwt
+.if !defined(NOPORTDOCS)
+ ${MKDIR} ${PREFIX}/share/doc/xmolwt
${INSTALL_DATA} ${WRKSRC}/Howtouse.* ${PREFIX}/share/doc/xmolwt
${INSTALL_DATA} ${WRKSRC}/Readme ${PREFIX}/share/doc/xmolwt
${INSTALL_DATA} ${WRKSRC}/Xmolwt ${PREFIX}/share/doc/xmolwt
${INSTALL_DATA} ${WRKSRC}/dot.gtkrc ${PREFIX}/share/doc/xmolwt
${INSTALL_DATA} ${WRKSRC}/*.html ${PREFIX}/share/doc/xmolwt
${INSTALL_DATA} ${WRKSRC}/*.gif ${PREFIX}/share/doc/xmolwt
+.endif
.include <bsd.port.mk>
diff --git a/biology/xmolwt/files/patch-aa b/biology/xmolwt/files/patch-aa
index 283e381c93b4..5c212be43bf7 100644
--- a/biology/xmolwt/files/patch-aa
+++ b/biology/xmolwt/files/patch-aa
@@ -1,13 +1,21 @@
-*** Makefile.gtk Sat Aug 28 19:46:47 1999
---- Makefile Mon Aug 30 19:49:21 1999
+*** Makefile.gtk.orig Sat Aug 28 19:46:47 1999
+--- Makefile.gtk Sat Jul 1 15:49:31 2000
***************
-*** 3,8 ****
---- 3,10 ----
- GTKCONFIG = gtk12-config
+*** 1,7 ****
+! CC = gcc
+! CFLAGS = -DGTK
+! GTKCONFIG = gtk12-config
OBJS = molwt.o usage.o element.o reduce.o count.o calculate.o initwidget.o allowcase.o inputformula.o addtolist.o
-+ all: gmolwt
-+
molwt: gmolwt
ln -s gmolwt molwt
+--- 1,9 ----
+! CC ?= gcc
+! CFLAGS += -DGTK
+! GTKCONFIG = $(GTK_CONFIG)
+ OBJS = molwt.o usage.o element.o reduce.o count.o calculate.o initwidget.o allowcase.o inputformula.o addtolist.o
++
++ all: gmolwt
+ molwt: gmolwt
+ ln -s gmolwt molwt
diff --git a/databases/gtksql/Makefile b/databases/gtksql/Makefile
index be3ed04a8942..f7e19baff226 100644
--- a/databases/gtksql/Makefile
+++ b/databases/gtksql/Makefile
@@ -25,7 +25,10 @@ LIB_DEPENDS += mysqlclient.6:${PORTSDIR}/databases/mysql322-client
LIB_DEPENDS += pq.2:${PORTSDIR}/databases/postgresql
.endif
+GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
+
USE_X_PREFIX= yes
+MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}"
pre-patch:
.if !defined(WITH_MYSQL) && !defined(WITH_PGSQL)
@@ -49,7 +52,7 @@ do-install:
@ ${INSTALL_PROGRAM} ${WRKSRC}/gtksql ${PREFIX}/bin
.if !defined(NOPORTDOCS)
@ ${MKDIR} ${PREFIX}/share/doc/gtksql
-.for file in COPYING Changelog README
+.for file in Changelog README
@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/gtksql
.endfor
.endif
diff --git a/databases/gtksql/files/patch-aa b/databases/gtksql/files/patch-aa
index dcf697d8aea9..dd92f953583d 100644
--- a/databases/gtksql/files/patch-aa
+++ b/databases/gtksql/files/patch-aa
@@ -1,6 +1,10 @@
---- Makefile.orig Mon Jul 26 19:30:44 1999
-+++ Makefile Mon Jul 26 19:41:39 1999
-@@ -4,14 +4,14 @@
+--- Makefile.orig Sat Jun 5 22:05:36 1999
++++ Makefile Sat Jul 1 16:10:57 2000
+@@ -1,17 +1,17 @@
+ # Your favorite compilation options here :-)
+-MCFLAGS = -Wall -O -g
++#MCFLAGS = -Wall -O -g
+ LDFLAGS = -lcrypt
# Comment out the variables for the databases that you do not want
# Here, what you need for PostgreSQL
@@ -21,14 +25,27 @@
# Nothing to change below this point...
DBSQLIBS = $(PGSQLIBS) $(MYSQLIBS)
-@@ -24,8 +24,8 @@
+@@ -22,13 +22,13 @@
+ config.o mytoolbar.o
+
OBJS = $(MOBJS) $(DBSQLOBJS)
- CFLAGS = $(MCFLAGS) $(DBSQLFLAGS)
+-CFLAGS = $(MCFLAGS) $(DBSQLFLAGS)
++CFLAGS += $(MCFLAGS) $(DBSQLFLAGS)
-GTKLIBS = `gtk-config --libs`
-GTKCFLAGS = `gtk-config --cflags`
-+GTKLIBS = `gtk12-config --libs`
-+GTKCFLAGS = `gtk12-config --cflags`
++GTKLIBS = `$(GTK_CONFIG) --libs`
++GTKCFLAGS = `$(GTK_CONFIG) --cflags`
all: $(OBJS)
- gcc -o gtksql $(OBJS) $(DBSQLIBS) $(GTKLIBS) $(CFLAGS) $(LDFLAGS)
+- gcc -o gtksql $(OBJS) $(DBSQLIBS) $(GTKLIBS) $(CFLAGS) $(LDFLAGS)
++ $(CC) -o gtksql $(OBJS) $(DBSQLIBS) $(GTKLIBS) $(CFLAGS) $(LDFLAGS)
+
+ clean:
+ rm -f *.o gtksql
+@@ -37,4 +37,4 @@
+ cp gtksql $(DESTDIR)usr/bin/
+
+ .c.o:
+- gcc $(CFLAGS) $(GTKCFLAGS) $(DBSQLCFLAGS) -c $*.c -o ./$*.o
++ $(CC) $(CFLAGS) $(GTKCFLAGS) $(DBSQLCFLAGS) -c $*.c -o ./$*.o
diff --git a/databases/gtksql/pkg-plist b/databases/gtksql/pkg-plist
index d1a8c39e3280..7672689c1fe2 100644
--- a/databases/gtksql/pkg-plist
+++ b/databases/gtksql/pkg-plist
@@ -1,5 +1,4 @@
bin/gtksql
-share/doc/gtksql/COPYING
share/doc/gtksql/Changelog
share/doc/gtksql/README
@dirrm share/doc/gtksql
diff --git a/editors/gxedit/Makefile b/editors/gxedit/Makefile
index b6104d846b0d..07dd7bf37ee7 100644
--- a/editors/gxedit/Makefile
+++ b/editors/gxedit/Makefile
@@ -16,9 +16,15 @@ MAINTAINER= dom@myrddin.demon.co.uk
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
+
USE_X_PREFIX= yes
+MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}"
ALL_TARGET= gxedit
+post-patch:
+ @${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/config.h
+
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/gtk-shell ${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKSRC}/gxedit ${PREFIX}/bin
@@ -29,10 +35,9 @@ do-install:
.for i in popmail.scr traceroute.scr userinfo.scr www.scr
${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/gxedit
.endfor
-
.if !defined(NOPORTDOCS)
${MKDIR} ${PREFIX}/share/doc/gxedit/
-.for i in COPYING charmap.txt manual.ps manual.txt quickref.ps quickref.txt
+.for i in charmap.txt manual.ps manual.txt quickref.ps quickref.txt
${INSTALL_DATA} ${WRKSRC}/docs/$i ${PREFIX}/share/doc/gxedit/
.endfor
.endif
diff --git a/editors/gxedit/files/patch-aa b/editors/gxedit/files/patch-aa
index 1945abcb42ee..d4e7e3c0de27 100644
--- a/editors/gxedit/files/patch-aa
+++ b/editors/gxedit/files/patch-aa
@@ -16,9 +16,9 @@
-#define EMACS "/usr/bin/emacs"
-#define DES "/bin/des"
-#define IDEA "/bin/idea"
-+#define EMACS "/usr/local/bin/emacs"
-+#define DES "/usr/local/bin/des"
-+#define IDEA "/usr/local/bin/idea"
++#define EMACS "%%LOCALBASE%%/bin/emacs"
++#define DES "%%LOCALBASE%%/bin/des"
++#define IDEA "%%LOCALBASE%%/bin/idea"
#define XTERM "/usr/X11R6/bin/xterm"
#define AWK "awk"
#define SED "sed"
diff --git a/editors/gxedit/files/patch-ab b/editors/gxedit/files/patch-ab
index 22343cd85df9..8fbaa5ec96fd 100644
--- a/editors/gxedit/files/patch-ab
+++ b/editors/gxedit/files/patch-ab
@@ -1,15 +1,15 @@
---- Makefile.orig Fri Mar 19 16:31:49 1999
-+++ Makefile Mon Apr 5 17:00:51 1999
+--- Makefile.orig Fri Mar 19 15:01:49 1999
++++ Makefile Sat Jul 1 16:25:24 2000
@@ -3,12 +3,13 @@
INSTALL_DIR = /usr/X11R6/bin/
DOCS = /usr/doc
SHARE = /usr/share
-CFLAGS = `gtk-config --cflags` -I/usr/local/include -I. -O -Wall -DVERSION=\"1.23\"
+CFLAGS ?= -O2
-+CFLAGS += `gtk12-config --cflags` -I/usr/local/include -I. -Wall -DVERSION=\"1.23\"
++CFLAGS += `$(GTK_CONFIG) --cflags` -I. -DVERSION=\"1.23\"
GTKEDITOR_CFLAGS = -I../gtkeditor-0.0.6 -I../gtkeditor-0.0.6/gtkeditor
-LIBS = `gtk-config --libs`
-+LIBS = `gtk12-config --libs`
++LIBS = `$(GTK_CONFIG) --libs`
OBJS = gxedit.o net.o utils.o
GTKEDITOR_OBJS = ../gtkeditor-0.0.6/gtkeditor/gtkeditor.o ../gtkeditor-0.0.6/regex/regex.o -L../gtkeditor-0.0.6 -lgtkeditor -lregex -lguile -ldl -ltermcap
-CC = gcc
@@ -17,19 +17,50 @@
all:
@echo "Use ./setup"
-@@ -23,7 +24,6 @@
+@@ -23,8 +24,7 @@
$(CC) $(CFLAGS) -c utils.c
$(CC) $(CFLAGS) -o $(BIN_DIR)gxedit $(OBJS) $(LIBS)
@(rm -f ./.chk_config)
- (cd xproc-src; make BIN_DIR=../; cd ..)
- (cd gtk-shell-src; make BIN_DIR=../; cd ..)
+- (cd gtk-shell-src; make BIN_DIR=../; cd ..)
++ (cd gtk-shell-src; $(MAKE) BIN_DIR=../; cd ..)
gxe-with-gtkeditor:
-@@ -32,7 +32,6 @@
+ $(CC) $(CFLAGS) $(GTKEDITOR_CFLAGS) -c gxedit.c
+@@ -32,19 +32,18 @@
$(CC) $(CFLAGS) $(GTKEDITOR_CFLAGS) -c utils.c
$(CC) $(CFLAGS) $(GTKEDITOR_CFLAGS) -o $(BIN_DIR)gxedit $(OBJS) $(GTKEDITOR_OBJS) $(LIBS)
@(rm -f ./.chk_config)
- (cd xproc-src; make BIN_DIR=../; cd ..)
- (cd gtk-shell-src; make BIN_DIR=../; cd ..)
+- (cd gtk-shell-src; make BIN_DIR=../; cd ..)
++ (cd gtk-shell-src; $(MAKE) BIN_DIR=../; cd ..)
say:
+- (cd access; make BIN_DIR=../)
++ (cd access; $(MAKE) BIN_DIR=../)
+
+ say-install:
+ $(INSTALL) -m 0755 say $(INSTALL_DIR)say
+
+ clean:
+ rm -f *.o $(BIN_DIR)gxedit $(BIN_DIR)say $(BIN_DIR)xproc $(BIN_DIR)gtk-shell $(BIN_DIR)libbabel.a *.log core
+- (cd gtk-shell-src; make clean; cd ..)
+- (cd xproc-src; make clean; cd ..)
++ (cd gtk-shell-src; $(MAKE) clean; cd ..)
++ (cd xproc-src; $(MAKE) clean; cd ..)
+
+ install:
+ $(INSTALL) -m 0755 $(BIN_DIR)gxedit $(INSTALL_DIR)gxedit
+@@ -75,9 +74,9 @@
+ $(CC) $(CFLAGS) -c net.c
+ $(CC) $(CFLAGS) -c utils.c
+ $(CC) $(CFLAGS) -o gxedit $(OBJS) -L/usr/local/lib -L/usr/X11R6/lib /usr/lib/libgtk.a /usr/lib/libgdk.a /usr/lib/libglib.a /usr/lib/libgmodule.a -lXext -lX11 -lm -ldl
+- (cd xproc-src; make distro BIN_DIR=../; cd ..)
+- (cd gtk-shell-src; make distro BIN_DIR=../; cd ..)
+- (cd access; make BIN_DIR=../; cd ..)
++ (cd xproc-src; $(MAKE) distro BIN_DIR=../; cd ..)
++ (cd gtk-shell-src; $(MAKE) distro BIN_DIR=../; cd ..)
++ (cd access; $(MAKE) BIN_DIR=../; cd ..)
+ mv say dist/
+ mv gxedit dist/
+ mv xproc dist/
diff --git a/editors/gxedit/files/patch-ae b/editors/gxedit/files/patch-ae
index c4d7e1ab3f3f..f80887de5048 100644
--- a/editors/gxedit/files/patch-ae
+++ b/editors/gxedit/files/patch-ae
@@ -6,8 +6,8 @@
-LIBS = `gtk-config --libs`
-CC = gcc
+CFLAGS ?= -O2
-+CFLAGS += `gtk12-config --cflags` -I. -Wall
-+LIBS = `gtk12-config --libs`
++CFLAGS += `$(GTK_CONFIG) --cflags` -I.
++LIBS = `$(GTK_CONFIG) --libs`
+CC ?= gcc
all:
diff --git a/editors/gxedit/pkg-plist b/editors/gxedit/pkg-plist
index 7a8cd217bc62..2073355419ea 100644
--- a/editors/gxedit/pkg-plist
+++ b/editors/gxedit/pkg-plist
@@ -7,7 +7,6 @@ share/gxedit/popmail.scr
share/gxedit/traceroute.scr
share/gxedit/userinfo.scr
share/gxedit/www.scr
-share/doc/gxedit/COPYING
share/doc/gxedit/charmap.txt
share/doc/gxedit/manual.ps
share/doc/gxedit/manual.txt
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 54657283759e..35daa942b62a 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -53,6 +53,8 @@ MAKE_FLAGS:= X_LIBS=-lxpg4 CONF_OPT_MAX="--enable-max-features" ${MAKE_FLAGS}
.if defined(HAVE_GTK)
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
+CONFIGURE= GTK_CONFIG="${GTK_CONFIG}"
MAKE_FLAGS:= CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${X11BASE} --enable-multibyte --enable-fontset --enable-multibyte --enable-xim" ${MAKE_FLAGS}
.elif defined(HAVE_MOTIF)
REQUIRES_MOTIF= yes
diff --git a/editors/vim/files/patch-02 b/editors/vim/files/patch-02
index 0b0b26335fdc..f74cb6530149 100644
--- a/editors/vim/files/patch-02
+++ b/editors/vim/files/patch-02
@@ -1,19 +1,5 @@
--- configure.orig Sun Sep 19 03:59:45 1999
+++ configure Sun Oct 24 21:47:29 1999
-@@ -2906,11 +2906,11 @@
-
- if test "x$gtk_config_prefix" != "x" ; then
- gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
-- GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
-+ GTK_CONFIG=$gtk_config_prefix/bin/gtk12-config
- fi
- if test "x$gtk_config_exec_prefix" != "x" ; then
- gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
-- GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
-+ GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk12-config
- fi
- if test "X$GTK_CONFIG" = "X"; then
- # Extract the first word of "gtk-config", so it can be a program name with args.
@@ -3098,7 +3098,7 @@
gui_libs="`echo $x_libraries|sed 's%/^/^/*$%%'` `echo "$gui_XXX" | sed s/XXX/lib/g` `echo "$GUI_INC_LOC" | sed s/include/lib/` $GUI_LIB_LOC"
GUI_LIB_LOC=
diff --git a/editors/vim5/Makefile b/editors/vim5/Makefile
index 54657283759e..35daa942b62a 100644
--- a/editors/vim5/Makefile
+++ b/editors/vim5/Makefile
@@ -53,6 +53,8 @@ MAKE_FLAGS:= X_LIBS=-lxpg4 CONF_OPT_MAX="--enable-max-features" ${MAKE_FLAGS}
.if defined(HAVE_GTK)
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
+CONFIGURE= GTK_CONFIG="${GTK_CONFIG}"
MAKE_FLAGS:= CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${X11BASE} --enable-multibyte --enable-fontset --enable-multibyte --enable-xim" ${MAKE_FLAGS}
.elif defined(HAVE_MOTIF)
REQUIRES_MOTIF= yes
diff --git a/editors/vim5/files/patch-02 b/editors/vim5/files/patch-02
index 0b0b26335fdc..f74cb6530149 100644
--- a/editors/vim5/files/patch-02
+++ b/editors/vim5/files/patch-02
@@ -1,19 +1,5 @@
--- configure.orig Sun Sep 19 03:59:45 1999
+++ configure Sun Oct 24 21:47:29 1999
-@@ -2906,11 +2906,11 @@
-
- if test "x$gtk_config_prefix" != "x" ; then
- gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
-- GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
-+ GTK_CONFIG=$gtk_config_prefix/bin/gtk12-config
- fi
- if test "x$gtk_config_exec_prefix" != "x" ; then
- gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
-- GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
-+ GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk12-config
- fi
- if test "X$GTK_CONFIG" = "X"; then
- # Extract the first word of "gtk-config", so it can be a program name with args.
@@ -3098,7 +3098,7 @@
gui_libs="`echo $x_libraries|sed 's%/^/^/*$%%'` `echo "$gui_XXX" | sed s/XXX/lib/g` `echo "$GUI_INC_LOC" | sed s/include/lib/` $GUI_LIB_LOC"
GUI_LIB_LOC=
diff --git a/editors/vim6/Makefile b/editors/vim6/Makefile
index 54657283759e..35daa942b62a 100644
--- a/editors/vim6/Makefile
+++ b/editors/vim6/Makefile
@@ -53,6 +53,8 @@ MAKE_FLAGS:= X_LIBS=-lxpg4 CONF_OPT_MAX="--enable-max-features" ${MAKE_FLAGS}
.if defined(HAVE_GTK)
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
+CONFIGURE= GTK_CONFIG="${GTK_CONFIG}"
MAKE_FLAGS:= CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${X11BASE} --enable-multibyte --enable-fontset --enable-multibyte --enable-xim" ${MAKE_FLAGS}
.elif defined(HAVE_MOTIF)
REQUIRES_MOTIF= yes
diff --git a/editors/vim6/files/patch-02 b/editors/vim6/files/patch-02
index 0b0b26335fdc..f74cb6530149 100644
--- a/editors/vim6/files/patch-02
+++ b/editors/vim6/files/patch-02
@@ -1,19 +1,5 @@
--- configure.orig Sun Sep 19 03:59:45 1999
+++ configure Sun Oct 24 21:47:29 1999
-@@ -2906,11 +2906,11 @@
-
- if test "x$gtk_config_prefix" != "x" ; then
- gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
-- GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
-+ GTK_CONFIG=$gtk_config_prefix/bin/gtk12-config
- fi
- if test "x$gtk_config_exec_prefix" != "x" ; then
- gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
-- GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
-+ GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk12-config
- fi
- if test "X$GTK_CONFIG" = "X"; then
- # Extract the first word of "gtk-config", so it can be a program name with args.
@@ -3098,7 +3098,7 @@
gui_libs="`echo $x_libraries|sed 's%/^/^/*$%%'` `echo "$gui_XXX" | sed s/XXX/lib/g` `echo "$GUI_INC_LOC" | sed s/include/lib/` $GUI_LIB_LOC"
GUI_LIB_LOC=
diff --git a/emulators/xsystem35/Makefile b/emulators/xsystem35/Makefile
index 0150cab6d03a..82ffb38784cc 100644
--- a/emulators/xsystem35/Makefile
+++ b/emulators/xsystem35/Makefile
@@ -9,14 +9,18 @@ PORTNAME= xsystem35
PORTVERSION= 1.2.5.1
CATEGORIES= emulators
MASTER_SITES= http://www.aist-nara.ac.jp/~masaki-c/private/unitbase/xsys35/down/
-DISTNAME= xsystem35-1.2.5-1
+DISTNAME= ${PORTNAME}-1.2.5-1
MAINTAINER= k5@cheerful.com
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-USE_IMAKE= YES
+GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
+
WRKSRC= ${WRKDIR}/${DISTNAME}/src
+
+USE_IMAKE= YES
+MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}"
PKGMESSAGE= ${WRKSRC}/MESSAGE
DOC_FILES= BUGS ChangeLog FAQ GRFMT.TXT INSTALL MISCGAME.TXT README \
@@ -42,20 +46,18 @@ pre-configure:
.endif
do-install:
- @${INSTALL_PROGRAM} ${WRKSRC}/xsystem35 ${PREFIX}/bin
- @${INSTALL_SCRIPT} ${WRKSRC}/../contrib/instgame ${PREFIX}/bin
-
-post-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/xsystem35 ${PREFIX}/bin
+ ${INSTALL_SCRIPT} ${WRKSRC}/../contrib/instgame ${PREFIX}/bin
.if !defined(NOPORTDOCS)
@${MKDIR} ${PREFIX}/share/doc/ja/xsystem35
@(cd ${WRKSRC}/../doc;\
${INSTALL_MAN} ${DOC_FILES} ${PREFIX}/share/doc/ja/xsystem35)
+.endif
@${MKDIR} ${PREFIX}/share/examples/xsystem35
@${INSTALL_DATA} ${WRKSRC}/xsys35rc.sample ${PREFIX}/share/examples/xsystem35
@(cd ${WRKSRC}/../contrib; \
${INSTALL_DATA} ${EXAMPLES} ${PREFIX}/share/examples/xsystem35)
@${SED} -e s,PREFIX,${PREFIX}, ${PKGDIR}/MESSAGE > ${WRKSRC}/MESSAGE
@${CAT} ${WRKSRC}/MESSAGE
-.endif
.include <bsd.port.post.mk>
diff --git a/emulators/xsystem35/files/patch-af b/emulators/xsystem35/files/patch-af
index b57a61abae69..1b00c1f29130 100644
--- a/emulators/xsystem35/files/patch-af
+++ b/emulators/xsystem35/files/patch-af
@@ -5,14 +5,14 @@
* include / library / definition
*/
-SYS_LIBRARIES = -lm `gtk-config --libs`
-+SYS_LIBRARIES = -lm `gtk12-config --libs`
++SYS_LIBRARIES = -lm `$(GTK_CONFIG) --libs`
#ifdef ENABLE_ESD
EXTRA_LIBRARIES = $(OSDEPLIB) -lesd
#else
EXTRA_LIBRARIES = $(OSDEPLIB)
#endif
-EXTRA_INCLUDES = `gtk-config --cflags` $(OSDEPINC)
-+EXTRA_INCLUDES = `gtk12-config --cflags` $(OSDEPINC)
++EXTRA_INCLUDES = `$(GTK_CONFIG) --cflags` $(OSDEPINC)
EXTRA_DEFINES = $(OSDEPDEF)
/*
diff --git a/ftp/IglooFTP/Makefile b/ftp/IglooFTP/Makefile
index 5bfe7740fb94..8fd1e7c8fa53 100644
--- a/ftp/IglooFTP/Makefile
+++ b/ftp/IglooFTP/Makefile
@@ -15,25 +15,24 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}.src
MAINTAINER= will@FreeBSD.org
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-USE_X_PREFIX= yes
+GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-WRKSRC= ${WRKDIR}/IglooFTP-0.6.1
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
-do-build:
- @ cd ${WRKSRC}/src; ${MAKE}
+USE_X_PREFIX= yes
+MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}"
+ALL_TARGET= IglooFTP
-do-install:
- @ cd ${WRKSRC}/src; ${MAKE} install
- @ ${RM} ${PREFIX}/share/IglooFTP/docs/LICENSE~
+post-extract:
+ @${RM} ${WRKSRC}/../share/docs/LICENSE~
post-install:
.if !defined(NOPORTDOCS)
- @ ${MKDIR} ${PREFIX}/share/doc/IglooFTP
+ @${MKDIR} ${PREFIX}/share/doc/IglooFTP
.for file in AUTHORS BUGS COPYRIGHT THANKS TODO
- @ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/IglooFTP
+ ${INSTALL_DATA} ${WRKSRC}/../${file} ${PREFIX}/share/doc/IglooFTP
.endfor
.endif
diff --git a/ftp/IglooFTP/files/patch-aa b/ftp/IglooFTP/files/patch-aa
index 48779d2d5a34..662e5bc3babe 100644
--- a/ftp/IglooFTP/files/patch-aa
+++ b/ftp/IglooFTP/files/patch-aa
@@ -1,4 +1,4 @@
---- src/FTP.c Thu Apr 15 20:05:13 1999
+--- FTP.c Thu Apr 15 20:05:13 1999
+++ /home/andy/tmp/wrk/src/FTP.c Mon May 3 12:59:56 1999
@@ -15,12 +15,12 @@
*/
diff --git a/ftp/IglooFTP/files/patch-ab b/ftp/IglooFTP/files/patch-ab
index 918fad7482b1..4f00433a8c8f 100644
--- a/ftp/IglooFTP/files/patch-ab
+++ b/ftp/IglooFTP/files/patch-ab
@@ -1,5 +1,5 @@
---- src/Makefile.orig Thu Apr 15 11:05:15 1999
-+++ src/Makefile Fri May 28 18:43:37 1999
+--- Makefile.orig Thu Apr 15 11:05:15 1999
++++ Makefile Fri May 28 18:43:37 1999
@@ -1,14 +1,15 @@
SHELL=/bin/sh
-CC = gcc
@@ -10,8 +10,8 @@
+CC?= gcc
+C_FLAGS = $(CFLAGS)
+# -Wall -g -O2 -m486 -fno-strength-reduce
-+GTK_CFLAGS = `gtk12-config --cflags`
-+GTK_LIBS = `gtk12-config --libs`
++GTK_CFLAGS = `$(GTK_CONFIG) --cflags`
++GTK_LIBS = `$(GTK_CONFIG) --libs`
+LFLAGS = $(GTK_LIBS) -lXmu -lXt -lSM -lICE
PROGNAME = IglooFTP
PROGNAME-STATIC = IglooFTP-static
@@ -34,14 +34,14 @@
- /usr/bin/install -m 644 ../share/bookmarks/* $(SHARE_PATH)/bookmarks/
- /usr/bin/install -m 644 ../share/app_ass/* $(SHARE_PATH)/app_ass/
- /usr/bin/install -m 644 ../share/gtkrc $(SHARE_PATH)/gtkrc
-+ /usr/bin/install -c -s -m 755 $(PROGNAME) $(BIN_PATH)
-+ /usr/bin/install -c -m 644 ../share/docs/* $(SHARE_PATH)/docs/
-+ /usr/bin/install -c -m 644 ../share/html/*.* $(SHARE_PATH)/html/
-+ /usr/bin/install -c -m 644 ../share/html/images/*.* $(SHARE_PATH)/html/images/
-+ /usr/bin/install -c -m 644 ../share/xpm/* $(SHARE_PATH)/xpm/
-+ /usr/bin/install -c -m 644 ../share/bookmarks/* $(SHARE_PATH)/bookmarks/
-+ /usr/bin/install -c -m 644 ../share/app_ass/* $(SHARE_PATH)/app_ass/
-+ /usr/bin/install -c -m 644 ../share/gtkrc $(SHARE_PATH)/gtkrc
++ ${BSD_INSTALL_PROGRAM} $(PROGNAME) $(BIN_PATH)
++ ${BSD_INSTALL_DATA} ../share/docs/* $(SHARE_PATH)/docs/
++ ${BSD_INSTALL_DATA} ../share/html/*.* $(SHARE_PATH)/html/
++ ${BSD_INSTALL_DATA} ../share/html/images/*.* $(SHARE_PATH)/html/images/
++ ${BSD_INSTALL_DATA} ../share/xpm/* $(SHARE_PATH)/xpm/
++ ${BSD_INSTALL_DATA} ../share/bookmarks/* $(SHARE_PATH)/bookmarks/
++ ${BSD_INSTALL_DATA} ../share/app_ass/* $(SHARE_PATH)/app_ass/
++ ${BSD_INSTALL_DATA} ../share/gtkrc $(SHARE_PATH)/gtkrc
diff --git a/ftp/IglooFTP/files/patch-ac b/ftp/IglooFTP/files/patch-ac
index 9175e4a06f14..2d45efc8ac97 100644
--- a/ftp/IglooFTP/files/patch-ac
+++ b/ftp/IglooFTP/files/patch-ac
@@ -1,4 +1,4 @@
---- src/main.c Thu Apr 15 20:05:15 1999
+--- main.c Thu Apr 15 20:05:15 1999
+++ /home/andy/tmp/wrk/src/main.c Mon May 3 13:42:28 1999
@@ -20,6 +20,9 @@
#include <stdlib.h>
diff --git a/games/hex/Makefile b/games/hex/Makefile
index f8f0884bf473..6ab48d968bc3 100644
--- a/games/hex/Makefile
+++ b/games/hex/Makefile
@@ -13,29 +13,30 @@ MASTER_SITES= http://www.nott.ac.uk/~psystrj/ \
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= Imlib.5:${PORTSDIR}/graphics/imlib \
- gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+LIB_DEPENDS= Imlib.5:${PORTSDIR}/graphics/imlib
-USE_X_PREFIX= YES
+GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-USE_GMAKE= YES
WRKSRC= ${WRKDIR}/${DISTNAME}
-
-pre-install:
- @${MKDIR} ${PREFIX}/share/hex
- @${MKDIR} ${PREFIX}/share/hex/levels
- @${MKDIR} ${PREFIX}/share/hex/graphics
+USE_X_PREFIX= YES
+USE_GMAKE= YES
+MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}"
do-install:
- @${INSTALL_PROGRAM} ${WRKSRC}/hex ${PREFIX}/bin/hex
- @${INSTALL_DATA} ${WRKSRC}/HISTORY ${PREFIX}/share/hex/HISTORY
- @${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/hex/README
- @${INSTALL_DATA} ${WRKSRC}/TODO ${PREFIX}/share/hex/TODO
+ ${INSTALL_PROGRAM} ${WRKSRC}/hex ${PREFIX}/bin
+ @${MKDIR} ${PREFIX}/share/hex/graphics
.for i in 0 1 2 3 4 5 6 7 8
- @${INSTALL_DATA} ${WRKSRC}/graphics/ball${i}.png \
+ ${INSTALL_DATA} ${WRKSRC}/graphics/ball${i}.png \
${PREFIX}/share/hex/graphics/ball${i}.png
.endfor
- @${INSTALL_DATA} ${WRKSRC}/levels/Level1 \
+ @${MKDIR} ${PREFIX}/share/hex/levels
+ ${INSTALL_DATA} ${WRKSRC}/levels/Level1 \
${PREFIX}/share/hex/levels/Level1
+.if !defined(NOPORTDOCS)
+ @${MKDIR} ${PREFIX}/share/doc/hex
+.for file in HISTORY README TODO
+ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/hex
+.endfor
+.endif
.include <bsd.port.mk>
diff --git a/games/hex/files/patch-ac b/games/hex/files/patch-ac
index ef00d2dd9927..379521b6dbb7 100644
--- a/games/hex/files/patch-ac
+++ b/games/hex/files/patch-ac
@@ -11,11 +11,11 @@
.c.o:
- $(CC) `gtk-config --cflags` -c $*.c -o $*.o
-+ $(CC) $(CFLAGS) `gtk12-config --cflags` -c $*.c -o $*.o
++ $(CC) $(CFLAGS) `$(GTK_CONFIG) --cflags` -c $*.c -o $*.o
hex: $(OBJS)
- $(CC) $(LIBS) `gtk-config --libs` $(OBJS) -o $@
-+ $(CC) $(LIBS) `gtk12-config --libs` $(OBJS) -o $@
++ $(CC) $(LIBS) `$(GTK_CONFIG) --libs` $(OBJS) -o $@
clean:
rm -f *~ *.o hex
diff --git a/games/hex/pkg-plist b/games/hex/pkg-plist
index 58d0f267b5f2..86bb3435740b 100644
--- a/games/hex/pkg-plist
+++ b/games/hex/pkg-plist
@@ -1,5 +1,7 @@
bin/hex
-share/hex/levels/Level1
+share/doc/hex/HISTORY
+share/doc/hex/README
+share/doc/hex/TODO
share/hex/graphics/ball0.png
share/hex/graphics/ball1.png
share/hex/graphics/ball2.png
@@ -9,9 +11,8 @@ share/hex/graphics/ball5.png
share/hex/graphics/ball6.png
share/hex/graphics/ball7.png
share/hex/graphics/ball8.png
-share/hex/README
-share/hex/TODO
-share/hex/HISTORY
+share/hex/levels/Level1
@dirrm share/hex/levels
@dirrm share/hex/graphics
@dirrm share/hex
+@dirrm share/doc/hex
diff --git a/games/xqf/Makefile b/games/xqf/Makefile
index c17554563e90..a9829c89b9b3 100644
--- a/games/xqf/Makefile
+++ b/games/xqf/Makefile
@@ -13,12 +13,11 @@ MASTER_SITES= ftp://ftp.linuxgames.com/xqf/
MAINTAINER= steve@farrell.org
RUN_DEPENDS= qstat:${PORTSDIR}/games/qstat
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+
+GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
USE_GMAKE= yes
-MAKE_ENV= INSTALL_PROGRAM="${INSTALL_PROGRAM}"
-.ifdef CC
-MAKE_ENV+= CC="${CC}"
-.endif
+MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}"
.include <bsd.port.mk>
diff --git a/games/xqf/files/patch-aa b/games/xqf/files/patch-aa
index ca7fccaa8f75..1f9cf6f14d5f 100644
--- a/games/xqf/files/patch-aa
+++ b/games/xqf/files/patch-aa
@@ -8,8 +8,8 @@
-CFLAGS = -O2 -g -Wall `gtk-config --cflags` $(EXTRA_CFLAGS)
-LDFLAGS = `gtk-config --libs`
+CC ?= gcc
-+CFLAGS += -Wall `gtk12-config --cflags` $(EXTRA_CFLAGS)
-+LDFLAGS = `gtk12-config --libs`
++CFLAGS += `$(GTK_CONFIG) --cflags` $(EXTRA_CFLAGS)
++LDFLAGS = `$(GTK_CONFIG) --libs`
-INSTALL_ROOT = /usr/local
+INSTALL_ROOT = ${PREFIX}
@@ -21,7 +21,7 @@
install:
- install -s -m 755 -g root -o root $(TARGET) $(INSTALL_ROOT)/bin
-+ ${INSTALL_PROGRAM} $(TARGET) $(INSTALL_ROOT)/bin
++ ${BSD_INSTALL_PROGRAM} $(TARGET) $(INSTALL_ROOT)/bin
dist-clean clean:
rm -f *.[oasi] *~ core $(TARGET) Makefile.old
diff --git a/irc/olirc/Makefile b/irc/olirc/Makefile
index d72f7cb1b982..91070b9465d4 100644
--- a/irc/olirc/Makefile
+++ b/irc/olirc/Makefile
@@ -14,10 +14,14 @@ MAINTAINER= nox@jelal.kn-bremen.de
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
+GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
+
USE_BZIP2= yes
-GNU_CONFIGURE= yes
USE_X_PREFIX= yes
-CONFIGURE_ENV= GTK_CONFIG=${X11BASE}/bin/gtk12-config
+GNU_CONFIGURE= yes
+CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" \
+ GTK_CONFIG="${GTK_CONFIG}"
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/olirc ${PREFIX}/bin
diff --git a/irc/olirc/files/patch-ab b/irc/olirc/files/patch-ab
index 24cd66471e9b..ab58fbcaf55f 100644
--- a/irc/olirc/files/patch-ab
+++ b/irc/olirc/files/patch-ab
@@ -1,10 +1,20 @@
-Index: configure
+--- configure.orig Mon Oct 11 16:00:00 1999
++++ configure Sat Jul 1 17:06:30 2000
@@ -1714,7 +1714,7 @@
if test "$gtk_config_major_version" = "1" -a "$gtk_config_minor_version" = 0 ; then
GTK_OBJS_STATIC="$GTK_PREFIX/lib/libgtk.a $GTK_PREFIX/lib/libgdk.a $GTK_PREFIX/lib/libglib.a"
else
- GLIB_PREFIX=`glib-config --prefix 2> /dev/null`
-+ GLIB_PREFIX=`glib12-config --prefix 2> /dev/null`
++ GLIB_PREFIX=`$GLIB_CONFIG --prefix 2> /dev/null`
GTK_OBJS_STATIC="$GTK_PREFIX/lib/libgtk.a $GTK_PREFIX/lib/libgdk.a $GLIB_PREFIX/lib/libglib.a $GLIB_PREFIX/lib/libgmodule.a"
fi
+@@ -2393,7 +2393,7 @@
+ echo "Configuration complete."
+ echo ""
+
+-echo "Ol-Irc will use GTK+ version : `gtk-config --version`"
++echo "Ol-Irc will use GTK+ version : `$GTK_CONFIG --version`"
+
+ echo ""
+
diff --git a/japanese/gicq/Makefile b/japanese/gicq/Makefile
index 6c5fe586b02f..6805eb22acb5 100644
--- a/japanese/gicq/Makefile
+++ b/japanese/gicq/Makefile
@@ -23,13 +23,15 @@ MAINTAINER= flathill@FreeBSD.org
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
icq.0:${PORTSDIR}/japanese/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= GTK_CONFIG="${GTK_CONFIG}" \
- CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ GLIB_CONFIG="${GLIB_CONFIG}" \
+ GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
.include <bsd.port.mk>
diff --git a/japanese/gicq/files/patch-ab b/japanese/gicq/files/patch-ab
index cc30b78ef453..504578e8dcdb 100644
--- a/japanese/gicq/files/patch-ab
+++ b/japanese/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"
diff --git a/korean/ami/Makefile b/korean/ami/Makefile
index 8b52d083c631..5cfbe1d43c58 100644
--- a/korean/ami/Makefile
+++ b/korean/ami/Makefile
@@ -17,12 +17,15 @@ MAINTAINER= cjh@kr.freebsd.org
LIB_DEPENDS= gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
+GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
+GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
+
USE_X_PREFIX= YES
-GNU_CONFIGURE= YES
USE_GMAKE= YES
-CONFIGURE_ENV= GLIB_CONFIG=${LOCALBASE}/bin/glib12-config \
- GTK_CONFIG=${X11BASE}/bin/gtk12-config
-CONFIGURE_ARGS+= --with-hangul-keyboard=2
+GNU_CONFIGURE= YES
+CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}"
+CONFIGURE_ARGS= --with-hangul-keyboard=2
+MAKE_ENV= GLIB_CONFIG="${GLIB_CONFIG}"
# gnome panel applet support
.if defined(WITH_GNOME_APPLET)
@@ -33,15 +36,15 @@ CONFIGURE_ARGS+= --enable-gnome-applet
post-build:
@cd ${WRKSRC}/hanjadic; \
- ${MAKE}
+ ${MAKE_ENV} ${MAKE} ${MAKE_ARGS}
post-install:
${INSTALL_PROGRAM} ${WRKSRC}/hanjadic/hanja-hwp2ami ${PREFIX}/bin
# patch XLC_LOCALE for ko_KR.EUC(harmless)
- if [ -f ${PREFIX}/lib/X11/locale/ko/XLC_LOCALE ]; then \
- ${MV} -f ${PREFIX}/lib/X11/locale/ko/XLC_LOCALE \
- ${PREFIX}/lib/X11/locale/ko/XLC_LOCALE.orig; \
+ if [ -f ${PREFIX}/lib/X11/locale/ko/XLC_LOCALE; then \
+ ${MV} -f ${PREFIX}/lib/X11/locale/ko/XLC_LOCALE \
+ ${PREFIX}/lib/X11/locale/ko/XLC_LOCALE.orig; \
fi
${INSTALL_DATA} ${FILESDIR}/XLC_LOCALE \
${PREFIX}/lib/X11/locale/ko/
@@ -50,7 +53,7 @@ post-install:
${INSTALL_DATA} ${FILESDIR}/XLC_LOCALE \
${PREFIX}/share/doc/ami
-.for NAME in AUTHORS README NEWS COPYING ChangeLog
+.for NAME in AUTHORS README NEWS ChangeLog
${INSTALL_DATA} ${WRKSRC}/${NAME} \
${PREFIX}/share/doc/ami
.endfor
diff --git a/korean/ami/files/patch-ca b/korean/ami/files/patch-ca
index 15cc9dfbced9..bd385d8d598d 100644
--- a/korean/ami/files/patch-ca
+++ b/korean/ami/files/patch-ca
@@ -1,10 +1,11 @@
---- hanjadic/Makefile~ Thu Jul 1 03:31:25 1999
-+++ hanjadic/Makefile Tue Jul 13 21:16:53 1999
+--- hanjadic/Makefile.orig Fri Nov 26 23:20:56 1999
++++ hanjadic/Makefile Sat Jul 1 19:44:26 2000
@@ -1,5 +1,5 @@
- CC = gcc
+-CC = gcc
-CFLAGS = -g -O2 `glib-config --cflags`
-+CFLAGS = -g -O2 `glib12-config --cflags`
++CC ?= gcc
++CFLAGS += `$(GLIB_CONFIG) --cflags`
hanja-hwp2ami: hanja-hwp2ami.o
- $(CC) -o hanja-hwp2ami hanja-hwp2ami.o `glib-config --libs`
-+ $(CC) -o hanja-hwp2ami hanja-hwp2ami.o `glib12-config --libs`
++ $(CC) -o hanja-hwp2ami hanja-hwp2ami.o `$(GLIB_CONFIG) --libs`
diff --git a/korean/ami/pkg-plist b/korean/ami/pkg-plist
index b75cae8be117..3380da644829 100644
--- a/korean/ami/pkg-plist
+++ b/korean/ami/pkg-plist
@@ -39,6 +39,5 @@ share/doc/ami/XLC_LOCALE
share/doc/ami/AUTHORS
share/doc/ami/README
share/doc/ami/NEWS
-share/doc/ami/COPYING
share/doc/ami/ChangeLog
@dirrm share/doc/ami
diff --git a/korean/gau/Makefile b/korean/gau/Makefile
index 6829993b1db1..9ed341289fc3 100644
--- a/korean/gau/Makefile
+++ b/korean/gau/Makefile
@@ -17,14 +17,16 @@ PATCH_DIST_STRIP= -p1
MAINTAINER= cjh@kr.freebsd.org
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
RUN_DEPENDS= lrz:${PORTSDIR}/comms/lrzsz \
${X11BASE}/lib/X11/fonts/local/gulim12.pcf.gz:${PORTSDIR}/korean/baekmukfonts-bdf
+GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
+
USE_X_PREFIX= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= GLIB_CONFIG=${LOCALBASE}/bin/glib12-config \
- GTK_CONFIG=${X11BASE}/bin/gtk12-config
+CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}"
+MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}"
.include <bsd.port.mk>
diff --git a/korean/gau/files/patch-bb b/korean/gau/files/patch-bb
index 49757d7b1644..6e8b8a45e91a 100644
--- a/korean/gau/files/patch-bb
+++ b/korean/gau/files/patch-bb
@@ -5,7 +5,7 @@
grimview: grimview.o $(zilla)
- gcc -o grimview grimview.o $(zilla) `gtk-config --libs` -ljpeg
-+ gcc -o grimview grimview.o $(zilla) `gtk12-config --libs` -ljpeg
++ $(CC) $(CFLAGS) -o grimview grimview.o $(zilla) `$(GTK_CONFIG) --libs` -ljpeg
.c.o:
- gcc -Wall `gtk-config --cflags` -c $<
-+ gcc -Wall `gtk12-config --cflags` -c $<
++ $(CC) $(CFLAGS) `$(GTK_CONFIG) --cflags` -c $<
diff --git a/math/geg/Makefile b/math/geg/Makefile
index 0169dc05c2f6..717e1276952d 100644
--- a/math/geg/Makefile
+++ b/math/geg/Makefile
@@ -16,12 +16,17 @@ MAINTAINER= domi@saargate.de
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-USE_X_PREFIX= yes
-GNU_CONFIGURE= yes
+GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-CONFIGURE_ENV= LIBS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
+USE_X_PREFIX= yes
+USE_AUTOMAKE= yes
+AUTOMAKE= automake -a -i
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ GTK_CONFIG="${GTK_CONFIG}" \
+ LIBS="-L${LOCALBASE}/lib"
+MAN1= geg.1
-do-install:
- @ ${INSTALL_PROGRAM} ${WRKSRC}/src/geg ${PREFIX}/bin
+pre-configure:
+ @cd ${WRKSRC}; aclocal -I ${X11BASE}/share/aclocal
.include <bsd.port.mk>
diff --git a/math/geg/files/patch-ac b/math/geg/files/patch-ac
new file mode 100644
index 000000000000..8c2451c0837d
--- /dev/null
+++ b/math/geg/files/patch-ac
@@ -0,0 +1,12 @@
+--- configure.in.orig Wed Nov 24 08:01:41 1999
++++ configure.in Sat Jul 1 18:57:50 2000
+@@ -30,8 +30,7 @@
+ fi
+ fi
+
+-AC_CHECK_PROG(GTK_CFLAGS, gtk-config, `gtk-config --cflags`,,,)
+-AC_CHECK_PROG(GTK_LIBS, gtk-config, `gtk-config --libs`,,,)
++AM_PATH_GTK(1.2.0, , AC_MSG_ERROR(GTK+ is not installed or badly configured on your system...))
+
+ dnl Checks for libraries.
+ dnl Replace `main' with a function in -libs:
diff --git a/misc/snowflake/Makefile b/misc/snowflake/Makefile
index ba0fa3902d8c..6b7dcc1b8511 100644
--- a/misc/snowflake/Makefile
+++ b/misc/snowflake/Makefile
@@ -15,7 +15,10 @@ MAINTAINER= nakai@FreeBSD.org
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
+
USE_X_PREFIX= yes
+MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}"
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/snowflake ${PREFIX}/bin
diff --git a/misc/snowflake/files/patch-aa b/misc/snowflake/files/patch-aa
index b4efd2399577..013d4d19cb13 100644
--- a/misc/snowflake/files/patch-aa
+++ b/misc/snowflake/files/patch-aa
@@ -1,19 +1,27 @@
---- Makefile.orig Sat Jan 29 20:20:01 2000
-+++ Makefile Sat Jan 29 20:20:18 2000
-@@ -11,10 +11,10 @@
+--- Makefile.orig Mon Dec 21 08:18:55 1998
++++ Makefile Sat Jul 1 18:36:45 2000
+@@ -1,6 +1,6 @@
+ # Makefile
+
+-CC = gcc
++CC ?= gcc
+
+ SRCS = sf.c sf_control.c sf_generate.c sf_view.c getopt.c
+ OBJS = $(SRCS:.c=.o)
+@@ -11,13 +11,13 @@
all: snowflake
.c.o:
- $(CC) `gtk-config --cflags` -c $*.c -o $*.o
-+ $(CC) `gtk12-config --cflags` -c $*.c -o $*.o
++ $(CC) $(CFLAGS) `$(GTK_CONFIG) --cflags` -c $*.c -o $*.o
snowflake: $(OBJS)
- $(CC) `gtk-config --libs` $(OBJS) -o $@
-+ $(CC) `gtk12-config --libs` $(OBJS) -o $@
++ $(CC) $(CFLAGS) `$(GTK_CONFIG) --libs` $(OBJS) -o $@
getopt: getopt.c
- $(CC) -DTEST_LONG_OPTIONS $< -o $@
-@@ -26,4 +26,4 @@
- sf_control.o: $(HDRS)
- sf_generate.o: $(HDRS)
- sf_view.o: $(HDRS) $(INCS)
+- $(CC) -DTEST_LONG_OPTIONS $< -o $@
++ $(CC) $(CFLAGS) -DTEST_LONG_OPTIONS $< -o $@
+
+ clean:
+ rm -f *~ *.o snowflake
diff --git a/net-im/gicq/Makefile b/net-im/gicq/Makefile
index 5e1ee2216e59..e51496425fda 100644
--- a/net-im/gicq/Makefile
+++ b/net-im/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-im/gicq/files/patch-ab b/net-im/gicq/files/patch-ab
index cc30b78ef453..504578e8dcdb 100644
--- a/net-im/gicq/files/patch-ab
+++ b/net-im/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"
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"
diff --git a/security/gpasman/Makefile b/security/gpasman/Makefile
index cda66d2fe764..b340deace0fb 100644
--- a/security/gpasman/Makefile
+++ b/security/gpasman/Makefile
@@ -14,9 +14,12 @@ MAINTAINER= domi@saargate.de
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
+
USE_GMAKE= yes
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
+CONFIGURE_ENV= GTKCONFIG="${GTK_CONFIG}"
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/gpasman ${PREFIX}/bin
diff --git a/security/gpasman/files/patch-ab b/security/gpasman/files/patch-ab
index c24e3b261bb0..abbcf95df031 100644
--- a/security/gpasman/files/patch-ab
+++ b/security/gpasman/files/patch-ab
@@ -1,5 +1,5 @@
---- src/Makefile.in.orig Sun Sep 19 13:56:52 1999
-+++ src/Makefile.in Sun Sep 19 13:57:20 1999
+--- src/Makefile.in.orig Fri Sep 3 00:50:10 1999
++++ src/Makefile.in Sat Jul 1 18:19:43 2000
@@ -26,9 +26,9 @@
@@ -12,3 +12,12 @@
INSTALL = @INSTALL@
SRCS = librc2.c file.c gpasman.c
+@@ -39,7 +39,7 @@
+ $(CC) -o gpasman $(OBJS) $(LDFLAGS) $(LIBS)
+
+ .c.o: $(SRCS)
+- $(CC) -O2 -Wall $(CFLAGS) -c -o $@ $<
++ $(CC) $(CFLAGS) -c -o $@ $<
+
+ clean:
+ rm -f $(OBJS) gpasman core *~ *.bak
diff --git a/textproc/gdict/Makefile b/textproc/gdict/Makefile
index aeb75f95ea39..0817edefe597 100644
--- a/textproc/gdict/Makefile
+++ b/textproc/gdict/Makefile
@@ -14,6 +14,10 @@ MAINTAINER= domi@saargate.de
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
+
+MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}"
+
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/gdict ${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKSRC}/dict ${PREFIX}/bin/cdict
diff --git a/textproc/gdict/files/patch-aa b/textproc/gdict/files/patch-aa
index f93fc2ce03f6..73d891eaf6a8 100644
--- a/textproc/gdict/files/patch-aa
+++ b/textproc/gdict/files/patch-aa
@@ -8,7 +8,7 @@
-CFL_GTK = $(CFLAGS) `gtk-config --cflags` `gtk-config --libs`
+CC ?= gcc
+CFLAGS ?= -O6 -Wall
-+CFL_GTK = $(CFLAGS) `gtk12-config --cflags` `gtk12-config --libs`
++CFL_GTK = $(CFLAGS) `$(GTK_CONFIG) --cflags` `$(GTK_CONFIG) --libs`
CFL = $(CFLAGS)
OBJECTS_GDICT = gdict.c
OBJECTS_DICT = dict.c
diff --git a/www/erwn/Makefile b/www/erwn/Makefile
index d28184fc728d..22bfbe473e81 100644
--- a/www/erwn/Makefile
+++ b/www/erwn/Makefile
@@ -19,9 +19,9 @@ GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
USE_X_PREFIX= yes
USE_GMAKE= yes
+MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}"
post-install:
- @strip ${PREFIX}/bin/erwin
.if !defined(NOPORTDOCS)
@${ECHO} "===> Installing README in ${PREFIX}/share/doc/erwin"
@${MKDIR} ${PREFIX}/share/doc/erwin && ${CHMOD} a+rx ${PREFIX}/share/doc/erwin
diff --git a/www/erwn/files/patch-aa b/www/erwn/files/patch-aa
index c98fcd3edbeb..7d20775801f7 100644
--- a/www/erwn/files/patch-aa
+++ b/www/erwn/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig Sat Jul 24 15:33:08 1999
-+++ Makefile Sun Sep 19 13:48:47 1999
+--- Makefile.orig Sun Jul 25 05:33:08 1999
++++ Makefile Sat Jul 1 17:57:20 2000
@@ -2,14 +2,14 @@
bindir = $(prefix)/bin
@@ -10,23 +10,34 @@
OBJS = erwin.o erwinmenu.o erwinfunctions.o erwintoolbar.o \
erwinnotebook.o erwindialogs.o erwintags.o gtkmessage.o
INSTALL = install
- DEBUG = -g -DDEBUG
+-DEBUG = -g -DDEBUG
++DEBUG = # -g -DDEBUG
-CFLAGS = -DNAME=\"$(NAME)\" $(DEBUG) -Wall -O2 -m486 -fno-strength-reduce -malign-functions=4 -malign-jumps=4 -malign-loops=4 -ffast-math -fexpensive-optimizations
-+CFLAGS = -DNAME=\"$(NAME)\" $(DEBUG) -Wall -O2 -fno-strength-reduce -ffast-math -fexpensive-optimizations
++CFLAGS += -DNAME=\"$(NAME)\" $(DEBUG) -fno-strength-reduce -ffast-math -fexpensive-optimizations
all: license $(PROG)
-@@ -28,10 +28,10 @@
+@@ -17,8 +17,7 @@
+ strip $(PROG)
+
+ install: strip
+- $(INSTALL) -d $(bindir)
+- $(INSTALL) -m 0755 $(PROG) $(bindir)
++ ${BSD_INSTALL_PROGRAM} $(PROG) $(bindir)
+
+ uninstall:
+
+@@ -28,10 +27,10 @@
rm -f $(PROG) $(OBJS) *.?~ core license.h
$(PROG): $(OBJS)
- $(CC) $(LDFLAGS) $(shell gtk-config --libs) -o $@ $(OBJS)
-+ $(CC) $(LDFLAGS) $(shell gtk12-config --libs) -o $@ $(OBJS)
++ $(CC) $(LDFLAGS) `$(GTK_CONFIG) --libs` -o $@ $(OBJS)
%.o: %.c
- $(CC) $(CFLAGS) $(shell gtk-config --cflags) -o $@ -c $<
-+ $(CC) $(CFLAGS) $(shell gtk12-config --cflags) -o $@ -c $<
++ $(CC) $(CFLAGS) `$(GTK_CONFIG) --cflags` -o $@ -c $<
tar: clean
cd ..; ln -s erwin $(NAME);tar cf - $(NAME)/* > $(NAME).tar;rm $(NAME);gzip -f $(NAME).tar
diff --git a/www/nscache/Makefile b/www/nscache/Makefile
index 03c547ccb6b3..dd7f0f8c6434 100644
--- a/www/nscache/Makefile
+++ b/www/nscache/Makefile
@@ -16,6 +16,15 @@ MAINTAINER= kris@FreeBSD.org
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-USE_AUTOCONF= yes
+GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
+
+USE_AUTOMAKE= yes
+AUTOMAKE= automake -a -i
+CONFIGURE_ENV= CPPFALGS="-I${LOCALBASE}/include" \
+ GTK_CONFIG="${GTK_CONFIG}" \
+ LIBS="-L${LOCALBASE}/lib"
+
+pre-configure:
+ @cd ${WRKSRC}; aclocal -I ${X11BASE}/share/aclocal
.include <bsd.port.mk>
diff --git a/www/nscache/files/patch-aa b/www/nscache/files/patch-aa
index 9730c34de154..dac7af60e7bc 100644
--- a/www/nscache/files/patch-aa
+++ b/www/nscache/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.in.orig Sat Jan 15 09:40:55 2000
-+++ configure.in Sun Mar 5 02:00:42 2000
-@@ -41,14 +41,14 @@
+--- configure.in.orig Sun Jan 16 02:40:55 2000
++++ configure.in Sat Jul 1 19:10:54 2000
+@@ -41,17 +41,11 @@
AC_CHECK_LIB(c, gettext, CFLAGS="$CFLAGS -DHAVE_GETTEXT -DNLS_DIR=\"\\\"\$(prefix)/share/locale\\\"\"";MSUBDIRS="po", AC_CHECK_LIB(intl, gettext, LIBS="$LIBS -lintl";CFLAGS="$CFLAGS -DHAVE_GETTEXT -DNLS_DIR=\"\\\"\$(prefix)/share/locale\\\"\"";MSUBDIRS="po"))
@@ -10,12 +10,13 @@
AC_CHECK_HEADER(db1/db.h, CFLAGS="$CFLAGS -DHAVE_DB1_H", AC_CHECK_HEADER(db.h, CFLAGS="$CFLAGS -DHAVE_DB_H"))
-AC_CHECK_PROG(GTK_CONFIG, gtk-config, "yes", "no")
-+AC_CHECK_PROG(GTK_CONFIG, gtk12-config, "yes", "no")
- if eval "test x$GTK_CONFIG = xyes"; then
+-if eval "test x$GTK_CONFIG = xyes"; then
- CFLAGS="$CFLAGS `gtk-config --cflags`"
- LIBS="$LIBS `gtk-config --libs`"
-+ CFLAGS="$CFLAGS `gtk12-config --cflags`"
-+ LIBS="$LIBS `gtk12-config --libs`"
- else
- AC_MSG_ERROR("Unable to find \"gtk-config\" program")
- fi
+-else
+- AC_MSG_ERROR("Unable to find \"gtk-config\" program")
+-fi
++AM_PATH_GTK(1.2.0, , AC_MSG_ERROR(GTK+ is not installed or badly configured on your system...))
+
+ AC_SUBST(CFLAGS)
+ AC_SUBST(LIBS)
diff --git a/www/nscache/files/patch-ab b/www/nscache/files/patch-ab
new file mode 100644
index 000000000000..25f015017a95
--- /dev/null
+++ b/www/nscache/files/patch-ab
@@ -0,0 +1,19 @@
+--- Makefile.am.orig Tue Jan 18 04:49:06 2000
++++ Makefile.am Sat Jul 1 20:03:06 2000
+@@ -1,5 +1,7 @@
+ SUBDIRS = @MSUBDIRS@
+
++INCLUDES = $(GTK_CFLAGS)
++
+ bin_PROGRAMS = nscache
+
+ nscache_SOURCES = \
+@@ -12,6 +14,8 @@
+ indexdb.h \
+ nls.h \
+ setup.c
++
++nscache_LDADD = $(GTK_LIBS)
+
+ nscache.pot: $(nscache_SOURCES)
+ xgettext --default-domain=nscache -n -E -o $@ $(nscache_SOURCES)
diff --git a/www/nscache/pkg-plist b/www/nscache/pkg-plist
index 35dec41d2145..1e2f9a732f1c 100644
--- a/www/nscache/pkg-plist
+++ b/www/nscache/pkg-plist
@@ -1 +1,4 @@
bin/nscache
+share/locale/de/LC_MESSAGES/nscache.mo
+share/locale/it/LC_MESSAGES/nscache.mo
+share/locale/sk/LC_MESSAGES/nscache.mo
diff --git a/x11-clocks/asclock-gtk/Makefile b/x11-clocks/asclock-gtk/Makefile
index 271adc5bfd6f..8ce9ca242723 100644
--- a/x11-clocks/asclock-gtk/Makefile
+++ b/x11-clocks/asclock-gtk/Makefile
@@ -15,9 +15,13 @@ MAINTAINER= kuriyama@FreeBSD.org
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
+
+WRKSRC= ${WRKDIR}/${PORTNAME}
+
HAS_CONFIGURE= YES
-WRKSRC= ${WRKDIR}/asclock-gtk
USE_X_PREFIX= YES
+MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}"
ALL_TARGET= asclock
.if defined(BATCH)
diff --git a/x11-clocks/asclock-gtk/files/patch-aa b/x11-clocks/asclock-gtk/files/patch-aa
index 386a53512920..2fce2ef50671 100644
--- a/x11-clocks/asclock-gtk/files/patch-aa
+++ b/x11-clocks/asclock-gtk/files/patch-aa
@@ -1,13 +1,15 @@
--- Makefile.orig Fri Mar 26 16:08:33 1999
-+++ Makefile Wed May 5 12:23:28 1999
-@@ -2,18 +2,19 @@
++++ Makefile Sat Jul 1 17:43:08 2000
+@@ -1,19 +1,20 @@
+ CP=cp -f
MKDIR=mkdir -p
- CFLAGS = -Wall -g
+-CFLAGS = -Wall -g
++CFLAGS?= -Wall -g
+PREFIX?= /usr/local
-GNOME_CC = gcc $(CFLAGS) -DASCLOCK_THEMES_DIR=\""/usr/local/share/asclock"\" \
-+GNOME_CC = gcc $(CFLAGS) -DASCLOCK_THEMES_DIR=\""${PREFIX}/share/asclock/themes/"\" \
++GNOME_CC = $(CC) $(CFLAGS) -DASCLOCK_THEMES_DIR=\""${PREFIX}/share/asclock/themes/"\" \
-DASCLOCK_GNOME `gnome-config --cflags gnomeui gnome gtk`
GNOME_OBJS = .gnome/draw.o .gnome/asclock.o .gnome/config.o .gnome/rot.o .gnome/parser.o \
.gnome/symbols.o .gnome/dialogs.o .gnome/timezone.o .gnome/gnome_config.o
@@ -16,11 +18,11 @@
-GTK_CC = gcc $(CFLAGS) -DASCLOCK_THEMES_DIR=\""/usr/local/share/asclock"\" \
- -DASCLOCK_GTK `$(CONFIG_PATH)gtk-config --cflags`
-+GTK_CC = gcc $(CFLAGS) -DASCLOCK_THEMES_DIR=\""${PREFIX}/share/asclock/themes/"\" \
-+ -DASCLOCK_GTK `$(CONFIG_PATH)gtk12-config --cflags`
++GTK_CC = $(CC) $(CFLAGS) -DASCLOCK_THEMES_DIR=\""${PREFIX}/share/asclock/themes/"\" \
++ -DASCLOCK_GTK `$(GTK_CONFIG) --cflags`
GTK_OBJS = .gtk/draw.o .gtk/asclock.o .gtk/config.o .gtk/rot.o .gtk/parser.o .gtk/symbols.o
-GTK_LIBS = `$(CONFIG_PATH)gtk-config --libs`
-+GTK_LIBS = `$(CONFIG_PATH)gtk12-config --libs`
++GTK_LIBS = `$(GTK_CONFIG) --libs`
info: default_theme
@@ -46,24 +48,24 @@
- $(MKDIR) /usr/local/share/asclock/themes/shaped
- $(CP) themes/shaped/* /usr/local/share/asclock/themes/shaped
-# $(CP) -rf themes/* /usr/local/share/asclock/
-+ $(CP) asclock ${PREFIX}/bin
++ ${BSD_INSTALL_PROGRAM} asclock ${PREFIX}/bin
+ $(MKDIR) ${PREFIX}/share/asclock
+ $(MKDIR) ${PREFIX}/share/asclock/themes
+ $(MKDIR) ${PREFIX}/share/asclock/themes/Newstone
-+ $(CP) themes/Newstone/* ${PREFIX}/share/asclock/themes/Newstone
++ ${BSD_INSTALL_DATA} themes/Newstone/* ${PREFIX}/share/asclock/themes/Newstone
+ $(MKDIR) ${PREFIX}/share/asclock/themes/Orb
-+ $(CP) themes/Orb/* ${PREFIX}/share/asclock/themes/Orb
++ ${BSD_INSTALL_DATA} themes/Orb/* ${PREFIX}/share/asclock/themes/Orb
+ $(MKDIR) ${PREFIX}/share/asclock/themes/Stone
-+ $(CP) themes/Stone/* ${PREFIX}/share/asclock/themes/Stone
++ ${BSD_INSTALL_DATA} themes/Stone/* ${PREFIX}/share/asclock/themes/Stone
+ $(MKDIR) ${PREFIX}/share/asclock/themes/analog
-+ $(CP) themes/analog/* ${PREFIX}/share/asclock/themes/analog
++ ${BSD_INSTALL_DATA} themes/analog/* ${PREFIX}/share/asclock/themes/analog
+ $(MKDIR) ${PREFIX}/share/asclock/themes/beats
-+ $(CP) themes/beats/* ${PREFIX}/share/asclock/themes/beats
++ ${BSD_INSTALL_DATA} themes/beats/* ${PREFIX}/share/asclock/themes/beats
+ $(MKDIR) ${PREFIX}/share/asclock/themes/classic
-+ $(CP) themes/classic/* ${PREFIX}/share/asclock/themes/classic
++ ${BSD_INSTALL_DATA} themes/classic/* ${PREFIX}/share/asclock/themes/classic
+ $(MKDIR) ${PREFIX}/share/asclock/themes/shaped
-+ $(CP) themes/shaped/* ${PREFIX}/share/asclock/themes/shaped
-+# $(CP) -rf themes/* ${PREFIX}/share/asclock/
++ ${BSD_INSTALL_DATA} themes/shaped/* ${PREFIX}/share/asclock/themes/shaped
++# ${BSD_INSTALL_DATA} -rf themes/* ${PREFIX}/share/asclock/
clean:
rm -rf core *.o *~ .gtk .gnome asclock asclock_applet
diff --git a/x11-themes/xenophilia/Makefile b/x11-themes/xenophilia/Makefile
index 2352d024c850..a3e856502db7 100644
--- a/x11-themes/xenophilia/Makefile
+++ b/x11-themes/xenophilia/Makefile
@@ -15,8 +15,11 @@ MAINTAINER= sobomax@FreeBSD.org
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
+
USE_X_PREFIX= yes
-ALL_TARGET=
+MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}"
+ALL_TARGET= # empty
pre-install:
@${MKDIR} ${PREFIX}/lib/gtk/themes/engines
diff --git a/x11-themes/xenophilia/files/patch-aa b/x11-themes/xenophilia/files/patch-aa
index e5baf886482a..0722e5031126 100644
--- a/x11-themes/xenophilia/files/patch-aa
+++ b/x11-themes/xenophilia/files/patch-aa
@@ -13,8 +13,8 @@
-CFLAGS = `gtk-config --cflags`
-LIBS = `gtk-config --libs`
+CC ?= gcc
-+CFLAGS += `$(X11BASE)/bin/gtk12-config --cflags` -fPIC -DPIC
-+LIBS += `$(X11BASE)/bin/gtk12-config --libs`
++CFLAGS += `$(GTK_CONFIG) --cflags` -fPIC -DPIC
++LIBS += `$(GTK_CONFIG) --libs`
#Use these for FreeBSD:
#PREFIX = `gtk12-config --prefix`
diff --git a/x11-toolkits/xenophilia/Makefile b/x11-toolkits/xenophilia/Makefile
index 2352d024c850..a3e856502db7 100644
--- a/x11-toolkits/xenophilia/Makefile
+++ b/x11-toolkits/xenophilia/Makefile
@@ -15,8 +15,11 @@ MAINTAINER= sobomax@FreeBSD.org
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
+
USE_X_PREFIX= yes
-ALL_TARGET=
+MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}"
+ALL_TARGET= # empty
pre-install:
@${MKDIR} ${PREFIX}/lib/gtk/themes/engines
diff --git a/x11-toolkits/xenophilia/files/patch-aa b/x11-toolkits/xenophilia/files/patch-aa
index e5baf886482a..0722e5031126 100644
--- a/x11-toolkits/xenophilia/files/patch-aa
+++ b/x11-toolkits/xenophilia/files/patch-aa
@@ -13,8 +13,8 @@
-CFLAGS = `gtk-config --cflags`
-LIBS = `gtk-config --libs`
+CC ?= gcc
-+CFLAGS += `$(X11BASE)/bin/gtk12-config --cflags` -fPIC -DPIC
-+LIBS += `$(X11BASE)/bin/gtk12-config --libs`
++CFLAGS += `$(GTK_CONFIG) --cflags` -fPIC -DPIC
++LIBS += `$(GTK_CONFIG) --libs`
#Use these for FreeBSD:
#PREFIX = `gtk12-config --prefix`
diff --git a/x11-wm/spager/Makefile b/x11-wm/spager/Makefile
index 6bdde05b69b5..826605459cd7 100644
--- a/x11-wm/spager/Makefile
+++ b/x11-wm/spager/Makefile
@@ -13,25 +13,26 @@ MASTER_SITES= http://www.stanford.edu/~satyakid/
MAINTAINER= nakai@FreeBSD.org
RUN_DEPENDS= sawfish:${PORTSDIR}/x11-wm/sawfish
-LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12
+LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+
+GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-ALL_TARGET= spager
USE_X_PREFIX= yes
+MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}"
+ALL_TARGET= spager
-pre-build:
+post-extract:
${RM} -f ${WRKSRC}/spager
+post-patch:
+ ${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/sample.rc
+
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/spager ${PREFIX}/bin/
${MKDIR} ${PREFIX}/share/spager
${INSTALL_SCRIPT} ${WRKSRC}/spager.jl ${PREFIX}/share/spager
${INSTALL_SCRIPT} ${WRKSRC}/x-message.jl ${PREFIX}/share/spager
${INSTALL_DATA} ${WRKSRC}/sample.rc ${PREFIX}/share/spager
-
-post-install:
- @${ECHO_MSG} "*******************************************"
- @${ECHO_MSG} " Append ${PREFIX}/share/spager/sample.rc "
- @${ECHO_MSG} " to your ~/.sawfishrc"
- @${ECHO_MSG} "*******************************************"
+ @${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>
diff --git a/x11-wm/spager/files/patch-aa b/x11-wm/spager/files/patch-aa
index d7711bb24cc4..a7f7840fb5f8 100644
--- a/x11-wm/spager/files/patch-aa
+++ b/x11-wm/spager/files/patch-aa
@@ -1,11 +1,15 @@
---- Makefile.orig Mon Jun 5 12:39:44 2000
-+++ Makefile Mon Jun 5 12:39:52 2000
-@@ -21,7 +21,7 @@
- CC = gcc
+--- Makefile.orig Mon May 22 04:36:02 2000
++++ Makefile Sat Jul 1 17:39:37 2000
+@@ -18,10 +18,10 @@
+ # along with spager; see the file COPYING. If not, write to
+ # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+
+-CC = gcc
++CC ?= gcc
spager: spager.c
- $(CC) -O6 -Wall `gtk-config --cflags` spager.c -o spager `gtk-config --libs`
-+ $(CC) -O6 -Wall `gtk12-config --cflags` spager.c -o spager `gtk12-config --libs`
++ $(CC) $(CFLAGS) `$(GTK_CONFIG) --cflags` spager.c -o spager `$(GTK_CONFIG) --libs`
clean:
rm -f *.o spager
diff --git a/x11-wm/spager/files/patch-ab b/x11-wm/spager/files/patch-ab
index dc165a395c65..1b8942d74ae0 100644
--- a/x11-wm/spager/files/patch-ab
+++ b/x11-wm/spager/files/patch-ab
@@ -5,8 +5,8 @@
;; This is the directory where the archive is untarred.
-(setq spager-directory "/home/satyaki/spager")
-+(setq spager-directory "/usr/X11R6/share/spager")
-+(setq spager-bin-directory "/usr/X11R6/bin")
++(setq spager-directory "%%PREFIX%%/share/spager")
++(setq spager-bin-directory "%%PREFIX%%/bin")
;; I don't think you need to change anything under this line...
(setq load-path (cons spager-directory load-path))
diff --git a/x11/gmessage/Makefile b/x11/gmessage/Makefile
index 43de554b7d7a..bc8018a2b9f2 100644
--- a/x11/gmessage/Makefile
+++ b/x11/gmessage/Makefile
@@ -14,6 +14,9 @@ MAINTAINER= domi@saargate.de
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
+
USE_X_PREFIX= yes
+MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}"
.include <bsd.port.mk>
diff --git a/x11/gmessage/files/patch-aa b/x11/gmessage/files/patch-aa
index 14c2e4b2a6e3..6d6e4d81ffee 100644
--- a/x11/gmessage/files/patch-aa
+++ b/x11/gmessage/files/patch-aa
@@ -1,11 +1,12 @@
---- Makefile.orig Sun Jul 18 17:55:35 1999
-+++ Makefile Sun Jul 18 17:57:42 1999
+--- Makefile.orig Thu May 27 19:58:06 1999
++++ Makefile Sat Jul 1 17:48:44 2000
@@ -1,6 +1,6 @@
- CC = gcc
+-CC = gcc
-CFLAGS = `gtk-config --cflags`
-LDLIBS = `gtk-config --libs`
-+CFLAGS = `gtk12-config --cflags`
-+LDLIBS = `gtk12-config --libs`
++CC ?= gcc
++CFLAGS += `$(GTK_CONFIG) --cflags`
++LDLIBS = `$(GTK_CONFIG) --libs`
all: gmessage
@@ -14,7 +15,7 @@
install: gmessage
- cp ./gmessage /usr/local/bin
-+ install -m 0555 -o root -g wheel -s gmessage /usr/X11R6/bin
++ ${BSD_INSTALL_PROGRAM} gmessage ${PREFIX}/bin
clean:
$(RM) *.o core gmessage
diff --git a/x11/gyroscope/Makefile b/x11/gyroscope/Makefile
index 14e9b1c03caf..cee2a114a3bb 100644
--- a/x11/gyroscope/Makefile
+++ b/x11/gyroscope/Makefile
@@ -17,10 +17,10 @@ LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-WRKSRC= ${WRKDIR}/gyroscope
-USE_X_PREFIX= yes
+WRKSRC= ${WRKDIR}/${PORTNAME}
-do-build:
- @(cd ${WRKSRC} && ${MAKE})
+USE_X_PREFIX= yes
+MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}"
+ALL_TARGET= # empty
.include <bsd.port.mk>
diff --git a/x11/gyroscope/files/patch-aa b/x11/gyroscope/files/patch-aa
index 92509755913c..82cb04fefa7c 100644
--- a/x11/gyroscope/files/patch-aa
+++ b/x11/gyroscope/files/patch-aa
@@ -1,19 +1,29 @@
---- Makefile.orig Sun Jan 31 03:30:22 1999
-+++ Makefile Sat Jul 31 16:27:41 1999
-@@ -1,8 +1,8 @@
+--- Makefile.orig Sun Jan 31 01:30:22 1999
++++ Makefile Sat Jul 1 17:49:53 2000
+@@ -1,20 +1,20 @@
-CC = gcc
+CC ?= gcc
BINARYNAME = gyroscope
-BIN_DIR = /usr/local/bin/
-GTKINC = `gtk-config --cflags` -Wall -O2
-GTKLIB = `gtk-config --libs`
-+BIN_DIR = ${X11BASE}/bin
-+GTKINC = `gtk12-config --cflags` -Wall -O2
-+GTKLIB = `gtk12-config --libs`
++BIN_DIR = ${PREFIX}/bin
++GTKINC = `$(GTK_CONFIG) --cflags`
++GTKLIB = `$(GTK_CONFIG) --libs`
$(BINARYNAME): main.o gtkcolorsel.o
- $(CC) -o $(BINARYNAME) main.o gtkcolorsel.o $(GTKLIB)
-@@ -17,4 +17,4 @@
+- $(CC) -o $(BINARYNAME) main.o gtkcolorsel.o $(GTKLIB)
++ $(CC) $(CFLAGS) -o $(BINARYNAME) main.o gtkcolorsel.o $(GTKLIB)
+
+ gtkcolorsel.o:gtkcolorsel.c gtkcolorsel.h
+- $(CC) gtkcolorsel.c -c $(GTKINC)
++ $(CC) $(CFLAGS) gtkcolorsel.c -c $(GTKINC)
+
+ main.o: main.c
+- $(CC) main.c -c $(GTKINC)
++ $(CC) $(CFLAGS) main.c -c $(GTKINC)
+
+ clean:
-@ rm core -f *.o ./$(BINARYNAME)
install: