From owner-freebsd-ports  Sat Jul  1  5:10:41 2000
Delivered-To: freebsd-ports@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP id 8F63C37B7D4
	for <freebsd-ports@FreeBSD.org>; Sat,  1 Jul 2000 05:10:01 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id FAA57459;
	Sat, 1 Jul 2000 05:10:01 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E4D6137B7C2; Sat,  1 Jul 2000 05:00:50 -0700 (PDT)
Message-Id: <20000701120050.E4D6137B7C2@hub.freebsd.org>
Date: Sat,  1 Jul 2000 05:00:50 -0700 (PDT)
From: tkato@prontomail.ne.jp
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-1.0
Subject: ports/19623: Update port: patchkit for using GTK_CONFIG/GLIB_CONFIG
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         19623
>Category:       ports
>Synopsis:       Update port: patchkit for using GTK_CONFIG/GLIB_CONFIG
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jul 01 05:10:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.0-RELEASE i386
>Organization:
>Environment:
>Description:
- Use GTK_CONFIG/GLIB_CONFIG instead of hardcoded gtk12-config/glib12-config
- Support CC/CFLAGS/PREIFX/LOCALBASE/X11BASE/MAKE/etc. properly

>How-To-Repeat:

>Fix:
# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	audio_gmixer.patch
#	audio_lame.patch
#	audio_xmixer.patch
#	biology_xmolwt.patch
#	databases_gtksql.patch
#	editors_gxedit.patch
#	editors_vim5.patch
#	emulators_xsystem35.patch
#	ftp_IglooFTP.patch
#	games_hex.patch
#	games_xqf.patch
#	irc_olirc.patch
#	japanese_gicq.patch
#	korean_ami.patch
#	korean_gau.patch
#	math_geg.patch
#	misc_snowflake.patch
#	net_ggsd.patch
#	net_gicq.patch
#	palm_pilrc.patch
#	security_gpasman.patch
#	textproc_gdict.patch
#	www_erwm.patch
#	www_nscache.patch
#	x11-clocks_asclock-gtk.patch
#	x11-toolkits_xenophilia.patch
#	x11-wm_spager.patch
#	x11_gmessage.patch
#	x11_gyroscope.patch
#
echo x - audio_gmixer.patch
sed 's/^X//' >audio_gmixer.patch << 'END-of-audio_gmixer.patch'
Xdiff -urN /usr/ports/audio/gmixer/Makefile audio/gmixer/Makefile
X--- /usr/ports/audio/gmixer/Makefile	Fri Jun 30 19:40:08 2000
X+++ audio/gmixer/Makefile	Sat Jul  1 10:07:43 2000
X@@ -15,12 +15,14 @@
X 
X LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
X 
X+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
X+
X+MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
X ALL_TARGET=	gmixer
X 
X-pre-install:
X-	@ ${MKDIR} ${PREFIX}/share/pixmaps
X do-install:
X 	${INSTALL_PROGRAM} ${WRKSRC}/gmixer ${PREFIX}/bin
X+	@${MKDIR} ${PREFIX}/share/pixmaps
X 	${INSTALL_DATA} ${WRKSRC}/icons/gmixer.xpm ${PREFIX}/share/pixmaps
X 
X .include <bsd.port.mk>
Xdiff -urN /usr/ports/audio/gmixer/patches/patch-aa audio/gmixer/patches/patch-aa
X--- /usr/ports/audio/gmixer/patches/patch-aa	Tue Apr  6 18:36:44 1999
X+++ audio/gmixer/patches/patch-aa	Sat Jul  1 08:19:47 2000
X@@ -8,7 +8,7 @@
X  
X  gmixer: gmixer.c 
X -	$(CC) $(FLAGS) `gtk-config --cflags` `gtk-config --libs` gmixer.c -o gmixer
X-+	$(CC) $(CFLAGS) `gtk12-config --cflags` `gtk12-config --libs` gmixer.c -o gmixer
X++	$(CC) $(CFLAGS) `$(GTK_CONFIG) --cflags` `$(GTK_CONFIG) --libs` gmixer.c -o gmixer
X  install: gmixer
X  	install -s -m 755 -o 0 -g 0 gmixer /usr/X11R6/bin/
X  	install -m 644 -o 0 -g 0 icons/gmixer.xpm /usr/share/pixmaps/
END-of-audio_gmixer.patch
echo x - audio_lame.patch
sed 's/^X//' >audio_lame.patch << 'END-of-audio_lame.patch'
Xdiff -urN /usr/ports/audio/lame/Makefile audio/lame/Makefile
X--- /usr/ports/audio/lame/Makefile	Mon May  1 21:43:40 2000
X+++ audio/lame/Makefile	Sat Jul  1 09:25:06 2000
X@@ -28,6 +28,11 @@
X ALL_TARGET=	lame
X RESTRICTED=	Condition is not clear
X 
X+.if !defined(WITHOUT_X11)
X+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
X+MAKE_ENV+=	GTK_CONFIG="${GTK_CONFIG}"
X+.endif
X+
X MAN1=		lame.1
X 
X do-install:
Xdiff -urN /usr/ports/audio/lame/patches/patch-aa audio/lame/patches/patch-aa
X--- /usr/ports/audio/lame/patches/patch-aa	Mon May  1 21:43:40 2000
X+++ audio/lame/patches/patch-aa	Sat Jul  1 15:36:18 2000
X@@ -1,10 +1,12 @@
X---- Makefile.orig	Thu Apr 20 01:50:18 2000
X-+++ Makefile	Thu Apr 20 01:50:39 2000
X-@@ -12,7 +12,7 @@
X+--- Makefile.orig	Sat Jul  1 15:31:35 2000
X++++ Makefile	Sat Jul  1 15:36:07 2000
X+@@ -11,8 +11,8 @@
X+ 
X  # defaults:
X  PGM = lame
X- CC = gcc
X+-CC = gcc
X -CC_OPTS =  -O
X++CC ?= gcc
X +CC_OPTS = ${CFLAGS}
X  GTK = 
X  GTKLIBS = 
X@@ -13,9 +15,11 @@
X  ##########################################################################
X  ifeq ($(UNAME),FreeBSD)
X  #  remove if you do not have GTK or do not want the GTK frame analyzer
X+-   GTK = -DHAVEGTK `gtk12-config --cflags`
X+-   GTKLIBS = `gtk12-config --libs` 
X +ifndef WITHOUT_X11
X-    GTK = -DHAVEGTK `gtk12-config --cflags`
X-    GTKLIBS = `gtk12-config --libs` 
X++   GTK = -DHAVEGTK `$(GTK_CONFIG) --cflags`
X++   GTKLIBS = `$(GTK_CONFIG) --libs` 
X +endif
X  # Comment out next 2 lines if you want to remove VBR histogram capability
X     BRHIST_SWITCH = -DBRHIST
END-of-audio_lame.patch
echo x - audio_xmixer.patch
sed 's/^X//' >audio_xmixer.patch << 'END-of-audio_xmixer.patch'
Xdiff -urN /usr/ports/audio/xmixer/Makefile audio/xmixer/Makefile
X--- /usr/ports/audio/xmixer/Makefile	Sun Apr  9 15:42:58 2000
X+++ audio/xmixer/Makefile	Sat Jul  1 15:51:19 2000
X@@ -15,10 +15,14 @@
X 
X LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
X 
X-WRKSRC=		${WRKDIR}/xmixer
X+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
X+
X+WRKSRC=		${WRKDIR}/${PORTNAME}
X 
X-GNU_CONFIGURE=	yes
X USE_GMAKE=	yes
X+USE_AUTOCONF=	yes
X+CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
X+MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
X 
X MAN1=		xmixer.1
X 
Xdiff -urN /usr/ports/audio/xmixer/patches/patch-aa audio/xmixer/patches/patch-aa
X--- /usr/ports/audio/xmixer/patches/patch-aa	Sun Nov 14 12:17:41 1999
X+++ audio/xmixer/patches/patch-aa	Sat Jul  1 16:01:30 2000
X@@ -1,11 +1,20 @@
X---- Makefile.in.orig	Sat Aug 21 15:25:07 1999
X-+++ Makefile.in	Wed Oct 27 06:02:28 1999
X-@@ -33,16 +33,18 @@
X+--- Makefile.in.orig	Sun Aug 22 07:25:07 1999
X++++ Makefile.in	Sat Jul  1 15:58:55 2000
X+@@ -13,7 +13,7 @@
X+ DEF_MIXER = /dev/mixer
X+ VERSION	= 0.9.3
X+ 
X+-CFLAGS	= -O -Wall @CFLAGS@ @X_CFLAGS@ -DDEFAULT_MIXER=\"$(DEF_MIXER)\" \
X++CFLAGS	= @CFLAGS@ @X_CFLAGS@ -DDEFAULT_MIXER=\"$(DEF_MIXER)\" \
X+ 			-DOSS -I$(top_srcdir) -I$(top_srcdir)/icons \
X+ 			-DVERSION=\"$(VERSION)\"
X+ LDFLAGS = @LDFLAGS@
X+@@ -33,27 +33,29 @@
X  	mkfb.pl < XMixer.ad > fallback.h
X  
X  gui_gtk.o: gui_gtk.c
X -	$(CC) $(CFLAGS) $(INCS) `gtk-config --cflags` -c $<
X-+	$(CC) $(CFLAGS) $(INCS) `gtk12-config --cflags` -c $<
X++	$(CC) $(CFLAGS) $(INCS) `$(GTK_CONFIG) --cflags` -c $<
X  
X  %.o:	%.c
X  	$(CC) $(CFLAGS) $(INCS) -c $<
X@@ -17,20 +26,22 @@
X  
X  gmixer: $(G_OBJS)
X -	$(LD) $(LDFLAGS) -o $@ $(G_OBJS) `gtk-config --libs`
X-+	$(LD) $(LDFLAGS) -o $@ $(G_OBJS) `gtk12-config --libs`
X++	$(LD) $(LDFLAGS) -o $@ $(G_OBJS) `$(GTK_CONFIG) --libs`
X  
X  Xw/libXw.a:
X- 	cd Xw && make libXw.a
X-@@ -51,9 +53,9 @@
X+-	cd Xw && make libXw.a
X++	cd Xw && $(MAKE) libXw.a
X+ 
X+ README: index.html
X  	lynx -dump http://www/~rasca/xmixer/index.html | sed "s%//www/%//home.pages.de/%" > README
X  
X  install: $(PROGS)
X -	install -o bin xmixer $(bindir)
X -	install xmixer.man $(mandir)/xmixer.1
X -	install -o bin gmixer $(bindir)
X-+	install -c -o bin xmixer $(bindir)
X-+	install -c xmixer.man $(mandir)/xmixer.1
X-+	install -c -o bin gmixer $(bindir)
X++	${BSD_INSTALL_PROGRAM} xmixer $(bindir)
X++	${BSD_INSTALL_MAN} xmixer.man $(mandir)/xmixer.1
X++	${BSD_INSTALL_PROGRAM} gmixer $(bindir)
X  
X  install.lib: libmixer.a
X  	install libsmixer.a $(LIBDIR)
Xdiff -urN /usr/ports/audio/xmixer/patches/patch-ab audio/xmixer/patches/patch-ab
X--- /usr/ports/audio/xmixer/patches/patch-ab	Sun Nov 14 12:17:41 1999
X+++ audio/xmixer/patches/patch-ab	Sat Jul  1 15:47:51 2000
X@@ -1,28 +1,21 @@
X---- configure.in.orig	Sat Aug 21 05:46:55 1999
X-+++ configure.in	Tue Oct 26 23:48:36 1999
X-@@ -17,21 +17,21 @@
X- AC_PATH_X
X- AC_PATH_XTRA
X- LDFLAGS="$LDFLAGS -L$x_libraries/"
X--CFLAGS="$CFLAGS -I$x_includes/"
X-+CFLAGS="$CFLAGS -I$x_includes/ -I/usr/X11R6/include/gtk12/"
X- 
X- AC_CHECK_LIB(Xt, XtVaSetValues)
X+--- configure.in.orig	Sat Aug 21 21:46:55 1999
X++++ configure.in	Sat Jul  1 15:47:39 2000
X+@@ -23,15 +23,15 @@
X  AC_CHECK_LIB(Xaw, XawPanedGetNumSub)
X  
X  __cflags=$CFLAGS
X -CFLAGS="$CFLAGS `gtk-config --cflags`"
X-+CFLAGS="$CFLAGS `gtk12-config --cflags`"
X++CFLAGS="$CFLAGS `$GTK_CONFIG --cflags`"
X  __libs=$LIBS
X -LIBS="$LIBS `gtk-config --libs`"
X-+LIBS="$LIBS `gtk12-config --libs`"
X++LIBS="$LIBS `$GTK_CONFIG --libs`"
X  AC_CHECK_LIB(gdk, gdk_init)
X  AC_CHECK_LIB(gtk, gtk_main)
X  CFLAGS=$__cflags
X  LIBS=$__libs
X  
X -__gtk=`gtk-config --version`
X-+__gtk=`gtk12-config --version`
X++__gtk=`$GTK_CONFIG --version`
X  case "$__gtk" in
X  	1.2*)
X  	x_progs="xmixer gmixer"
Xdiff -urN /usr/ports/audio/xmixer/patches/patch-ac audio/xmixer/patches/patch-ac
X--- /usr/ports/audio/xmixer/patches/patch-ac	Sun Nov 14 12:17:42 1999
X+++ audio/xmixer/patches/patch-ac	Thu Jan  1 09:00:00 1970
X@@ -1,13 +0,0 @@
X---- gui_gtk.c.orig	Sat Aug 21 15:20:15 1999
X-+++ gui_gtk.c	Tue Oct 26 23:47:37 1999
X-@@ -23,8 +23,8 @@
X- #include <stdlib.h>
X- #include <limits.h>
X- #include <string.h>
X--#include <gtk/gtk.h>
X--#include <gdk/gdk.h>
X-+#include <gtk12/gtk/gtk.h>
X-+#include <gtk12/gdk/gdk.h>
X- /**/
X- #include "gui.h"
X- #include "about.h"
END-of-audio_xmixer.patch
echo x - biology_xmolwt.patch
sed 's/^X//' >biology_xmolwt.patch << 'END-of-biology_xmolwt.patch'
Xdiff -urN /usr/ports/biology/xmolwt/Makefile biology/xmolwt/Makefile
X--- /usr/ports/biology/xmolwt/Makefile	Sun Apr  9 15:43:11 2000
X+++ biology/xmolwt/Makefile	Sat Jul  1 15:55:03 2000
X@@ -1,6 +1,6 @@
X-# New ports collection makefile for: xmolwt/gmolwt
X-# Date created: 1999-08-30
X-# Whom: Ryo MIYAMOTO <rmiya@cc.hirosaki-u.ac.jp>
X+# New ports collection makefile for:	xmolwt/gmolwt
X+# Date created:		1999-08-30
X+# Whom:			Ryo MIYAMOTO <rmiya@cc.hirosaki-u.ac.jp>
X #
X # $FreeBSD: ports/biology/xmolwt/Makefile,v 1.3 2000/04/08 22:04:57 mharo Exp $
X 
X@@ -13,25 +13,25 @@
X 
X LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
X 
X-USE_GMAKE=	yes
X-WRKSRC=		${WRKDIR}/${DISTNAME}
X+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
X 
X-post-configure:
X-	(cd ${WRKSRC}; ${CP} Makefile.gtk Makefile)
X+WRKSRC=		${WRKDIR}/${DISTNAME}
X 
X-pre-install:
X-	(cd ${WRKSRC}; strip gmolwt)
X-	${RM} -rf ${PREFIX}/share/doc/xmolwt
X-	${MKDIR} ${PREFIX}/share/doc/xmolwt
X+USE_GMAKE=	yes
X+MAKEFILE=	Makefile.gtk
X+MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
X 
X do-install:
X 	${INSTALL_PROGRAM} ${WRKSRC}/gmolwt ${PREFIX}/bin
X-	(cd ${PREFIX}/bin; ln -s gmolwt molwt)
X+	${LN} -sf gmolwt ${PREFIX}/bin/molwt
X+.if !defined(NOPORTDOCS)
X+	${MKDIR} ${PREFIX}/share/doc/xmolwt
X 	${INSTALL_DATA} ${WRKSRC}/Howtouse.* ${PREFIX}/share/doc/xmolwt
X 	${INSTALL_DATA} ${WRKSRC}/Readme ${PREFIX}/share/doc/xmolwt
X 	${INSTALL_DATA} ${WRKSRC}/Xmolwt ${PREFIX}/share/doc/xmolwt
X 	${INSTALL_DATA} ${WRKSRC}/dot.gtkrc ${PREFIX}/share/doc/xmolwt
X 	${INSTALL_DATA} ${WRKSRC}/*.html ${PREFIX}/share/doc/xmolwt
X 	${INSTALL_DATA} ${WRKSRC}/*.gif ${PREFIX}/share/doc/xmolwt
X+.endif
X 
X .include <bsd.port.mk>
Xdiff -urN /usr/ports/biology/xmolwt/patches/patch-aa biology/xmolwt/patches/patch-aa
X--- /usr/ports/biology/xmolwt/patches/patch-aa	Tue Sep  7 05:04:15 1999
X+++ biology/xmolwt/patches/patch-aa	Sat Jul  1 15:49:46 2000
X@@ -1,13 +1,21 @@
X-*** Makefile.gtk	Sat Aug 28 19:46:47 1999
X---- Makefile	Mon Aug 30 19:49:21 1999
X+*** Makefile.gtk.orig	Sat Aug 28 19:46:47 1999
X+--- Makefile.gtk	Sat Jul  1 15:49:31 2000
X ***************
X-*** 3,8 ****
X---- 3,10 ----
X-  GTKCONFIG = gtk12-config
X+*** 1,7 ****
X+! CC = gcc
X+! CFLAGS = -DGTK
X+! GTKCONFIG = gtk12-config
X   OBJS = molwt.o usage.o element.o reduce.o count.o calculate.o initwidget.o allowcase.o inputformula.o addtolist.o
X   
X-+ all: gmolwt
X-+ 
X   molwt: gmolwt
X   	ln -s gmolwt molwt
X+--- 1,9 ----
X+! CC ?= gcc
X+! CFLAGS += -DGTK
X+! GTKCONFIG = $(GTK_CONFIG)
X+  OBJS = molwt.o usage.o element.o reduce.o count.o calculate.o initwidget.o allowcase.o inputformula.o addtolist.o
X++ 
X++ all: gmolwt
X   
X+  molwt: gmolwt
X+  	ln -s gmolwt molwt
END-of-biology_xmolwt.patch
echo x - databases_gtksql.patch
sed 's/^X//' >databases_gtksql.patch << 'END-of-databases_gtksql.patch'
Xdiff -urN /usr/ports/databases/gtksql/Makefile databases/gtksql/Makefile
X--- /usr/ports/databases/gtksql/Makefile	Mon Apr 17 20:07:03 2000
X+++ databases/gtksql/Makefile	Sat Jul  1 16:05:21 2000
X@@ -25,7 +25,10 @@
X LIB_DEPENDS +=	pq.2:${PORTSDIR}/databases/postgresql
X .endif
X 
X+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
X+
X USE_X_PREFIX=	yes
X+MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
X 
X pre-patch:
X .if !defined(WITH_MYSQL) && !defined(WITH_PGSQL)
X@@ -49,7 +52,7 @@
X 	@ ${INSTALL_PROGRAM} ${WRKSRC}/gtksql ${PREFIX}/bin
X .if !defined(NOPORTDOCS)
X 	@ ${MKDIR} ${PREFIX}/share/doc/gtksql
X-.for file in COPYING Changelog README
X+.for file in Changelog README
X 	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/gtksql
X .endfor
X .endif
Xdiff -urN /usr/ports/databases/gtksql/patches/patch-aa databases/gtksql/patches/patch-aa
X--- /usr/ports/databases/gtksql/patches/patch-aa	Sun Aug  1 11:41:01 1999
X+++ databases/gtksql/patches/patch-aa	Sat Jul  1 16:11:04 2000
X@@ -1,6 +1,10 @@
X---- Makefile.orig	Mon Jul 26 19:30:44 1999
X-+++ Makefile	Mon Jul 26 19:41:39 1999
X-@@ -4,14 +4,14 @@
X+--- Makefile.orig	Sat Jun  5 22:05:36 1999
X++++ Makefile	Sat Jul  1 16:10:57 2000
X+@@ -1,17 +1,17 @@
X+ # Your favorite compilation options here :-)
X+-MCFLAGS  = -Wall -O -g 
X++#MCFLAGS  = -Wall -O -g 
X+ LDFLAGS  =  -lcrypt
X  
X  # Comment out the variables for the databases that you do not want
X  # Here, what you need for PostgreSQL
X@@ -21,14 +25,27 @@
X  
X  # Nothing to change below this point...
X  DBSQLIBS = $(PGSQLIBS) $(MYSQLIBS)
X-@@ -24,8 +24,8 @@
X+@@ -22,13 +22,13 @@
X+           config.o mytoolbar.o
X+ 
X  OBJS    = $(MOBJS) $(DBSQLOBJS)
X- CFLAGS  = $(MCFLAGS) $(DBSQLFLAGS)
X+-CFLAGS  = $(MCFLAGS) $(DBSQLFLAGS)
X++CFLAGS  += $(MCFLAGS) $(DBSQLFLAGS)
X  
X -GTKLIBS     = `gtk-config --libs`
X -GTKCFLAGS   = `gtk-config --cflags`
X-+GTKLIBS     = `gtk12-config --libs`
X-+GTKCFLAGS   = `gtk12-config --cflags`
X++GTKLIBS     = `$(GTK_CONFIG) --libs`
X++GTKCFLAGS   = `$(GTK_CONFIG) --cflags`
X  
X  all: $(OBJS)
X- 	gcc -o gtksql $(OBJS) $(DBSQLIBS) $(GTKLIBS) $(CFLAGS) $(LDFLAGS)
X+-	gcc -o gtksql $(OBJS) $(DBSQLIBS) $(GTKLIBS) $(CFLAGS) $(LDFLAGS)
X++	$(CC) -o gtksql $(OBJS) $(DBSQLIBS) $(GTKLIBS) $(CFLAGS) $(LDFLAGS)
X+ 
X+ clean:
X+ 	rm -f *.o gtksql
X+@@ -37,4 +37,4 @@
X+ 	cp gtksql $(DESTDIR)usr/bin/
X+ 
X+ .c.o: 
X+-	gcc $(CFLAGS) $(GTKCFLAGS) $(DBSQLCFLAGS) -c $*.c -o ./$*.o
X++	$(CC) $(CFLAGS) $(GTKCFLAGS) $(DBSQLCFLAGS) -c $*.c -o ./$*.o
Xdiff -urN /usr/ports/databases/gtksql/pkg/PLIST databases/gtksql/pkg/PLIST
X--- /usr/ports/databases/gtksql/pkg/PLIST	Sat Mar 20 14:28:38 1999
X+++ databases/gtksql/pkg/PLIST	Sat Jul  1 16:05:29 2000
X@@ -1,5 +1,4 @@
X bin/gtksql
X-share/doc/gtksql/COPYING
X share/doc/gtksql/Changelog
X share/doc/gtksql/README
X @dirrm share/doc/gtksql
END-of-databases_gtksql.patch
echo x - editors_gxedit.patch
sed 's/^X//' >editors_gxedit.patch << 'END-of-editors_gxedit.patch'
Xdiff -urN /usr/ports/editors/gxedit/Makefile editors/gxedit/Makefile
X--- /usr/ports/editors/gxedit/Makefile	Fri Apr 14 18:48:04 2000
X+++ editors/gxedit/Makefile	Sat Jul  1 16:14:02 2000
X@@ -16,9 +16,15 @@
X 
X LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
X 
X+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
X+
X USE_X_PREFIX=	yes
X+MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
X ALL_TARGET=	gxedit
X 
X+post-patch:
X+	@${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/config.h
X+
X do-install:
X 	${INSTALL_PROGRAM} ${WRKSRC}/gtk-shell ${PREFIX}/bin
X 	${INSTALL_PROGRAM} ${WRKSRC}/gxedit ${PREFIX}/bin
X@@ -29,10 +35,9 @@
X .for i in popmail.scr traceroute.scr userinfo.scr www.scr
X 	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/gxedit
X .endfor
X-
X .if !defined(NOPORTDOCS)
X 	${MKDIR} ${PREFIX}/share/doc/gxedit/
X-.for i in COPYING charmap.txt manual.ps manual.txt quickref.ps quickref.txt
X+.for i in charmap.txt manual.ps manual.txt quickref.ps quickref.txt
X 	${INSTALL_DATA} ${WRKSRC}/docs/$i ${PREFIX}/share/doc/gxedit/
X .endfor
X .endif
Xdiff -urN /usr/ports/editors/gxedit/patches/patch-aa editors/gxedit/patches/patch-aa
X--- /usr/ports/editors/gxedit/patches/patch-aa	Fri Apr 16 19:38:37 1999
X+++ editors/gxedit/patches/patch-aa	Sat Jul  1 08:36:45 2000
X@@ -16,9 +16,9 @@
X -#define EMACS "/usr/bin/emacs"
X -#define DES "/bin/des"
X -#define IDEA "/bin/idea"
X-+#define EMACS "/usr/local/bin/emacs"
X-+#define DES "/usr/local/bin/des"
X-+#define IDEA "/usr/local/bin/idea"
X++#define EMACS "%%LOCALBASE%%/bin/emacs"
X++#define DES "%%LOCALBASE%%/bin/des"
X++#define IDEA "%%LOCALBASE%%/bin/idea"
X  #define XTERM "/usr/X11R6/bin/xterm"
X  #define AWK "awk"
X  #define SED "sed"
Xdiff -urN /usr/ports/editors/gxedit/patches/patch-ab editors/gxedit/patches/patch-ab
X--- /usr/ports/editors/gxedit/patches/patch-ab	Fri Apr 16 19:38:37 1999
X+++ editors/gxedit/patches/patch-ab	Sat Jul  1 16:26:23 2000
X@@ -1,15 +1,15 @@
X---- Makefile.orig	Fri Mar 19 16:31:49 1999
X-+++ Makefile	Mon Apr  5 17:00:51 1999
X+--- Makefile.orig	Fri Mar 19 15:01:49 1999
X++++ Makefile	Sat Jul  1 16:25:24 2000
X @@ -3,12 +3,13 @@
X  INSTALL_DIR = /usr/X11R6/bin/
X  DOCS = /usr/doc
X  SHARE = /usr/share
X -CFLAGS = `gtk-config --cflags` -I/usr/local/include -I. -O -Wall -DVERSION=\"1.23\"
X +CFLAGS ?= -O2
X-+CFLAGS += `gtk12-config --cflags` -I/usr/local/include -I. -Wall -DVERSION=\"1.23\"
X++CFLAGS += `$(GTK_CONFIG) --cflags` -I. -DVERSION=\"1.23\"
X  GTKEDITOR_CFLAGS = -I../gtkeditor-0.0.6 -I../gtkeditor-0.0.6/gtkeditor
X -LIBS = `gtk-config --libs`
X-+LIBS = `gtk12-config --libs`
X++LIBS = `$(GTK_CONFIG) --libs`
X  OBJS = gxedit.o net.o utils.o
X  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
X -CC = gcc
X@@ -17,19 +17,50 @@
X  
X  all:
X  	@echo "Use ./setup"
X-@@ -23,7 +24,6 @@
X+@@ -23,8 +24,7 @@
X  	$(CC) $(CFLAGS) -c utils.c
X  	$(CC) $(CFLAGS) -o $(BIN_DIR)gxedit $(OBJS) $(LIBS)
X  	@(rm -f ./.chk_config)
X -	(cd xproc-src; make BIN_DIR=../; cd ..)
X- 	(cd gtk-shell-src; make BIN_DIR=../; cd ..)
X+-	(cd gtk-shell-src; make BIN_DIR=../; cd ..)
X++	(cd gtk-shell-src; $(MAKE) BIN_DIR=../; cd ..)
X  
X  gxe-with-gtkeditor:
X-@@ -32,7 +32,6 @@
X+ 	$(CC) $(CFLAGS) $(GTKEDITOR_CFLAGS) -c gxedit.c
X+@@ -32,19 +32,18 @@
X  	$(CC) $(CFLAGS) $(GTKEDITOR_CFLAGS) -c utils.c
X  	$(CC) $(CFLAGS) $(GTKEDITOR_CFLAGS) -o $(BIN_DIR)gxedit $(OBJS) $(GTKEDITOR_OBJS) $(LIBS)
X  	@(rm -f ./.chk_config)
X -	(cd xproc-src; make BIN_DIR=../; cd ..)
X- 	(cd gtk-shell-src; make BIN_DIR=../; cd ..)
X+-	(cd gtk-shell-src; make BIN_DIR=../; cd ..)
X++	(cd gtk-shell-src; $(MAKE) BIN_DIR=../; cd ..)
X  
X  say:
X+-	(cd access; make BIN_DIR=../)
X++	(cd access; $(MAKE) BIN_DIR=../)
X+ 
X+ say-install:
X+ 	$(INSTALL) -m 0755 say $(INSTALL_DIR)say
X+ 
X+ clean:
X+ 	rm -f *.o $(BIN_DIR)gxedit $(BIN_DIR)say $(BIN_DIR)xproc $(BIN_DIR)gtk-shell $(BIN_DIR)libbabel.a *.log core
X+-	(cd gtk-shell-src; make clean; cd ..)
X+-	(cd xproc-src; make clean; cd ..)
X++	(cd gtk-shell-src; $(MAKE) clean; cd ..)
X++	(cd xproc-src; $(MAKE) clean; cd ..)
X+ 
X+ install:
X+ 	$(INSTALL) -m 0755 $(BIN_DIR)gxedit $(INSTALL_DIR)gxedit
X+@@ -75,9 +74,9 @@
X+ 	$(CC) $(CFLAGS) -c net.c
X+ 	$(CC) $(CFLAGS) -c utils.c
X+ 	$(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
X+-	(cd xproc-src; make distro BIN_DIR=../; cd ..)
X+-	(cd gtk-shell-src; make distro BIN_DIR=../; cd ..)
X+-	(cd access; make BIN_DIR=../; cd ..)
X++	(cd xproc-src; $(MAKE) distro BIN_DIR=../; cd ..)
X++	(cd gtk-shell-src; $(MAKE) distro BIN_DIR=../; cd ..)
X++	(cd access; $(MAKE) BIN_DIR=../; cd ..)
X+ 	mv say dist/
X+ 	mv gxedit dist/
X+ 	mv xproc dist/
Xdiff -urN /usr/ports/editors/gxedit/patches/patch-ae editors/gxedit/patches/patch-ae
X--- /usr/ports/editors/gxedit/patches/patch-ae	Fri Apr 16 19:38:37 1999
X+++ editors/gxedit/patches/patch-ae	Sat Jul  1 08:38:54 2000
X@@ -6,8 +6,8 @@
X -LIBS = `gtk-config --libs`
X -CC = gcc
X +CFLAGS ?= -O2
X-+CFLAGS += `gtk12-config --cflags` -I. -Wall
X-+LIBS = `gtk12-config --libs`
X++CFLAGS += `$(GTK_CONFIG) --cflags` -I.
X++LIBS = `$(GTK_CONFIG) --libs`
X +CC ?= gcc
X  
X  all:
Xdiff -urN /usr/ports/editors/gxedit/pkg/PLIST editors/gxedit/pkg/PLIST
X--- /usr/ports/editors/gxedit/pkg/PLIST	Fri Apr 16 19:38:38 1999
X+++ editors/gxedit/pkg/PLIST	Sat Jul  1 16:14:14 2000
X@@ -7,7 +7,6 @@
X share/gxedit/traceroute.scr
X share/gxedit/userinfo.scr
X share/gxedit/www.scr
X-share/doc/gxedit/COPYING
X share/doc/gxedit/charmap.txt
X share/doc/gxedit/manual.ps
X share/doc/gxedit/manual.txt
END-of-editors_gxedit.patch
echo x - editors_vim5.patch
sed 's/^X//' >editors_vim5.patch << 'END-of-editors_vim5.patch'
Xdiff -urN /usr/ports/editors/vim5/Makefile editors/vim5/Makefile
X--- /usr/ports/editors/vim5/Makefile	Fri Jun 30 19:45:52 2000
X+++ editors/vim5/Makefile	Sat Jul  1 08:41:14 2000
X@@ -53,6 +53,8 @@
X 
X .if defined(HAVE_GTK)
X LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
X+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
X+CONFIGURE=	GTK_CONFIG="${GTK_CONFIG}"
X MAKE_FLAGS:=	CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${X11BASE} --enable-multibyte --enable-fontset --enable-multibyte --enable-xim" ${MAKE_FLAGS}
X .elif defined(HAVE_MOTIF)
X REQUIRES_MOTIF=	yes
Xdiff -urN /usr/ports/editors/vim5/patches/patch-02 editors/vim5/patches/patch-02
X--- /usr/ports/editors/vim5/patches/patch-02	Mon Oct 25 15:02:02 1999
X+++ editors/vim5/patches/patch-02	Sat Jul  1 08:39:31 2000
X@@ -1,19 +1,5 @@
X --- configure.orig	Sun Sep 19 03:59:45 1999
X +++ configure	Sun Oct 24 21:47:29 1999
X-@@ -2906,11 +2906,11 @@
X- 
X-   if test "x$gtk_config_prefix" != "x" ; then
X-      gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
X--     GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
X-+     GTK_CONFIG=$gtk_config_prefix/bin/gtk12-config
X-   fi
X-   if test "x$gtk_config_exec_prefix" != "x" ; then
X-      gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
X--     GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
X-+     GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk12-config
X-   fi
X-   if test "X$GTK_CONFIG" = "X"; then
X-     # Extract the first word of "gtk-config", so it can be a program name with args.
X @@ -3098,7 +3098,7 @@
X    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"
X    GUI_LIB_LOC=
END-of-editors_vim5.patch
echo x - emulators_xsystem35.patch
sed 's/^X//' >emulators_xsystem35.patch << 'END-of-emulators_xsystem35.patch'
Xdiff -urN /usr/ports/emulators/xsystem35/Makefile emulators/xsystem35/Makefile
X--- /usr/ports/emulators/xsystem35/Makefile	Wed Apr 12 21:21:21 2000
X+++ emulators/xsystem35/Makefile	Sat Jul  1 16:17:22 2000
X@@ -9,14 +9,18 @@
X PORTVERSION=	1.2.5.1
X CATEGORIES=	emulators
X MASTER_SITES=	http://www.aist-nara.ac.jp/~masaki-c/private/unitbase/xsys35/down/
X-DISTNAME=	xsystem35-1.2.5-1
X+DISTNAME=	${PORTNAME}-1.2.5-1
X 
X MAINTAINER=	k5@cheerful.com
X 
X LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
X 
X-USE_IMAKE=	YES
X+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
X+
X WRKSRC=		${WRKDIR}/${DISTNAME}/src
X+
X+USE_IMAKE=	YES
X+MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
X PKGMESSAGE=	${WRKSRC}/MESSAGE
X 
X DOC_FILES=	BUGS ChangeLog FAQ GRFMT.TXT INSTALL MISCGAME.TXT README \
X@@ -42,20 +46,18 @@
X .endif
X 
X do-install:
X-	@${INSTALL_PROGRAM} ${WRKSRC}/xsystem35 ${PREFIX}/bin
X-	@${INSTALL_SCRIPT} ${WRKSRC}/../contrib/instgame ${PREFIX}/bin
X-
X-post-install:
X+	${INSTALL_PROGRAM} ${WRKSRC}/xsystem35 ${PREFIX}/bin
X+	${INSTALL_SCRIPT} ${WRKSRC}/../contrib/instgame ${PREFIX}/bin
X .if !defined(NOPORTDOCS)
X 	@${MKDIR} ${PREFIX}/share/doc/ja/xsystem35
X 	@(cd ${WRKSRC}/../doc;\
X 		${INSTALL_MAN} ${DOC_FILES} ${PREFIX}/share/doc/ja/xsystem35)
X+.endif
X 	@${MKDIR} ${PREFIX}/share/examples/xsystem35
X 	@${INSTALL_DATA} ${WRKSRC}/xsys35rc.sample ${PREFIX}/share/examples/xsystem35
X 	@(cd ${WRKSRC}/../contrib; \
X 		${INSTALL_DATA} ${EXAMPLES} ${PREFIX}/share/examples/xsystem35)
X 	@${SED} -e s,PREFIX,${PREFIX}, ${PKGDIR}/MESSAGE > ${WRKSRC}/MESSAGE
X 	@${CAT} ${WRKSRC}/MESSAGE
X-.endif
X 
X .include <bsd.port.post.mk>
Xdiff -urN /usr/ports/emulators/xsystem35/patches/patch-af emulators/xsystem35/patches/patch-af
X--- /usr/ports/emulators/xsystem35/patches/patch-af	Sun Dec  5 08:22:08 1999
X+++ emulators/xsystem35/patches/patch-af	Sat Jul  1 08:41:52 2000
X@@ -5,14 +5,14 @@
X   * include / library / definition
X   */
X -SYS_LIBRARIES   = -lm `gtk-config --libs`
X-+SYS_LIBRARIES   = -lm `gtk12-config --libs`
X++SYS_LIBRARIES   = -lm `$(GTK_CONFIG) --libs`
X  #ifdef ENABLE_ESD
X  EXTRA_LIBRARIES = $(OSDEPLIB) -lesd
X  #else
X  EXTRA_LIBRARIES = $(OSDEPLIB)
X  #endif
X -EXTRA_INCLUDES  = `gtk-config --cflags` $(OSDEPINC)
X-+EXTRA_INCLUDES  = `gtk12-config --cflags` $(OSDEPINC)
X++EXTRA_INCLUDES  = `$(GTK_CONFIG) --cflags` $(OSDEPINC)
X  EXTRA_DEFINES   = $(OSDEPDEF)
X  
X  /*
END-of-emulators_xsystem35.patch
echo x - ftp_IglooFTP.patch
sed 's/^X//' >ftp_IglooFTP.patch << 'END-of-ftp_IglooFTP.patch'
Xdiff -urN /usr/ports/ftp/IglooFTP/Makefile ftp/IglooFTP/Makefile
X--- /usr/ports/ftp/IglooFTP/Makefile	Wed Apr 12 21:21:22 2000
X+++ ftp/IglooFTP/Makefile	Sat Jul  1 17:26:48 2000
X@@ -15,25 +15,24 @@
X 
X MAINTAINER=		will@FreeBSD.org
X 
X-LIB_DEPENDS=		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
X-			intl.1:${PORTSDIR}/devel/gettext
X+LIB_DEPENDS=		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
X 
X-USE_X_PREFIX=		yes
X+GTK_CONFIG?=		${X11BASE}/bin/gtk12-config
X 
X-WRKSRC=			${WRKDIR}/IglooFTP-0.6.1
X+WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
X 
X-do-build:
X-	@ cd ${WRKSRC}/src; ${MAKE}
X+USE_X_PREFIX=		yes
X+MAKE_ENV=		GTK_CONFIG="${GTK_CONFIG}"
X+ALL_TARGET=		IglooFTP
X 
X-do-install:
X-	@ cd ${WRKSRC}/src; ${MAKE} install
X-	@ ${RM} ${PREFIX}/share/IglooFTP/docs/LICENSE~
X+post-extract:
X+	@${RM} ${WRKSRC}/../share/docs/LICENSE~
X 
X post-install:
X .if !defined(NOPORTDOCS)
X-	@ ${MKDIR} ${PREFIX}/share/doc/IglooFTP
X+	@${MKDIR} ${PREFIX}/share/doc/IglooFTP
X .for file in AUTHORS BUGS COPYRIGHT THANKS TODO
X-	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/IglooFTP
X+	${INSTALL_DATA} ${WRKSRC}/../${file} ${PREFIX}/share/doc/IglooFTP
X .endfor
X .endif
X 
Xdiff -urN /usr/ports/ftp/IglooFTP/patches/patch-ab ftp/IglooFTP/patches/patch-ab
X--- /usr/ports/ftp/IglooFTP/patches/patch-ab	Sat May 29 12:55:08 1999
X+++ ftp/IglooFTP/patches/patch-ab	Sat Jul  1 08:47:32 2000
X@@ -10,8 +10,8 @@
X +CC?= gcc
X +C_FLAGS = $(CFLAGS)
X +# -Wall -g -O2 -m486 -fno-strength-reduce
X-+GTK_CFLAGS = `gtk12-config --cflags`
X-+GTK_LIBS = `gtk12-config --libs` 
X++GTK_CFLAGS = `$(GTK_CONFIG) --cflags`
X++GTK_LIBS = `$(GTK_CONFIG) --libs` 
X +LFLAGS = $(GTK_LIBS) -lXmu -lXt -lSM -lICE
X  PROGNAME = IglooFTP
X  PROGNAME-STATIC = IglooFTP-static
X@@ -34,14 +34,14 @@
X -	/usr/bin/install -m 644 ../share/bookmarks/* $(SHARE_PATH)/bookmarks/
X -	/usr/bin/install -m 644 ../share/app_ass/* $(SHARE_PATH)/app_ass/
X -	/usr/bin/install -m 644 ../share/gtkrc $(SHARE_PATH)/gtkrc	
X-+	/usr/bin/install -c -s -m 755 $(PROGNAME) $(BIN_PATH)
X-+	/usr/bin/install -c -m 644 ../share/docs/* $(SHARE_PATH)/docs/
X-+	/usr/bin/install -c -m 644 ../share/html/*.* $(SHARE_PATH)/html/
X-+	/usr/bin/install -c -m 644 ../share/html/images/*.* $(SHARE_PATH)/html/images/
X-+	/usr/bin/install -c -m 644 ../share/xpm/* $(SHARE_PATH)/xpm/
X-+	/usr/bin/install -c -m 644 ../share/bookmarks/* $(SHARE_PATH)/bookmarks/
X-+	/usr/bin/install -c -m 644 ../share/app_ass/* $(SHARE_PATH)/app_ass/
X-+	/usr/bin/install -c -m 644 ../share/gtkrc $(SHARE_PATH)/gtkrc	
X++	${BSD_INSTALL_PROGRAM} $(PROGNAME) $(BIN_PATH)
X++	${BSD_INSTALL_DATA} ../share/docs/* $(SHARE_PATH)/docs/
X++	${BSD_INSTALL_DATA} ../share/html/*.* $(SHARE_PATH)/html/
X++	${BSD_INSTALL_DATA} ../share/html/images/*.* $(SHARE_PATH)/html/images/
X++	${BSD_INSTALL_DATA} ../share/xpm/* $(SHARE_PATH)/xpm/
X++	${BSD_INSTALL_DATA} ../share/bookmarks/* $(SHARE_PATH)/bookmarks/
X++	${BSD_INSTALL_DATA} ../share/app_ass/* $(SHARE_PATH)/app_ass/
X++	${BSD_INSTALL_DATA} ../share/gtkrc $(SHARE_PATH)/gtkrc	
X  
X  
X  
END-of-ftp_IglooFTP.patch
echo x - games_hex.patch
sed 's/^X//' >games_hex.patch << 'END-of-games_hex.patch'
Xdiff -urN /usr/ports/games/hex/Makefile games/hex/Makefile
X--- /usr/ports/games/hex/Makefile	Thu Jun 22 19:09:03 2000
X+++ games/hex/Makefile	Sat Jul  1 07:25:59 2000
X@@ -13,29 +13,30 @@
X 
X MAINTAINER=	ports@FreeBSD.org
X 
X-LIB_DEPENDS=	Imlib.5:${PORTSDIR}/graphics/imlib \
X-		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
X+LIB_DEPENDS=	Imlib.5:${PORTSDIR}/graphics/imlib
X 
X-USE_X_PREFIX=	YES
X+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
X 
X-USE_GMAKE=	YES
X WRKSRC=		${WRKDIR}/${DISTNAME}
X-
X-pre-install:
X-	@${MKDIR} ${PREFIX}/share/hex
X-	@${MKDIR} ${PREFIX}/share/hex/levels
X-	@${MKDIR} ${PREFIX}/share/hex/graphics
X+USE_X_PREFIX=	YES
X+USE_GMAKE=	YES
X+MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
X 
X do-install:
X-	@${INSTALL_PROGRAM} ${WRKSRC}/hex ${PREFIX}/bin/hex
X-	@${INSTALL_DATA} ${WRKSRC}/HISTORY ${PREFIX}/share/hex/HISTORY
X-	@${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/hex/README
X-	@${INSTALL_DATA} ${WRKSRC}/TODO ${PREFIX}/share/hex/TODO
X+	${INSTALL_PROGRAM} ${WRKSRC}/hex ${PREFIX}/bin
X+	@${MKDIR} ${PREFIX}/share/hex/graphics
X .for i in 0 1 2 3 4 5 6 7 8
X-	@${INSTALL_DATA} ${WRKSRC}/graphics/ball${i}.png \
X+	${INSTALL_DATA} ${WRKSRC}/graphics/ball${i}.png \
X 			 ${PREFIX}/share/hex/graphics/ball${i}.png
X .endfor
X-	@${INSTALL_DATA} ${WRKSRC}/levels/Level1 \
X+	@${MKDIR} ${PREFIX}/share/hex/levels
X+	${INSTALL_DATA} ${WRKSRC}/levels/Level1 \
X 			 ${PREFIX}/share/hex/levels/Level1
X+.if !defined(NOPORTDOCS)
X+	@${MKDIR} ${PREFIX}/share/doc/hex
X+.for file in HISTORY README TODO
X+	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/hex
X+.endfor
X+.endif
X 
X .include <bsd.port.mk>
Xdiff -urN /usr/ports/games/hex/patches/patch-ac games/hex/patches/patch-ac
X--- /usr/ports/games/hex/patches/patch-ac	Sat Aug 14 12:52:28 1999
X+++ games/hex/patches/patch-ac	Sat Jul  1 07:21:07 2000
X@@ -11,11 +11,11 @@
X  
X  .c.o:
X -	$(CC) `gtk-config --cflags` -c $*.c -o $*.o
X-+	$(CC) $(CFLAGS) `gtk12-config --cflags` -c $*.c -o $*.o
X++	$(CC) $(CFLAGS) `$(GTK_CONFIG) --cflags` -c $*.c -o $*.o
X  
X  hex: $(OBJS)
X -	$(CC) $(LIBS) `gtk-config --libs` $(OBJS)  -o $@
X-+	$(CC) $(LIBS) `gtk12-config --libs` $(OBJS)  -o $@
X++	$(CC) $(LIBS) `$(GTK_CONFIG) --libs` $(OBJS)  -o $@
X  
X  clean: 
X  	rm -f *~ *.o hex
Xdiff -urN /usr/ports/games/hex/pkg/PLIST games/hex/pkg/PLIST
X--- /usr/ports/games/hex/pkg/PLIST	Sat Aug 14 12:52:28 1999
X+++ games/hex/pkg/PLIST	Sat Jul  1 07:26:57 2000
X@@ -1,5 +1,7 @@
X bin/hex
X-share/hex/levels/Level1
X+share/doc/hex/HISTORY
X+share/doc/hex/README
X+share/doc/hex/TODO
X share/hex/graphics/ball0.png
X share/hex/graphics/ball1.png
X share/hex/graphics/ball2.png
X@@ -9,9 +11,8 @@
X share/hex/graphics/ball6.png
X share/hex/graphics/ball7.png
X share/hex/graphics/ball8.png
X-share/hex/README
X-share/hex/TODO
X-share/hex/HISTORY
X+share/hex/levels/Level1
X @dirrm share/hex/levels
X @dirrm share/hex/graphics
X @dirrm share/hex
X+@dirrm share/doc/hex
END-of-games_hex.patch
echo x - games_xqf.patch
sed 's/^X//' >games_xqf.patch << 'END-of-games_xqf.patch'
Xdiff -urN /usr/ports/games/xqf/Makefile games/xqf/Makefile
X--- /usr/ports/games/xqf/Makefile	Sat Apr 15 00:24:34 2000
X+++ games/xqf/Makefile	Sat Jul  1 16:54:04 2000
X@@ -13,12 +13,11 @@
X MAINTAINER=	steve@farrell.org
X 
X RUN_DEPENDS=	qstat:${PORTSDIR}/games/qstat
X-LIB_DEPENDS=    gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
X+LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
X+
X+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
X 
X USE_GMAKE=	yes
X-MAKE_ENV=	INSTALL_PROGRAM="${INSTALL_PROGRAM}"
X-.ifdef CC
X-MAKE_ENV+=	CC="${CC}"
X-.endif
X+MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
X 
X .include <bsd.port.mk>
Xdiff -urN /usr/ports/games/xqf/patches/patch-aa games/xqf/patches/patch-aa
X--- /usr/ports/games/xqf/patches/patch-aa	Mon Aug  2 14:26:20 1999
X+++ games/xqf/patches/patch-aa	Sat Jul  1 08:49:45 2000
X@@ -8,8 +8,8 @@
X -CFLAGS	= -O2 -g -Wall `gtk-config --cflags` $(EXTRA_CFLAGS)
X -LDFLAGS	= `gtk-config --libs`
X +CC	?= gcc
X-+CFLAGS	+= -Wall `gtk12-config --cflags` $(EXTRA_CFLAGS)
X-+LDFLAGS	= `gtk12-config --libs`
X++CFLAGS	+= `$(GTK_CONFIG) --cflags` $(EXTRA_CFLAGS)
X++LDFLAGS	= `$(GTK_CONFIG) --libs`
X  
X -INSTALL_ROOT = /usr/local
X +INSTALL_ROOT = ${PREFIX}
X@@ -21,7 +21,7 @@
X  
X  install:
X -	install -s -m 755 -g root -o root $(TARGET) $(INSTALL_ROOT)/bin
X-+	${INSTALL_PROGRAM} $(TARGET) $(INSTALL_ROOT)/bin
X++	${BSD_INSTALL_PROGRAM} $(TARGET) $(INSTALL_ROOT)/bin
X  
X  dist-clean clean:
X  	rm -f *.[oasi] *~ core $(TARGET) Makefile.old
END-of-games_xqf.patch
echo x - irc_olirc.patch
sed 's/^X//' >irc_olirc.patch << 'END-of-irc_olirc.patch'
Xdiff -urN /usr/ports/irc/olirc/Makefile irc/olirc/Makefile
X--- /usr/ports/irc/olirc/Makefile	Wed Apr 12 21:22:58 2000
X+++ irc/olirc/Makefile	Sat Jul  1 16:40:22 2000
X@@ -14,10 +14,14 @@
X 
X LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
X 
X+GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
X+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
X+
X USE_BZIP2=	yes
X-GNU_CONFIGURE=	yes
X USE_X_PREFIX=	yes
X-CONFIGURE_ENV=	GTK_CONFIG=${X11BASE}/bin/gtk12-config
X+GNU_CONFIGURE=	yes
X+CONFIGURE_ENV=	GLIB_CONFIG="${GLIB_CONFIG}" \
X+		GTK_CONFIG="${GTK_CONFIG}"
X 
X do-install:
X 	${INSTALL_PROGRAM} ${WRKSRC}/olirc ${PREFIX}/bin
Xdiff -urN /usr/ports/irc/olirc/patches/patch-ab irc/olirc/patches/patch-ab
X--- /usr/ports/irc/olirc/patches/patch-ab	Thu Oct 21 15:05:45 1999
X+++ irc/olirc/patches/patch-ab	Sat Jul  1 17:06:41 2000
X@@ -1,10 +1,20 @@
X-Index: configure
X+--- configure.orig	Mon Oct 11 16:00:00 1999
X++++ configure	Sat Jul  1 17:06:30 2000
X @@ -1714,7 +1714,7 @@
X      if test "$gtk_config_major_version" = "1" -a "$gtk_config_minor_version" = 0 ; then
X        GTK_OBJS_STATIC="$GTK_PREFIX/lib/libgtk.a $GTK_PREFIX/lib/libgdk.a $GTK_PREFIX/lib/libglib.a"
X      else
X -	   GLIB_PREFIX=`glib-config --prefix 2> /dev/null`
X-+	   GLIB_PREFIX=`glib12-config --prefix 2> /dev/null`
X++	   GLIB_PREFIX=`$GLIB_CONFIG --prefix 2> /dev/null`
X        GTK_OBJS_STATIC="$GTK_PREFIX/lib/libgtk.a $GTK_PREFIX/lib/libgdk.a $GLIB_PREFIX/lib/libglib.a $GLIB_PREFIX/lib/libgmodule.a"
X      fi
X+ 
X+@@ -2393,7 +2393,7 @@
X+ echo "Configuration complete."
X+ echo ""
X+ 
X+-echo "Ol-Irc will use GTK+ version : `gtk-config --version`"
X++echo "Ol-Irc will use GTK+ version : `$GTK_CONFIG --version`"
X+ 
X+ echo ""
X  
END-of-irc_olirc.patch
echo x - japanese_gicq.patch
sed 's/^X//' >japanese_gicq.patch << 'END-of-japanese_gicq.patch'
Xdiff -urN /usr/ports/japanese/gicq/Makefile japanese/gicq/Makefile
X--- /usr/ports/japanese/gicq/Makefile	Fri Jun 30 19:50:10 2000
X+++ japanese/gicq/Makefile	Sat Jul  1 10:00:46 2000
X@@ -23,13 +23,15 @@
X LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12	\
X 		icq.0:${PORTSDIR}/japanese/libicq
X 
X+GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
X GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
X 
X USE_X_PREFIX=	yes
X GNU_CONFIGURE=	yes
X CONFIGURE_ARGS=	--without-gnome --disable-nls
X-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}" \
X-		CPPFLAGS="-I${LOCALBASE}/include" \
X+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
X+		GLIB_CONFIG="${GLIB_CONFIG}" \
X+		GTK_CONFIG="${GTK_CONFIG}" \
X 		LIBS="-L${LOCALBASE}/lib"
X 
X .include <bsd.port.mk>
Xdiff -urN /usr/ports/japanese/gicq/patches/patch-ab japanese/gicq/patches/patch-ab
X--- /usr/ports/japanese/gicq/patches/patch-ab	Tue Apr  6 21:23:58 1999
X+++ japanese/gicq/patches/patch-ab	Sat Jul  1 09:59:45 2000
X@@ -5,7 +5,7 @@
X  else
X    ac_save_LIBS="$LIBS"
X -LIBS="-licq "`glib-config --libs`" $LIBS"
X-+LIBS="-licq "`glib12-config --libs`" $LIBS"
X++LIBS="-licq "`$GLIB_CONFIG --libs`" $LIBS"
X  cat > conftest.$ac_ext <<EOF
X  #line 3985 "configure"
X  #include "confdefs.h"
END-of-japanese_gicq.patch
echo x - korean_ami.patch
sed 's/^X//' >korean_ami.patch << 'END-of-korean_ami.patch'
Xdiff -urN /usr/ports/korean/ami/Makefile korean/ami/Makefile
X--- /usr/ports/korean/ami/Makefile	Sat Jun 24 14:02:54 2000
X+++ korean/ami/Makefile	Sat Jul  1 19:56:17 2000
X@@ -17,12 +17,15 @@
X 
X LIB_DEPENDS=    gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
X 
X+GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
X+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
X+
X USE_X_PREFIX=	YES
X-GNU_CONFIGURE=	YES
X USE_GMAKE=	YES
X-CONFIGURE_ENV=	GLIB_CONFIG=${LOCALBASE}/bin/glib12-config \
X-		GTK_CONFIG=${X11BASE}/bin/gtk12-config
X-CONFIGURE_ARGS+= --with-hangul-keyboard=2
X+GNU_CONFIGURE=	YES
X+CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
X+CONFIGURE_ARGS=	--with-hangul-keyboard=2
X+MAKE_ENV=	GLIB_CONFIG="${GLIB_CONFIG}"
X 
X # gnome panel applet support
X .if defined(WITH_GNOME_APPLET)
X@@ -33,15 +36,15 @@
X 
X post-build:
X 	@cd ${WRKSRC}/hanjadic; \
X-	${MAKE}
X+	${MAKE_ENV} ${MAKE} ${MAKE_ARGS}
X 
X post-install:
X 	${INSTALL_PROGRAM} ${WRKSRC}/hanjadic/hanja-hwp2ami ${PREFIX}/bin
X 
X 	# patch XLC_LOCALE for ko_KR.EUC(harmless)
X-	if [ -f ${PREFIX}/lib/X11/locale/ko/XLC_LOCALE ]; then \
X-		${MV} -f ${PREFIX}/lib/X11/locale/ko/XLC_LOCALE \
X-			${PREFIX}/lib/X11/locale/ko/XLC_LOCALE.orig; \
X+	if [ -f ${PREFIX}/lib/X11/locale/ko/XLC_LOCALE; then \
X+	${MV} -f ${PREFIX}/lib/X11/locale/ko/XLC_LOCALE \
X+		${PREFIX}/lib/X11/locale/ko/XLC_LOCALE.orig; \
X 	fi
X 	${INSTALL_DATA} ${FILESDIR}/XLC_LOCALE \
X 		${PREFIX}/lib/X11/locale/ko/
X@@ -50,7 +53,7 @@
X 	${INSTALL_DATA} ${FILESDIR}/XLC_LOCALE \
X 		${PREFIX}/share/doc/ami
X 
X-.for NAME in AUTHORS README NEWS COPYING ChangeLog
X+.for NAME in AUTHORS README NEWS ChangeLog
X 	${INSTALL_DATA} ${WRKSRC}/${NAME} \
X 		${PREFIX}/share/doc/ami
X .endfor
Xdiff -urN /usr/ports/korean/ami/patches/patch-ca korean/ami/patches/patch-ca
X--- /usr/ports/korean/ami/patches/patch-ca	Sun Jan 30 06:34:44 2000
X+++ korean/ami/patches/patch-ca	Sat Jul  1 19:44:36 2000
X@@ -1,10 +1,11 @@
X---- hanjadic/Makefile~	Thu Jul  1 03:31:25 1999
X-+++ hanjadic/Makefile	Tue Jul 13 21:16:53 1999
X+--- hanjadic/Makefile.orig	Fri Nov 26 23:20:56 1999
X++++ hanjadic/Makefile	Sat Jul  1 19:44:26 2000
X @@ -1,5 +1,5 @@
X  
X- CC = gcc
X+-CC = gcc
X -CFLAGS = -g -O2 `glib-config --cflags`
X-+CFLAGS = -g -O2 `glib12-config --cflags`
X++CC ?= gcc
X++CFLAGS += `$(GLIB_CONFIG) --cflags`
X  hanja-hwp2ami: hanja-hwp2ami.o
X -	$(CC) -o hanja-hwp2ami hanja-hwp2ami.o `glib-config --libs`
X-+	$(CC) -o hanja-hwp2ami hanja-hwp2ami.o `glib12-config --libs`
X++	$(CC) -o hanja-hwp2ami hanja-hwp2ami.o `$(GLIB_CONFIG) --libs`
Xdiff -urN /usr/ports/korean/ami/pkg/PLIST korean/ami/pkg/PLIST
X--- /usr/ports/korean/ami/pkg/PLIST	Sat Jun 24 06:48:34 2000
X+++ korean/ami/pkg/PLIST	Sat Jul  1 19:51:16 2000
X@@ -38,6 +38,5 @@
X share/doc/ami/AUTHORS
X share/doc/ami/README
X share/doc/ami/NEWS
X-share/doc/ami/COPYING
X share/doc/ami/ChangeLog
X @dirrm share/doc/ami
END-of-korean_ami.patch
echo x - korean_gau.patch
sed 's/^X//' >korean_gau.patch << 'END-of-korean_gau.patch'
Xdiff -urN /usr/ports/korean/gau/Makefile korean/gau/Makefile
X--- /usr/ports/korean/gau/Makefile	Thu Apr 13 19:19:06 2000
X+++ korean/gau/Makefile	Sat Jul  1 20:12:40 2000
X@@ -17,14 +17,16 @@
X 
X MAINTAINER=	cjh@kr.freebsd.org
X 
X-LIB_DEPENDS=    gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
X+LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
X RUN_DEPENDS=	lrz:${PORTSDIR}/comms/lrzsz \
X 		${X11BASE}/lib/X11/fonts/local/gulim12.pcf.gz:${PORTSDIR}/korean/baekmukfonts-bdf
X 
X+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
X+
X USE_X_PREFIX=	yes
X USE_GMAKE=	yes
X GNU_CONFIGURE=	yes
X-CONFIGURE_ENV=  GLIB_CONFIG=${LOCALBASE}/bin/glib12-config \
X-		GTK_CONFIG=${X11BASE}/bin/gtk12-config
X+CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
X+MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
X 
X .include <bsd.port.mk>
Xdiff -urN /usr/ports/korean/gau/patches/patch-bb korean/gau/patches/patch-bb
X--- /usr/ports/korean/gau/patches/patch-bb	Mon Feb 21 00:19:19 2000
X+++ korean/gau/patches/patch-bb	Sat Jul  1 08:50:53 2000
X@@ -5,7 +5,7 @@
X  
X  grimview: grimview.o $(zilla)
X -	gcc -o grimview grimview.o $(zilla) `gtk-config --libs` -ljpeg
X-+	gcc -o grimview grimview.o $(zilla) `gtk12-config --libs` -ljpeg
X++	$(CC) $(CFLAGS) -o grimview grimview.o $(zilla) `$(GTK_CONFIG) --libs` -ljpeg
X  .c.o:
X -	gcc -Wall `gtk-config --cflags` -c $<
X-+	gcc -Wall `gtk12-config --cflags` -c $<
X++	$(CC) $(CFLAGS) `$(GTK_CONFIG) --cflags` -c $<
END-of-korean_gau.patch
echo x - math_geg.patch
sed 's/^X//' >math_geg.patch << 'END-of-math_geg.patch'
Xdiff -urN /usr/ports/math/geg/Makefile math/geg/Makefile
X--- /usr/ports/math/geg/Makefile	Thu Apr 27 23:05:37 2000
X+++ math/geg/Makefile	Sat Jul  1 19:36:49 2000
X@@ -16,12 +16,17 @@
X 
X LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
X 
X-USE_X_PREFIX=	yes
X-GNU_CONFIGURE=	yes
X+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
X 
X-CONFIGURE_ENV=	LIBS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
X+USE_X_PREFIX=	yes
X+USE_AUTOMAKE=	yes
X+AUTOMAKE=	automake -a -i
X+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
X+		GTK_CONFIG="${GTK_CONFIG}" \
X+		LIBS="-L${LOCALBASE}/lib"
X+MAN1=		geg.1
X 
X-do-install:
X-	@ ${INSTALL_PROGRAM} ${WRKSRC}/src/geg ${PREFIX}/bin
X+pre-configure:
X+	@cd ${WRKSRC}; aclocal -I ${X11BASE}/share/aclocal
X 
X .include <bsd.port.mk>
Xdiff -urN /usr/ports/math/geg/patches/patch-aa math/geg/patches/patch-aa
X--- /usr/ports/math/geg/patches/patch-aa	Thu Apr 27 23:05:38 2000
X+++ math/geg/patches/patch-aa	Thu Jan  1 09:00:00 1970
X@@ -1,69 +0,0 @@
X---- configure.orig	Wed Nov 24 00:12:21 1999
X-+++ configure	Sat Apr 15 19:47:59 2000
X-@@ -1160,8 +1160,8 @@
X-   fi
X- fi
X- 
X--# Extract the first word of "gtk-config", so it can be a program name with args.
X--set dummy gtk-config; ac_word=$2
X-+# Extract the first word of "gtk12-config", so it can be a program name with args.
X-+set dummy gtk12-config; ac_word=$2
X- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
X- echo "configure:1167: checking for $ac_word" >&5
X- if eval "test \"`echo '$''{'ac_cv_prog_GTK_CFLAGS'+set}'`\" = set"; then
X-@@ -1175,7 +1175,7 @@
X-   for ac_dir in $ac_dummy; do
X-     test -z "$ac_dir" && ac_dir=.
X-     if test -f $ac_dir/$ac_word; then
X--      ac_cv_prog_GTK_CFLAGS="`gtk-config --cflags`"
X-+      ac_cv_prog_GTK_CFLAGS="`gtk12-config --cflags`"
X-       break
X-     fi
X-   done
X-@@ -1189,8 +1189,8 @@
X-   echo "$ac_t""no" 1>&6
X- fi
X- 
X--# Extract the first word of "gtk-config", so it can be a program name with args.
X--set dummy gtk-config; ac_word=$2
X-+# Extract the first word of "gtk12-config", so it can be a program name with args.
X-+set dummy gtk12-config; ac_word=$2
X- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
X- echo "configure:1196: checking for $ac_word" >&5
X- if eval "test \"`echo '$''{'ac_cv_prog_GTK_LIBS'+set}'`\" = set"; then
X-@@ -1204,7 +1204,7 @@
X-   for ac_dir in $ac_dummy; do
X-     test -z "$ac_dir" && ac_dir=.
X-     if test -f $ac_dir/$ac_word; then
X--      ac_cv_prog_GTK_LIBS="`gtk-config --libs`"
X-+      ac_cv_prog_GTK_LIBS="`gtk12-config --libs`"
X-       break
X-     fi
X-   done
X-@@ -1391,14 +1391,14 @@
X-   echo "$ac_t""no" 1>&6
X- fi
X- 
X--echo $ac_n "checking for main in -lgtk""... $ac_c" 1>&6
X--echo "configure:1396: checking for main in -lgtk" >&5
X-+echo $ac_n "checking for main in -lgtk12""... $ac_c" 1>&6
X-+echo "configure:1396: checking for main in -lgtk12" >&5
X- ac_lib_var=`echo gtk'_'main | sed 'y%./+-%__p_%'`
X- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
X-   echo $ac_n "(cached) $ac_c" 1>&6
X- else
X-   ac_save_LIBS="$LIBS"
X--LIBS="-lgtk  $LIBS"
X-+LIBS="-lgtk12  $LIBS"
X- cat > conftest.$ac_ext <<EOF
X- #line 1404 "configure"
X- #include "confdefs.h"
X-@@ -1428,7 +1428,7 @@
X- #define $ac_tr_lib 1
X- EOF
X- 
X--  LIBS="-lgtk $LIBS"
X-+  LIBS="-lgtk12 $LIBS"
X- 
X- else
X-   echo "$ac_t""no" 1>&6
Xdiff -urN /usr/ports/math/geg/patches/patch-ac math/geg/patches/patch-ac
X--- /usr/ports/math/geg/patches/patch-ac	Thu Jan  1 09:00:00 1970
X+++ math/geg/patches/patch-ac	Sat Jul  1 18:58:03 2000
X@@ -0,0 +1,12 @@
X+--- configure.in.orig	Wed Nov 24 08:01:41 1999
X++++ configure.in	Sat Jul  1 18:57:50 2000
X+@@ -30,8 +30,7 @@
X+   fi
X+ fi
X+ 
X+-AC_CHECK_PROG(GTK_CFLAGS, gtk-config, `gtk-config --cflags`,,,)
X+-AC_CHECK_PROG(GTK_LIBS, gtk-config, `gtk-config --libs`,,,)
X++AM_PATH_GTK(1.2.0, , AC_MSG_ERROR(GTK+ is not installed or badly configured on your system...))
X+ 
X+ dnl Checks for libraries.
X+ dnl Replace `main' with a function in -libs:
END-of-math_geg.patch
echo x - misc_snowflake.patch
sed 's/^X//' >misc_snowflake.patch << 'END-of-misc_snowflake.patch'
Xdiff -urN /usr/ports/misc/snowflake/Makefile misc/snowflake/Makefile
X--- /usr/ports/misc/snowflake/Makefile	Sat Apr 15 00:28:53 2000
X+++ misc/snowflake/Makefile	Sat Jul  1 08:55:57 2000
X@@ -15,7 +15,10 @@
X 
X LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
X 
X+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
X+
X USE_X_PREFIX=	yes
X+MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
X 
X do-install:
X 		${INSTALL_PROGRAM} ${WRKSRC}/snowflake ${PREFIX}/bin
Xdiff -urN /usr/ports/misc/snowflake/patches/patch-aa misc/snowflake/patches/patch-aa
X--- /usr/ports/misc/snowflake/patches/patch-aa	Sat Jan 29 21:53:04 2000
X+++ misc/snowflake/patches/patch-aa	Sat Jul  1 18:40:32 2000
X@@ -1,19 +1,27 @@
X---- Makefile.orig	Sat Jan 29 20:20:01 2000
X-+++ Makefile	Sat Jan 29 20:20:18 2000
X-@@ -11,10 +11,10 @@
X+--- Makefile.orig	Mon Dec 21 08:18:55 1998
X++++ Makefile	Sat Jul  1 18:36:45 2000
X+@@ -1,6 +1,6 @@
X+ # Makefile
X+ 
X+-CC = gcc
X++CC ?= gcc
X+ 
X+ SRCS = sf.c sf_control.c sf_generate.c sf_view.c getopt.c
X+ OBJS = $(SRCS:.c=.o)
X+@@ -11,13 +11,13 @@
X  all: snowflake
X  
X  .c.o:
X -	$(CC) `gtk-config --cflags` -c $*.c -o $*.o
X-+	$(CC) `gtk12-config --cflags` -c $*.c -o $*.o
X++	$(CC) $(CFLAGS) `$(GTK_CONFIG) --cflags` -c $*.c -o $*.o
X  
X  snowflake: $(OBJS)
X -	$(CC) `gtk-config --libs` $(OBJS) -o $@
X-+	$(CC) `gtk12-config --libs` $(OBJS) -o $@
X++	$(CC) $(CFLAGS) `$(GTK_CONFIG) --libs` $(OBJS) -o $@
X  
X  getopt: getopt.c
X- 	$(CC) -DTEST_LONG_OPTIONS $< -o $@
X-@@ -26,4 +26,4 @@
X- sf_control.o:  $(HDRS)
X- sf_generate.o: $(HDRS)
X- sf_view.o:     $(HDRS) $(INCS)
X+-	$(CC) -DTEST_LONG_OPTIONS $< -o $@
X++	$(CC) $(CFLAGS) -DTEST_LONG_OPTIONS $< -o $@
X+ 
X+ clean: 
X+ 	rm -f *~ *.o snowflake
END-of-misc_snowflake.patch
echo x - net_ggsd.patch
sed 's/^X//' >net_ggsd.patch << 'END-of-net_ggsd.patch'
Xdiff -urN /usr/ports/net/ggsd/Makefile net/ggsd/Makefile
X--- /usr/ports/net/ggsd/Makefile	Fri Jun 30 19:55:24 2000
X+++ net/ggsd/Makefile	Sat Jul  1 18:33:16 2000
X@@ -18,18 +18,23 @@
X 
X LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
X 
X-WRKSRC=		${WRKDIR}/GGSD
X EXTRACT_CMD=	${TAR}
X EXTRACT_BEFORE_ARGS=	-xf
X EXTRACT_AFTER_ARGS=	# empty
X 
X+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
X+
X+WRKSRC=		${WRKDIR}/GGSD
X+
X+MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
X+
X do-install:
X 
X-		@ ${INSTALL_PROGRAM} ${WRKSRC}/ggsd ${PREFIX}/bin
X+	${INSTALL_PROGRAM} ${WRKSRC}/ggsd ${PREFIX}/bin
X .if !defined(NOPORTDOCS)
X-		@ ${MKDIR} ${PREFIX}/share/doc/ggsd
X-		@ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/ggsd
X-		@ ${INSTALL_DATA} ${WRKSRC}/example.scr ${PREFIX}/share/doc/ggsd
X+	@${MKDIR} ${PREFIX}/share/doc/ggsd
X+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/ggsd
X+	${INSTALL_DATA} ${WRKSRC}/example.scr ${PREFIX}/share/doc/ggsd
X .endif
X 
X .include <bsd.port.mk>
Xdiff -urN /usr/ports/net/ggsd/patches/patch-aa net/ggsd/patches/patch-aa
X--- /usr/ports/net/ggsd/patches/patch-aa	Thu Apr 22 16:50:40 1999
X+++ net/ggsd/patches/patch-aa	Sat Jul  1 18:32:04 2000
X@@ -1,11 +1,13 @@
X---- Makefile.orig	Fri Feb 12 02:22:22 1999
X-+++ Makefile	Sat Feb 27 12:37:20 1999
X-@@ -1,5 +1,6 @@
X- CC=gcc
X+--- Makefile.orig	Fri Feb 12 16:22:22 1999
X++++ Makefile	Sat Jul  1 18:31:53 2000
X+@@ -1,6 +1,7 @@
X+-CC=gcc
X -CFLAGS=-Wall -O -DUSE_GUI `gtk-config --cflags` -DVERSION=\"0.1\"
X -LIBS=`gtk-config --libs`
X++CC?=gcc
X +CFLAGS?=-O
X-+CFLAGS+=-Wall -DUSE_GUI `gtk12-config --cflags` -DVERSION=\"0.1\"
X-+LIBS=`gtk12-config --libs`
X++CFLAGS+=-DUSE_GUI `$(GTK_CONFIG) --cflags` -DVERSION=\"0.1\"
X++LIBS=`$(GTK_CONFIG) --libs`
X  
X  all:
X+ 	$(CC) $(CFLAGS) -o ggsd ggsd.c $(LIBS)
END-of-net_ggsd.patch
echo x - net_gicq.patch
sed 's/^X//' >net_gicq.patch << 'END-of-net_gicq.patch'
Xdiff -urN /usr/ports/net/gicq/Makefile net/gicq/Makefile
X--- /usr/ports/net/gicq/Makefile	Fri Jun 30 19:55:25 2000
X+++ net/gicq/Makefile	Sat Jul  1 10:03:57 2000
X@@ -17,12 +17,14 @@
X LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12	\
X 		icq.0:${PORTSDIR}/net/libicq
X 
X+GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
X GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
X 
X USE_X_PREFIX=	yes
X GNU_CONFIGURE=	yes
X CONFIGURE_ARGS=	--without-gnome --disable-nls
X CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
X+		GLIB_CONFIG="${GLIB_CONFIG}" \
X 		GTK_CONFIG="${GTK_CONFIG}" \
X 		LIBS="-L${LOCALBASE}/lib"
X 
Xdiff -urN /usr/ports/net/gicq/patches/patch-ab net/gicq/patches/patch-ab
X--- /usr/ports/net/gicq/patches/patch-ab	Tue Apr  6 21:16:54 1999
X+++ net/gicq/patches/patch-ab	Sat Jul  1 10:04:24 2000
X@@ -5,7 +5,7 @@
X  else
X    ac_save_LIBS="$LIBS"
X -LIBS="-licq "`glib-config --libs`" $LIBS"
X-+LIBS="-licq "`glib12-config --libs`" $LIBS"
X++LIBS="-licq "`$GLIB_CONFIG --libs`" $LIBS"
X  cat > conftest.$ac_ext <<EOF
X  #line 3985 "configure"
X  #include "confdefs.h"
END-of-net_gicq.patch
echo x - palm_pilrc.patch
sed 's/^X//' >palm_pilrc.patch << 'END-of-palm_pilrc.patch'
Xdiff -urN /usr/ports/palm/pilrc/Makefile palm/pilrc/Makefile
X--- /usr/ports/palm/pilrc/Makefile	Fri Apr 21 19:11:45 2000
X+++ palm/pilrc/Makefile	Sat Jul  1 09:01:32 2000
X@@ -13,11 +13,13 @@
X 
X MAINTAINER=	kuriyama@FreeBSD.org
X 
X-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
X-		glib12.3:${PORTSDIR}/devel/glib12
X+LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
X+
X+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
X 
X USE_ZIP=	YES
X NO_WRKSUBDIR=	YES
X+MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
X 
X do-install:
X 	${INSTALL_PROGRAM} ${WRKSRC}/pilrc ${WRKSRC}/pilrcui ${PREFIX}/bin
Xdiff -urN /usr/ports/palm/pilrc/patches/patch-aa palm/pilrc/patches/patch-aa
X--- /usr/ports/palm/pilrc/patches/patch-aa	Fri Mar 31 14:16:30 2000
X+++ palm/pilrc/patches/patch-aa	Sat Jul  1 18:26:34 2000
X@@ -1,11 +1,17 @@
X --- Makefile.orig	Sun Feb  6 21:06:08 2000
X-+++ Makefile	Wed Mar 29 21:03:03 2000
X-@@ -4,7 +4,7 @@
X- CC 	= gcc
X- CFLAGS 	= -Wall -O2 -g -DUNIX
X- XINC	= -I/local/include
X++++ Makefile	Sat Jul  1 18:26:25 2000
X+@@ -1,10 +1,10 @@
X+ OBJS 	= pilrc.o lex.o util.o bitmap.o main.o font.o plex.o
X+ XOBJS	= pilrc.o lex.o util.o bitmap.o xwin.o font.o plex.o
X+ 
X+-CC 	= gcc
X+-CFLAGS 	= -Wall -O2 -g -DUNIX
X+-XINC	= -I/local/include
X -XLIBS 	= -L/local/lib -lgtk -lgdk -lglib -lX11 -lm
X-+XLIBS 	= -L/local/lib -lgtk12 -lgdk12 -lglib12 -lX11 -lm
X++CC 	?= gcc
X++CFLAGS 	+= -DUNIX
X++XINC	= -I${X11BASE}/include
X++XLIBS 	= -L${X11BASE}/lib -lgtk12 -lgdk12 -lglib12 -lX11 -lm
X  
X  all: pilrc pilrcui
X  
X@@ -14,11 +20,11 @@
X  
X  pilrcui: $(OBJS) $(XOBJS)
X -	$(CC) `gtk-config --libs` $(CFLAGS) $(XOBJS) -o pilrcui $(XLIBS)
X-+	$(CC) `gtk12-config --libs` $(CFLAGS) $(XOBJS) -o pilrcui $(XLIBS)
X++	$(CC) `$(GTK_CONFIG) --libs` $(CFLAGS) $(XOBJS) -o pilrcui $(XLIBS)
X  
X  xwin.o: xwin.c
X -	$(CC) `gtk-config --cflags` $(CFLAGS) $(XINC) -c xwin.c -o xwin.o
X-+	$(CC) `gtk12-config --cflags` $(CFLAGS) $(XINC) -c xwin.c -o xwin.o
X++	$(CC) `$(GTK_CONFIG) --cflags` $(CFLAGS) $(XINC) -c xwin.c -o xwin.o
X  
X  clean:
X  	rm -f *.[oa] stamp.pilrc
END-of-palm_pilrc.patch
echo x - security_gpasman.patch
sed 's/^X//' >security_gpasman.patch << 'END-of-security_gpasman.patch'
Xdiff -urN /usr/ports/security/gpasman/Makefile security/gpasman/Makefile
X--- /usr/ports/security/gpasman/Makefile	Mon Apr 10 21:01:06 2000
X+++ security/gpasman/Makefile	Sat Jul  1 18:10:38 2000
X@@ -14,9 +14,12 @@
X 
X LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
X 
X+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
X+
X USE_GMAKE=	yes
X USE_X_PREFIX=	yes
X GNU_CONFIGURE=	yes
X+CONFIGURE_ENV=	GTKCONFIG="${GTK_CONFIG}"
X 
X do-install:
X 	 ${INSTALL_PROGRAM} ${WRKSRC}/src/gpasman ${PREFIX}/bin
Xdiff -urN /usr/ports/security/gpasman/patches/patch-aa security/gpasman/patches/patch-aa
X--- /usr/ports/security/gpasman/patches/patch-aa	Mon Nov  1 10:27:47 1999
X+++ security/gpasman/patches/patch-aa	Thu Jan  1 09:00:00 1970
X@@ -1,13 +0,0 @@
X---- configure.orig	Thu May  6 05:46:20 1999
X-+++ configure	Sun Sep 19 13:56:26 1999
X-@@ -871,8 +871,8 @@
X- done
X- test -n "$strip" || strip="/usr/bin/strip"
X- 
X--# Extract the first word of "gtk-config", so it can be a program name with args.
X--set dummy gtk-config; ac_word=$2
X-+# Extract the first word of "gtk12-config", so it can be a program name with args.
X-+set dummy gtk12-config; ac_word=$2
X- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
X- echo "configure:878: checking for $ac_word" >&5
X- if eval "test \"`echo '$''{'ac_cv_path_GTKCONFIG'+set}'`\" = set"; then
Xdiff -urN /usr/ports/security/gpasman/patches/patch-ab security/gpasman/patches/patch-ab
X--- /usr/ports/security/gpasman/patches/patch-ab	Mon Nov  1 10:27:47 1999
X+++ security/gpasman/patches/patch-ab	Sat Jul  1 18:19:51 2000
X@@ -1,5 +1,5 @@
X---- src/Makefile.in.orig	Sun Sep 19 13:56:52 1999
X-+++ src/Makefile.in	Sun Sep 19 13:57:20 1999
X+--- src/Makefile.in.orig	Fri Sep  3 00:50:10 1999
X++++ src/Makefile.in	Sat Jul  1 18:19:43 2000
X @@ -26,9 +26,9 @@
X  
X  
X@@ -12,3 +12,12 @@
X  INSTALL = @INSTALL@
X  
X  SRCS = librc2.c file.c gpasman.c
X+@@ -39,7 +39,7 @@
X+ 	$(CC) -o gpasman $(OBJS) $(LDFLAGS) $(LIBS)
X+ 
X+ .c.o: $(SRCS)
X+-	$(CC) -O2 -Wall $(CFLAGS) -c -o $@ $<
X++	$(CC) $(CFLAGS) -c -o $@ $<
X+ 
X+ clean:
X+ 	rm -f $(OBJS) gpasman core *~ *.bak
END-of-security_gpasman.patch
echo x - textproc_gdict.patch
sed 's/^X//' >textproc_gdict.patch << 'END-of-textproc_gdict.patch'
Xdiff -urN /usr/ports/textproc/gdict/Makefile textproc/gdict/Makefile
X--- /usr/ports/textproc/gdict/Makefile	Mon Apr 10 21:03:31 2000
X+++ textproc/gdict/Makefile	Sat Jul  1 09:06:51 2000
X@@ -14,6 +14,10 @@
X 
X LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
X 
X+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
X+
X+MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
X+
X do-install:
X 	${INSTALL_PROGRAM} ${WRKSRC}/gdict ${PREFIX}/bin
X 	${INSTALL_PROGRAM} ${WRKSRC}/dict ${PREFIX}/bin/cdict
Xdiff -urN /usr/ports/textproc/gdict/patches/patch-aa textproc/gdict/patches/patch-aa
X--- /usr/ports/textproc/gdict/patches/patch-aa	Thu Jul 22 22:14:20 1999
X+++ textproc/gdict/patches/patch-aa	Sat Jul  1 09:06:07 2000
X@@ -8,7 +8,7 @@
X -CFL_GTK	= $(CFLAGS) `gtk-config --cflags` `gtk-config --libs`
X +CC	?= gcc
X +CFLAGS	?= -O6 -Wall
X-+CFL_GTK	= $(CFLAGS) `gtk12-config --cflags` `gtk12-config --libs`
X++CFL_GTK	= $(CFLAGS) `$(GTK_CONFIG) --cflags` `$(GTK_CONFIG) --libs`
X  CFL	= $(CFLAGS)
X  OBJECTS_GDICT	= gdict.c 
X  OBJECTS_DICT	= dict.c
END-of-textproc_gdict.patch
echo x - www_erwm.patch
sed 's/^X//' >www_erwm.patch << 'END-of-www_erwm.patch'
Xdiff -urN /usr/ports/www/erwn/Makefile www/erwn/Makefile
X--- /usr/ports/www/erwn/Makefile	Mon Apr 17 20:16:47 2000
X+++ www/erwn/Makefile	Sat Jul  1 17:57:37 2000
X@@ -19,9 +19,9 @@
X 
X USE_X_PREFIX=	yes
X USE_GMAKE=	yes
X+MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
X 
X post-install:
X-	@strip ${PREFIX}/bin/erwin
X .if !defined(NOPORTDOCS)
X 	@${ECHO} "===>   Installing README in ${PREFIX}/share/doc/erwin"
X 	@${MKDIR} ${PREFIX}/share/doc/erwin && ${CHMOD} a+rx ${PREFIX}/share/doc/erwin
Xdiff -urN /usr/ports/www/erwn/patches/patch-aa www/erwn/patches/patch-aa
X--- /usr/ports/www/erwn/patches/patch-aa	Mon Sep 20 09:43:11 1999
X+++ www/erwn/patches/patch-aa	Sat Jul  1 17:57:27 2000
X@@ -1,5 +1,5 @@
X---- Makefile.orig	Sat Jul 24 15:33:08 1999
X-+++ Makefile	Sun Sep 19 13:48:47 1999
X+--- Makefile.orig	Sun Jul 25 05:33:08 1999
X++++ Makefile	Sat Jul  1 17:57:20 2000
X @@ -2,14 +2,14 @@
X  bindir		= $(prefix)/bin
X  
X@@ -10,23 +10,34 @@
X  OBJS		= erwin.o erwinmenu.o erwinfunctions.o erwintoolbar.o \
X  		  erwinnotebook.o erwindialogs.o erwintags.o gtkmessage.o
X  INSTALL		= install
X- DEBUG		= -g -DDEBUG
X+-DEBUG		= -g -DDEBUG
X++DEBUG		= # -g -DDEBUG
X  
X -CFLAGS		= -DNAME=\"$(NAME)\" $(DEBUG) -Wall -O2 -m486 -fno-strength-reduce -malign-functions=4 -malign-jumps=4 -malign-loops=4 -ffast-math -fexpensive-optimizations
X-+CFLAGS		= -DNAME=\"$(NAME)\" $(DEBUG) -Wall -O2 -fno-strength-reduce -ffast-math -fexpensive-optimizations
X++CFLAGS		+= -DNAME=\"$(NAME)\" $(DEBUG) -fno-strength-reduce -ffast-math -fexpensive-optimizations
X  
X  all: license $(PROG)
X  
X-@@ -28,10 +28,10 @@
X+@@ -17,8 +17,7 @@
X+ 	strip $(PROG)
X+ 
X+ install:	strip
X+-	$(INSTALL) -d $(bindir)
X+-	$(INSTALL) -m 0755 $(PROG) $(bindir)
X++	${BSD_INSTALL_PROGRAM} $(PROG) $(bindir)
X+ 
X+ uninstall:
X+ 	
X+@@ -28,10 +27,10 @@
X  	rm -f $(PROG) $(OBJS) *.?~ core license.h
X  
X  $(PROG):	$(OBJS)
X -	$(CC) $(LDFLAGS) $(shell gtk-config --libs) -o $@ $(OBJS)
X-+	$(CC) $(LDFLAGS) $(shell gtk12-config --libs) -o $@ $(OBJS)
X++	$(CC) $(LDFLAGS) `$(GTK_CONFIG) --libs` -o $@ $(OBJS)
X  
X  %.o:		%.c
X -	$(CC) $(CFLAGS) $(shell gtk-config --cflags) -o $@ -c $<
X-+	$(CC) $(CFLAGS) $(shell gtk12-config --cflags) -o $@ -c $<
X++	$(CC) $(CFLAGS) `$(GTK_CONFIG) --cflags` -o $@ -c $<
X  
X  tar:	clean
X  	cd ..; ln -s erwin $(NAME);tar cf - $(NAME)/* > $(NAME).tar;rm $(NAME);gzip -f $(NAME).tar
END-of-www_erwm.patch
echo x - www_nscache.patch
sed 's/^X//' >www_nscache.patch << 'END-of-www_nscache.patch'
Xdiff -urN /usr/ports/www/nscache/Makefile www/nscache/Makefile
X--- /usr/ports/www/nscache/Makefile	Mon Apr 10 21:05:33 2000
X+++ www/nscache/Makefile	Sat Jul  1 19:26:50 2000
X@@ -16,6 +16,15 @@
X 
X LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
X 
X-USE_AUTOCONF=	yes
X+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
X+
X+USE_AUTOMAKE=	yes
X+AUTOMAKE=	automake -a -i
X+CONFIGURE_ENV=	CPPFALGS="-I${LOCALBASE}/include" \
X+		GTK_CONFIG="${GTK_CONFIG}" \
X+		LIBS="-L${LOCALBASE}/lib"
X+
X+pre-configure:
X+	@cd ${WRKSRC}; aclocal -I ${X11BASE}/share/aclocal
X 
X .include <bsd.port.mk>
Xdiff -urN /usr/ports/www/nscache/patches/patch-aa www/nscache/patches/patch-aa
X--- /usr/ports/www/nscache/patches/patch-aa	Sun Mar  5 19:15:04 2000
X+++ www/nscache/patches/patch-aa	Sat Jul  1 19:11:07 2000
X@@ -1,6 +1,6 @@
X---- configure.in.orig	Sat Jan 15 09:40:55 2000
X-+++ configure.in	Sun Mar  5 02:00:42 2000
X-@@ -41,14 +41,14 @@
X+--- configure.in.orig	Sun Jan 16 02:40:55 2000
X++++ configure.in	Sat Jul  1 19:10:54 2000
X+@@ -41,17 +41,11 @@
X  
X  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"))
X  
X@@ -10,12 +10,13 @@
X  AC_CHECK_HEADER(db1/db.h, CFLAGS="$CFLAGS -DHAVE_DB1_H", AC_CHECK_HEADER(db.h, CFLAGS="$CFLAGS -DHAVE_DB_H"))
X  
X -AC_CHECK_PROG(GTK_CONFIG, gtk-config, "yes", "no")
X-+AC_CHECK_PROG(GTK_CONFIG, gtk12-config, "yes", "no")
X- if eval "test x$GTK_CONFIG = xyes"; then
X+-if eval "test x$GTK_CONFIG = xyes"; then
X -	CFLAGS="$CFLAGS `gtk-config --cflags`"
X -	LIBS="$LIBS `gtk-config --libs`"
X-+	CFLAGS="$CFLAGS `gtk12-config --cflags`"
X-+	LIBS="$LIBS `gtk12-config --libs`"
X- else
X- 	AC_MSG_ERROR("Unable to find \"gtk-config\" program")
X- fi
X+-else
X+-	AC_MSG_ERROR("Unable to find \"gtk-config\" program")
X+-fi
X++AM_PATH_GTK(1.2.0, , AC_MSG_ERROR(GTK+ is not installed or badly configured on your system...))
X+ 
X+ AC_SUBST(CFLAGS)
X+ AC_SUBST(LIBS)
Xdiff -urN /usr/ports/www/nscache/patches/patch-ab www/nscache/patches/patch-ab
X--- /usr/ports/www/nscache/patches/patch-ab	Thu Jan  1 09:00:00 1970
X+++ www/nscache/patches/patch-ab	Sat Jul  1 20:03:22 2000
X@@ -0,0 +1,19 @@
X+--- Makefile.am.orig	Tue Jan 18 04:49:06 2000
X++++ Makefile.am	Sat Jul  1 20:03:06 2000
X+@@ -1,5 +1,7 @@
X+ SUBDIRS = @MSUBDIRS@
X+ 
X++INCLUDES = $(GTK_CFLAGS)
X++
X+ bin_PROGRAMS = nscache
X+ 
X+ nscache_SOURCES = \
X+@@ -12,6 +14,8 @@
X+ 	indexdb.h \
X+ 	nls.h \
X+ 	setup.c
X++        
X++nscache_LDADD = $(GTK_LIBS)
X+ 
X+ nscache.pot: $(nscache_SOURCES)
X+ 	xgettext --default-domain=nscache -n -E -o $@ $(nscache_SOURCES)
Xdiff -urN /usr/ports/www/nscache/pkg/PLIST www/nscache/pkg/PLIST
X--- /usr/ports/www/nscache/pkg/PLIST	Sun Mar  5 19:15:06 2000
X+++ www/nscache/pkg/PLIST	Sat Jul  1 19:36:25 2000
X@@ -1 +1,4 @@
X bin/nscache
X+share/locale/de/LC_MESSAGES/nscache.mo
X+share/locale/it/LC_MESSAGES/nscache.mo
X+share/locale/sk/LC_MESSAGES/nscache.mo
END-of-www_nscache.patch
echo x - x11-clocks_asclock-gtk.patch
sed 's/^X//' >x11-clocks_asclock-gtk.patch << 'END-of-x11-clocks_asclock-gtk.patch'
Xdiff -urN /usr/ports/x11-clocks/asclock-gtk/Makefile x11-clocks/asclock-gtk/Makefile
X--- /usr/ports/x11-clocks/asclock-gtk/Makefile	Fri Apr 21 19:14:18 2000
X+++ x11-clocks/asclock-gtk/Makefile	Sat Jul  1 09:17:26 2000
X@@ -15,9 +15,13 @@
X 
X LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
X 
X+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
X+
X+WRKSRC=		${WRKDIR}/${PORTNAME}
X+
X HAS_CONFIGURE=	YES
X-WRKSRC=		${WRKDIR}/asclock-gtk
X USE_X_PREFIX=	YES
X+MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
X ALL_TARGET=	asclock
X 
X .if defined(BATCH)
Xdiff -urN /usr/ports/x11-clocks/asclock-gtk/patches/patch-aa x11-clocks/asclock-gtk/patches/patch-aa
X--- /usr/ports/x11-clocks/asclock-gtk/patches/patch-aa	Sun Jun 13 23:21:23 1999
X+++ x11-clocks/asclock-gtk/patches/patch-aa	Sat Jul  1 17:43:16 2000
X@@ -1,13 +1,15 @@
X --- Makefile.orig	Fri Mar 26 16:08:33 1999
X-+++ Makefile	Wed May  5 12:23:28 1999
X-@@ -2,18 +2,19 @@
X++++ Makefile	Sat Jul  1 17:43:08 2000
X+@@ -1,19 +1,20 @@
X+ CP=cp -f
X  MKDIR=mkdir -p
X  
X- CFLAGS = -Wall -g
X+-CFLAGS = -Wall -g
X++CFLAGS?= -Wall -g
X +PREFIX?= /usr/local
X  
X -GNOME_CC = gcc $(CFLAGS) -DASCLOCK_THEMES_DIR=\""/usr/local/share/asclock"\" \
X-+GNOME_CC = gcc $(CFLAGS) -DASCLOCK_THEMES_DIR=\""${PREFIX}/share/asclock/themes/"\" \
X++GNOME_CC = $(CC) $(CFLAGS) -DASCLOCK_THEMES_DIR=\""${PREFIX}/share/asclock/themes/"\" \
X             -DASCLOCK_GNOME `gnome-config --cflags gnomeui gnome gtk`
X  GNOME_OBJS = .gnome/draw.o .gnome/asclock.o .gnome/config.o .gnome/rot.o .gnome/parser.o \
X  		.gnome/symbols.o .gnome/dialogs.o .gnome/timezone.o .gnome/gnome_config.o
X@@ -16,11 +18,11 @@
X  
X -GTK_CC = gcc $(CFLAGS) -DASCLOCK_THEMES_DIR=\""/usr/local/share/asclock"\" \
X -	     -DASCLOCK_GTK `$(CONFIG_PATH)gtk-config --cflags`
X-+GTK_CC = gcc $(CFLAGS) -DASCLOCK_THEMES_DIR=\""${PREFIX}/share/asclock/themes/"\" \
X-+	     -DASCLOCK_GTK `$(CONFIG_PATH)gtk12-config --cflags`
X++GTK_CC = $(CC) $(CFLAGS) -DASCLOCK_THEMES_DIR=\""${PREFIX}/share/asclock/themes/"\" \
X++	     -DASCLOCK_GTK `$(GTK_CONFIG) --cflags`
X  GTK_OBJS = .gtk/draw.o .gtk/asclock.o .gtk/config.o .gtk/rot.o .gtk/parser.o .gtk/symbols.o
X -GTK_LIBS = `$(CONFIG_PATH)gtk-config --libs`
X-+GTK_LIBS = `$(CONFIG_PATH)gtk12-config --libs`
X++GTK_LIBS = `$(GTK_CONFIG) --libs`
X  
X  
X  info:	default_theme
X@@ -46,24 +48,24 @@
X -	$(MKDIR) /usr/local/share/asclock/themes/shaped
X -	$(CP) themes/shaped/* /usr/local/share/asclock/themes/shaped
X -#	$(CP) -rf themes/* /usr/local/share/asclock/
X-+	$(CP) asclock ${PREFIX}/bin
X++	${BSD_INSTALL_PROGRAM} asclock ${PREFIX}/bin
X +	$(MKDIR) ${PREFIX}/share/asclock
X +	$(MKDIR) ${PREFIX}/share/asclock/themes
X +	$(MKDIR) ${PREFIX}/share/asclock/themes/Newstone
X-+	$(CP) themes/Newstone/* ${PREFIX}/share/asclock/themes/Newstone
X++	${BSD_INSTALL_DATA} themes/Newstone/* ${PREFIX}/share/asclock/themes/Newstone
X +	$(MKDIR) ${PREFIX}/share/asclock/themes/Orb
X-+	$(CP) themes/Orb/* ${PREFIX}/share/asclock/themes/Orb
X++	${BSD_INSTALL_DATA} themes/Orb/* ${PREFIX}/share/asclock/themes/Orb
X +	$(MKDIR) ${PREFIX}/share/asclock/themes/Stone
X-+	$(CP) themes/Stone/* ${PREFIX}/share/asclock/themes/Stone
X++	${BSD_INSTALL_DATA} themes/Stone/* ${PREFIX}/share/asclock/themes/Stone
X +	$(MKDIR) ${PREFIX}/share/asclock/themes/analog
X-+	$(CP) themes/analog/* ${PREFIX}/share/asclock/themes/analog
X++	${BSD_INSTALL_DATA} themes/analog/* ${PREFIX}/share/asclock/themes/analog
X +	$(MKDIR) ${PREFIX}/share/asclock/themes/beats
X-+	$(CP) themes/beats/* ${PREFIX}/share/asclock/themes/beats
X++	${BSD_INSTALL_DATA} themes/beats/* ${PREFIX}/share/asclock/themes/beats
X +	$(MKDIR) ${PREFIX}/share/asclock/themes/classic
X-+	$(CP) themes/classic/* ${PREFIX}/share/asclock/themes/classic
X++	${BSD_INSTALL_DATA} themes/classic/* ${PREFIX}/share/asclock/themes/classic
X +	$(MKDIR) ${PREFIX}/share/asclock/themes/shaped
X-+	$(CP) themes/shaped/* ${PREFIX}/share/asclock/themes/shaped
X-+#	$(CP) -rf themes/* ${PREFIX}/share/asclock/
X++	${BSD_INSTALL_DATA} themes/shaped/* ${PREFIX}/share/asclock/themes/shaped
X++#	${BSD_INSTALL_DATA} -rf themes/* ${PREFIX}/share/asclock/
X  
X  clean: 
X  	rm -rf core *.o *~ .gtk .gnome asclock asclock_applet
END-of-x11-clocks_asclock-gtk.patch
echo x - x11-toolkits_xenophilia.patch
sed 's/^X//' >x11-toolkits_xenophilia.patch << 'END-of-x11-toolkits_xenophilia.patch'
Xdiff -urN /usr/ports/x11-toolkits/xenophilia/Makefile x11-toolkits/xenophilia/Makefile
X--- /usr/ports/x11-toolkits/xenophilia/Makefile	Tue Jun  6 19:16:55 2000
X+++ x11-toolkits/xenophilia/Makefile	Sat Jul  1 17:46:02 2000
X@@ -15,8 +15,11 @@
X 
X LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
X 
X+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
X+
X USE_X_PREFIX=	yes
X-ALL_TARGET=
X+MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
X+ALL_TARGET=	# empty
X 
X pre-install:
X 		@${MKDIR} ${PREFIX}/lib/gtk/themes/engines
Xdiff -urN /usr/ports/x11-toolkits/xenophilia/patches/patch-aa x11-toolkits/xenophilia/patches/patch-aa
X--- /usr/ports/x11-toolkits/xenophilia/patches/patch-aa	Thu Jun  1 17:20:49 2000
X+++ x11-toolkits/xenophilia/patches/patch-aa	Sat Jul  1 09:22:28 2000
X@@ -13,8 +13,8 @@
X -CFLAGS		= `gtk-config --cflags`
X -LIBS		= `gtk-config --libs`
X +CC		?= gcc
X-+CFLAGS		+= `$(X11BASE)/bin/gtk12-config --cflags` -fPIC -DPIC
X-+LIBS		+= `$(X11BASE)/bin/gtk12-config --libs`
X++CFLAGS		+= `$(GTK_CONFIG) --cflags` -fPIC -DPIC
X++LIBS		+= `$(GTK_CONFIG) --libs`
X  
X  #Use these for FreeBSD:
X  #PREFIX		= `gtk12-config --prefix`
END-of-x11-toolkits_xenophilia.patch
echo x - x11-wm_spager.patch
sed 's/^X//' >x11-wm_spager.patch << 'END-of-x11-wm_spager.patch'
Xdiff -urN /usr/ports/x11-wm/spager/Makefile x11-wm/spager/Makefile
X--- /usr/ports/x11-wm/spager/Makefile	Mon Jun  5 21:57:37 2000
X+++ x11-wm/spager/Makefile	Sat Jul  1 17:38:33 2000
X@@ -13,25 +13,26 @@
X MAINTAINER=	nakai@FreeBSD.org
X 
X RUN_DEPENDS=	sawfish:${PORTSDIR}/x11-wm/sawfish
X-LIB_DEPENDS=	gtk12.1:${PORTSDIR}/x11-toolkits/gtk12
X+LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
X+
X+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
X 
X-ALL_TARGET=	spager
X USE_X_PREFIX=	yes
X+MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
X+ALL_TARGET=	spager
X 
X-pre-build:
X+post-extract:
X 		${RM} -f ${WRKSRC}/spager
X 
X+post-patch:
X+		${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/sample.rc
X+
X do-install:
X 		${INSTALL_PROGRAM} ${WRKSRC}/spager ${PREFIX}/bin/
X 		${MKDIR} ${PREFIX}/share/spager
X 		${INSTALL_SCRIPT} ${WRKSRC}/spager.jl ${PREFIX}/share/spager
X 		${INSTALL_SCRIPT} ${WRKSRC}/x-message.jl ${PREFIX}/share/spager
X 		${INSTALL_DATA} ${WRKSRC}/sample.rc ${PREFIX}/share/spager
X-
X-post-install:
X-		@${ECHO_MSG} "*******************************************"
X-		@${ECHO_MSG} " Append ${PREFIX}/share/spager/sample.rc "
X-		@${ECHO_MSG} " to your ~/.sawfishrc"
X-		@${ECHO_MSG} "*******************************************"
X+		@${CAT} ${PKGMESSAGE}
X 
X .include <bsd.port.mk>
Xdiff -urN /usr/ports/x11-wm/spager/patches/patch-aa x11-wm/spager/patches/patch-aa
X--- /usr/ports/x11-wm/spager/patches/patch-aa	Mon Jun  5 21:57:37 2000
X+++ x11-wm/spager/patches/patch-aa	Sat Jul  1 17:39:44 2000
X@@ -1,11 +1,15 @@
X---- Makefile.orig	Mon Jun  5 12:39:44 2000
X-+++ Makefile	Mon Jun  5 12:39:52 2000
X-@@ -21,7 +21,7 @@
X- CC = gcc
X+--- Makefile.orig	Mon May 22 04:36:02 2000
X++++ Makefile	Sat Jul  1 17:39:37 2000
X+@@ -18,10 +18,10 @@
X+ # along with spager; see the file COPYING.  If not, write to
X+ # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
X+ 
X+-CC = gcc
X++CC ?= gcc
X  
X  spager: spager.c 
X -	$(CC) -O6 -Wall `gtk-config --cflags`  spager.c -o spager `gtk-config --libs`
X-+	$(CC) -O6 -Wall `gtk12-config --cflags`  spager.c -o spager `gtk12-config --libs`
X++	$(CC) $(CFLAGS) `$(GTK_CONFIG) --cflags`  spager.c -o spager `$(GTK_CONFIG) --libs`
X  
X  clean: 
X  	rm -f *.o spager
Xdiff -urN /usr/ports/x11-wm/spager/patches/patch-ab x11-wm/spager/patches/patch-ab
X--- /usr/ports/x11-wm/spager/patches/patch-ab	Mon Jun  5 21:57:37 2000
X+++ x11-wm/spager/patches/patch-ab	Sat Jul  1 08:07:52 2000
X@@ -5,8 +5,8 @@
X  
X  ;; This is the directory where the archive is untarred.
X -(setq spager-directory "/home/satyaki/spager")
X-+(setq spager-directory "/usr/X11R6/share/spager")
X-+(setq spager-bin-directory "/usr/X11R6/bin")
X++(setq spager-directory "%%PREFIX%%/share/spager")
X++(setq spager-bin-directory "%%PREFIX%%/bin")
X  
X  ;; I don't think you need to change anything under this line...
X  (setq load-path (cons spager-directory load-path))
Xdiff -urN /usr/ports/x11-wm/spager/pkg/MESSAGE x11-wm/spager/pkg/MESSAGE
X--- /usr/ports/x11-wm/spager/pkg/MESSAGE	Thu Jan  1 09:00:00 1970
X+++ x11-wm/spager/pkg/MESSAGE	Sat Jul  1 09:28:09 2000
X@@ -0,0 +1,4 @@
X+*******************************************
X+ Append ${PREFIX}/share/spager/sample.rc
X+ to your ~/.sawfishrc
X+*******************************************
END-of-x11-wm_spager.patch
echo x - x11_gmessage.patch
sed 's/^X//' >x11_gmessage.patch << 'END-of-x11_gmessage.patch'
Xdiff -urN /usr/ports/x11/gmessage/Makefile x11/gmessage/Makefile
X--- /usr/ports/x11/gmessage/Makefile	Fri Apr 14 18:57:03 2000
X+++ x11/gmessage/Makefile	Sat Jul  1 09:13:21 2000
X@@ -14,6 +14,9 @@
X 
X LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
X 
X+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
X+
X USE_X_PREFIX=	yes
X+MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
X 
X .include <bsd.port.mk>
Xdiff -urN /usr/ports/x11/gmessage/patches/patch-aa x11/gmessage/patches/patch-aa
X--- /usr/ports/x11/gmessage/patches/patch-aa	Thu Sep  9 11:22:48 1999
X+++ x11/gmessage/patches/patch-aa	Sat Jul  1 17:52:45 2000
X@@ -1,11 +1,12 @@
X---- Makefile.orig	Sun Jul 18 17:55:35 1999
X-+++ Makefile	Sun Jul 18 17:57:42 1999
X+--- Makefile.orig	Thu May 27 19:58:06 1999
X++++ Makefile	Sat Jul  1 17:48:44 2000
X @@ -1,6 +1,6 @@
X- CC = gcc
X+-CC = gcc
X -CFLAGS = `gtk-config --cflags`
X -LDLIBS = `gtk-config --libs`
X-+CFLAGS = `gtk12-config --cflags`
X-+LDLIBS = `gtk12-config --libs`
X++CC ?= gcc
X++CFLAGS += `$(GTK_CONFIG) --cflags`
X++LDLIBS = `$(GTK_CONFIG) --libs`
X  
X  all:	gmessage
X  
X@@ -14,7 +15,7 @@
X  
X  install: gmessage
X -	cp ./gmessage /usr/local/bin
X-+	install -m 0555 -o root -g wheel -s gmessage /usr/X11R6/bin
X++	${BSD_INSTALL_PROGRAM} gmessage ${PREFIX}/bin
X  
X  clean:
X  	$(RM) *.o core gmessage
END-of-x11_gmessage.patch
echo x - x11_gyroscope.patch
sed 's/^X//' >x11_gyroscope.patch << 'END-of-x11_gyroscope.patch'
Xdiff -urN /usr/ports/x11/gyroscope/Makefile x11/gyroscope/Makefile
X--- /usr/ports/x11/gyroscope/Makefile	Fri Jun  9 21:20:11 2000
X+++ x11/gyroscope/Makefile	Sat Jul  1 09:15:17 2000
X@@ -17,10 +17,10 @@
X 
X GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
X 
X-WRKSRC=		${WRKDIR}/gyroscope
X-USE_X_PREFIX=	yes
X+WRKSRC=		${WRKDIR}/${PORTNAME}
X 
X-do-build:
X-	@(cd ${WRKSRC} && ${MAKE})
X+USE_X_PREFIX=	yes
X+MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
X+ALL_TARGET=	# empty
X 
X .include <bsd.port.mk>
Xdiff -urN /usr/ports/x11/gyroscope/patches/patch-aa x11/gyroscope/patches/patch-aa
X--- /usr/ports/x11/gyroscope/patches/patch-aa	Wed Aug 18 17:42:02 1999
X+++ x11/gyroscope/patches/patch-aa	Sat Jul  1 17:50:27 2000
X@@ -1,19 +1,29 @@
X---- Makefile.orig	Sun Jan 31 03:30:22 1999
X-+++ Makefile	Sat Jul 31 16:27:41 1999
X-@@ -1,8 +1,8 @@
X+--- Makefile.orig	Sun Jan 31 01:30:22 1999
X++++ Makefile	Sat Jul  1 17:49:53 2000
X+@@ -1,20 +1,20 @@
X -CC = gcc
X +CC ?= gcc
X  BINARYNAME = gyroscope
X -BIN_DIR = /usr/local/bin/
X -GTKINC = `gtk-config --cflags` -Wall -O2
X -GTKLIB = `gtk-config --libs`
X-+BIN_DIR = ${X11BASE}/bin
X-+GTKINC = `gtk12-config --cflags` -Wall -O2
X-+GTKLIB = `gtk12-config --libs`
X++BIN_DIR = ${PREFIX}/bin
X++GTKINC = `$(GTK_CONFIG) --cflags`
X++GTKLIB = `$(GTK_CONFIG) --libs`
X  
X  $(BINARYNAME):	main.o gtkcolorsel.o
X- 	$(CC) -o $(BINARYNAME) main.o gtkcolorsel.o $(GTKLIB)
X-@@ -17,4 +17,4 @@
X+-	$(CC) -o $(BINARYNAME) main.o gtkcolorsel.o $(GTKLIB)
X++	$(CC) $(CFLAGS) -o $(BINARYNAME) main.o gtkcolorsel.o $(GTKLIB)
X+ 
X+ gtkcolorsel.o:gtkcolorsel.c gtkcolorsel.h
X+-	$(CC) gtkcolorsel.c -c $(GTKINC)
X++	$(CC) $(CFLAGS) gtkcolorsel.c -c $(GTKINC)
X+ 
X+ main.o:	main.c
X+-	$(CC) main.c -c	$(GTKINC)
X++	$(CC) $(CFLAGS) main.c -c	$(GTKINC)
X+ 
X+ clean:	
X  	-@ rm core -f *.o ./$(BINARYNAME)
X  
X  install:
END-of-x11_gyroscope.patch
exit



>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message