aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Mk/bsd.gnome.mk8
-rw-r--r--audio/autozen/Makefile2
-rw-r--r--audio/gkrellmms2/Makefile2
-rw-r--r--audio/gmixer/Makefile2
-rw-r--r--audio/gqmpeg/Makefile2
-rw-r--r--audio/mcplay/Makefile1
-rw-r--r--audio/musica/Makefile2
-rw-r--r--audio/rio500/Makefile2
-rw-r--r--audio/soundtracker/Makefile2
-rw-r--r--audio/wmalbum/Makefile2
-rw-r--r--audio/xmms-ahx/Makefile2
-rw-r--r--audio/xmms-curses/Makefile2
-rw-r--r--audio/xmms-faad/Makefile.inc2
-rw-r--r--audio/xmms-flac/Makefile2
-rw-r--r--audio/xmms-mailnotify/Makefile2
-rw-r--r--audio/xmms-nsf/Makefile2
-rw-r--r--audio/xmms-shn/Makefile2
-rw-r--r--audio/xmms-wavpack/Makefile2
-rw-r--r--audio/xmms-xf86audio/Makefile2
-rw-r--r--audio/xmms-xymms/Makefile2
-rw-r--r--audio/xmmsctrl/Makefile2
-rw-r--r--biology/xmolwt/Makefile2
-rw-r--r--comms/hf/Makefile2
-rw-r--r--converters/gbase/Makefile2
-rw-r--r--deskutils/babytrans/Makefile2
-rw-r--r--deskutils/gaddr/Makefile2
-rw-r--r--deskutils/ithought/Makefile2
-rw-r--r--devel/gcvs/Makefile2
-rw-r--r--devel/glib12/Makefile14
-rw-r--r--devel/glib12/files/patch-Makefile.ins52
-rw-r--r--devel/glib12/files/patch-configure52
-rw-r--r--devel/glib12/files/patch-glib-config.in27
-rw-r--r--devel/glib12/files/patch-glib.pc.in11
-rw-r--r--devel/glib12/files/patch-gmodule.pc.in9
-rw-r--r--devel/glib12/files/patch-gmodule__gmodule-dl.c23
-rw-r--r--devel/glib12/files/patch-gstrfuncs.c33
-rw-r--r--devel/glib12/files/patch-gthread.pc.in9
-rw-r--r--devel/glib12/pkg-plist29
-rw-r--r--devel/libole2/Makefile2
-rw-r--r--devel/liboop/Makefile2
-rw-r--r--devel/p5-Devel-LeakTrace/Makefile2
-rw-r--r--editors/gnotepad+/Makefile2
-rw-r--r--editors/manedit/Makefile2
-rw-r--r--emulators/bfe/Makefile2
-rw-r--r--emulators/generator-cbiere/Makefile2
-rw-r--r--emulators/generator/Makefile2
-rw-r--r--emulators/xsystem35/Makefile2
-rw-r--r--games/corewars/Makefile2
-rw-r--r--games/dopewars/Makefile2
-rw-r--r--games/garith/Makefile2
-rw-r--r--games/gtklife/Makefile2
-rw-r--r--games/hex/Makefile2
-rw-r--r--games/mindguard/Makefile2
-rw-r--r--games/netspades/Makefile2
-rw-r--r--games/wmquake/Makefile2
-rw-r--r--games/xbill/Makefile2
-rw-r--r--games/xpuyopuyo/Makefile2
-rw-r--r--games/znibbles/Makefile2
-rw-r--r--german/steak/Makefile2
-rw-r--r--graphics/bbrb/Makefile2
-rw-r--r--graphics/chbg/Makefile2
-rw-r--r--graphics/danpei/Makefile2
-rw-r--r--graphics/gcolor/Makefile2
-rw-r--r--graphics/gdk-pixbuf/Makefile2
-rw-r--r--graphics/graphopt/Makefile2
-rw-r--r--graphics/gtkgraph/Makefile2
-rw-r--r--graphics/imlib/Makefile2
-rw-r--r--japanese/ebview/Makefile2
-rw-r--r--japanese/jmode/Makefile2
-rw-r--r--japanese/jyuroku/Makefile2
-rw-r--r--japanese/netype/Makefile2
-rw-r--r--korean/ami/Makefile2
-rw-r--r--mail/faces/Makefile2
-rw-r--r--mail/gbuffy/Makefile2
-rw-r--r--mail/pop3lite/Makefile2
-rw-r--r--mail/wmmaiload/Makefile2
-rw-r--r--math/geg/Makefile2
-rw-r--r--math/grpn/Makefile2
-rw-r--r--math/surf/Makefile2
-rw-r--r--misc/grun/Makefile2
-rw-r--r--misc/gtkfind/Makefile2
-rw-r--r--multimedia/dv2jpg/Makefile2
-rw-r--r--multimedia/libmovtar/Makefile2
-rw-r--r--multimedia/openquicktime/Makefile2
-rw-r--r--multimedia/xmms/Makefile2
-rw-r--r--multimedia/xtheater/Makefile2
-rw-r--r--net-im/gale/Makefile2
-rw-r--r--net-mgmt/driftnet/Makefile2
-rw-r--r--net-p2p/gnewtellium/Makefile2
-rw-r--r--net-p2p/gtkhx/Makefile2
-rw-r--r--net-p2p/lopster/Makefile2
-rw-r--r--net-p2p/napshare/Makefile2
-rw-r--r--net/bsdproxy/Makefile1
-rw-r--r--net/gini/Makefile2
-rw-r--r--net/ipsorc/Makefile2
-rw-r--r--net/jags/Makefile2
-rw-r--r--net/libnetdude/Makefile2
-rw-r--r--net/netdude/Makefile2
-rw-r--r--net/nocatsplash/Makefile2
-rw-r--r--net/wmlj/Makefile2
-rw-r--r--net/xferstats/Makefile2
-rw-r--r--palm/pilrc/Makefile2
-rw-r--r--print/gsview/Makefile2
-rw-r--r--print/libppd/Makefile2
-rw-r--r--print/pup/Makefile2
-rw-r--r--security/crank/Makefile2
-rw-r--r--security/gpasman/Makefile2
-rw-r--r--security/gsfv/Makefile2
-rw-r--r--security/gtk-knocker/Makefile2
-rw-r--r--security/pinentry-gtk/Makefile2
-rw-r--r--security/pinentry/Makefile2
-rw-r--r--security/ssh-gui/Makefile2
-rw-r--r--security/stegdetect/Makefile2
-rw-r--r--sysutils/gcombust/Makefile2
-rw-r--r--sysutils/mount.app/Makefile2
-rw-r--r--sysutils/wmcube-gdk/Makefile2
-rw-r--r--textproc/gdict/Makefile2
-rw-r--r--x11-clocks/asclock-gtk/Makefile2
-rw-r--r--x11-clocks/wmclockmon/Makefile2
-rw-r--r--x11-clocks/wmfishtime/Makefile2
-rw-r--r--x11-fm/mtoolsfm/Makefile2
-rw-r--r--x11-fonts/gfe/Makefile2
-rw-r--r--x11-toolkits/gtk12/Makefile21
-rw-r--r--x11-toolkits/gtk12/files/patch-Makefile.in18
-rw-r--r--x11-toolkits/gtk12/files/patch-configure24
-rw-r--r--x11-toolkits/gtk12/files/patch-gdk.pc.in10
-rw-r--r--x11-toolkits/gtk12/files/patch-gdk__Makefile.in11
-rw-r--r--x11-toolkits/gtk12/files/patch-gtk+.pc.in9
-rw-r--r--x11-toolkits/gtk12/files/patch-gtk-config.in19
-rw-r--r--x11-toolkits/gtk12/files/patch-gtk__Makefile.in27
-rw-r--r--x11-toolkits/gtk12/pkg-plist263
-rw-r--r--x11-toolkits/p5-Gtk/Makefile1
-rw-r--r--x11/deskmenu/Makefile2
-rw-r--r--x11/dgs/Makefile2
-rw-r--r--x11/gdkxft/Makefile2
-rw-r--r--x11/gmessage/Makefile2
-rw-r--r--x11/gtk-launch/Makefile2
-rw-r--r--x11/gtk-theme-switch/Makefile2
-rw-r--r--x11/peeper/Makefile2
-rw-r--r--x11/xdialog/Makefile2
140 files changed, 313 insertions, 593 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index 449dd1274545..6e1a72fceb31 100644
--- a/Mk/bsd.gnome.mk
+++ b/Mk/bsd.gnome.mk
@@ -206,14 +206,14 @@ esound_CONFIGURE_ENV= ESD_CONFIG="${ESD_CONFIG}"
esound_MAKE_ENV= ESD_CONFIG="${ESD_CONFIG}"
esound_DETECT= ${ESD_CONFIG}
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
-glib12_LIB_DEPENDS= libglib-12.so:${PORTSDIR}/devel/glib12
+GLIB_CONFIG?= ${LOCALBASE}/bin/glib-config
+glib12_LIB_DEPENDS= libglib.so:${PORTSDIR}/devel/glib12
glib12_CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}"
glib12_MAKE_ENV= GLIB_CONFIG="${GLIB_CONFIG}"
glib12_DETECT= ${GLIB_CONFIG}
-GTK_CONFIG?= ${LOCALBASE}/bin/gtk12-config
-gtk12_LIB_DEPENDS= libgtk-12.so:${PORTSDIR}/x11-toolkits/gtk12
+GTK_CONFIG?= ${LOCALBASE}/bin/gtk-config
+gtk12_LIB_DEPENDS= libgtk.so:${PORTSDIR}/x11-toolkits/gtk12
gtk12_CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}"
gtk12_MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}"
gtk12_DETECT= ${GTK_CONFIG}
diff --git a/audio/autozen/Makefile b/audio/autozen/Makefile
index 1559dc78e21a..4bfbce4eaded 100644
--- a/audio/autozen/Makefile
+++ b/audio/autozen/Makefile
@@ -3,7 +3,7 @@
PORTNAME= autozen
PORTVERSION= 2.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= audio
MASTER_SITES= ftp://ftp.springdaemons.com/soft/ \
http://www.sourcefiles.org/Miscellaneous/
diff --git a/audio/gkrellmms2/Makefile b/audio/gkrellmms2/Makefile
index 55fab2e3282c..15546e707ccf 100644
--- a/audio/gkrellmms2/Makefile
+++ b/audio/gkrellmms2/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gkrellmms
PORTVERSION= 2.1.22
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= audio
MASTER_SITES= http://gkrellm.luon.net/files/
PKGNAMESUFFIX= 2
diff --git a/audio/gmixer/Makefile b/audio/gmixer/Makefile
index c862e468d161..0e176312634f 100644
--- a/audio/gmixer/Makefile
+++ b/audio/gmixer/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gmixer
PORTVERSION= 0.98c
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= cpiazza
diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index 16301ab18f3b..ef572c681fb9 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gqmpeg
PORTVERSION= 0.20.0
-PORTREVISION= 10
+PORTREVISION= 11
PORTEPOCH= 2
CATEGORIES+= audio
MASTER_SITES= SF
diff --git a/audio/mcplay/Makefile b/audio/mcplay/Makefile
index 5d72665e15d9..b4a51ea954a8 100644
--- a/audio/mcplay/Makefile
+++ b/audio/mcplay/Makefile
@@ -3,6 +3,7 @@
PORTNAME= mcplay
DISTVERSION= 0.3i
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://www.yahuxo.de/${PORTNAME}/ \
http://www.sourcefiles.org/Multimedia/MP3/Front_End/
diff --git a/audio/musica/Makefile b/audio/musica/Makefile
index 27182fedb92b..e6fae76dab18 100644
--- a/audio/musica/Makefile
+++ b/audio/musica/Makefile
@@ -3,7 +3,7 @@
PORTNAME= musica
PORTVERSION= 1.1.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://ict.ewi.tudelft.nl/~erik/open-source/musica/
diff --git a/audio/rio500/Makefile b/audio/rio500/Makefile
index c0f3fa1fc5f5..d1db92ddd7a2 100644
--- a/audio/rio500/Makefile
+++ b/audio/rio500/Makefile
@@ -3,7 +3,7 @@
PORTNAME= rio500
PORTVERSION= 0.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= SF
diff --git a/audio/soundtracker/Makefile b/audio/soundtracker/Makefile
index 6e17bcba2b01..696f5771b642 100644
--- a/audio/soundtracker/Makefile
+++ b/audio/soundtracker/Makefile
@@ -3,7 +3,7 @@
PORTNAME= soundtracker
PORTVERSION= 0.6.8
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= audio
MASTER_SITES= http://www.soundtracker.org/dl/%SUBDIR%/
MASTER_SITE_SUBDIR= v${PORTVERSION:R}
diff --git a/audio/wmalbum/Makefile b/audio/wmalbum/Makefile
index 54022256ed5a..037cbf8f006f 100644
--- a/audio/wmalbum/Makefile
+++ b/audio/wmalbum/Makefile
@@ -3,7 +3,7 @@
PORTNAME= wmalbum
PORTVERSION= 0.1.5
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= audio windowmaker
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/audio/xmms-ahx/Makefile b/audio/xmms-ahx/Makefile
index ca8eaf58ee80..9b2973fa8ec6 100644
--- a/audio/xmms-ahx/Makefile
+++ b/audio/xmms-ahx/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xmms-ahx
PORTVERSION= 0.6
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= audio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}.tar.gz
diff --git a/audio/xmms-curses/Makefile b/audio/xmms-curses/Makefile
index 79d1e6bc770e..a92dbf72212e 100644
--- a/audio/xmms-curses/Makefile
+++ b/audio/xmms-curses/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xmms-curses
PORTVERSION= 0.2.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= audio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/audio/xmms-faad/Makefile.inc b/audio/xmms-faad/Makefile.inc
index db9826d01b4d..5d910f792078 100644
--- a/audio/xmms-faad/Makefile.inc
+++ b/audio/xmms-faad/Makefile.inc
@@ -2,7 +2,7 @@
PORTNAME= faad2
PORTVERSION= 2.7
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio
MASTER_SITES= SFE/faac
diff --git a/audio/xmms-flac/Makefile b/audio/xmms-flac/Makefile
index 22df64246afb..5df3052bdd73 100644
--- a/audio/xmms-flac/Makefile
+++ b/audio/xmms-flac/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xmms-flac
PORTVERSION= 1.3.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://downloads.xiph.org/releases/flac/
DISTNAME= flac-${PORTVERSION}
diff --git a/audio/xmms-mailnotify/Makefile b/audio/xmms-mailnotify/Makefile
index 8ec18cf449d0..2baea4ebf740 100644
--- a/audio/xmms-mailnotify/Makefile
+++ b/audio/xmms-mailnotify/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xmms-mailnotify
PORTVERSION= 0.2.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= arved
diff --git a/audio/xmms-nsf/Makefile b/audio/xmms-nsf/Makefile
index 9ecfa5c1dde1..f7587ba522f9 100644
--- a/audio/xmms-nsf/Makefile
+++ b/audio/xmms-nsf/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xmms-nsf
PORTVERSION= 0.0.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= audio
MASTER_SITES= http://optronic.sourceforge.net/files/ \
CRITICAL
diff --git a/audio/xmms-shn/Makefile b/audio/xmms-shn/Makefile
index 4b0ba9e770a8..1386f6c73945 100644
--- a/audio/xmms-shn/Makefile
+++ b/audio/xmms-shn/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xmms-shn
PORTVERSION= 2.4.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio
MASTER_SITES= http://www.etree.org/shnutils/xmms-shn/dist/src/
diff --git a/audio/xmms-wavpack/Makefile b/audio/xmms-wavpack/Makefile
index 00adb6a89a5f..cb71216721ff 100644
--- a/audio/xmms-wavpack/Makefile
+++ b/audio/xmms-wavpack/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xmms-wavpack
PORTVERSION= 1.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://www.wavpack.com/
diff --git a/audio/xmms-xf86audio/Makefile b/audio/xmms-xf86audio/Makefile
index cfa98452e913..8628146b993a 100644
--- a/audio/xmms-xf86audio/Makefile
+++ b/audio/xmms-xf86audio/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xmms-xf86audio
PORTVERSION= 0.4.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://www.devin.com/xmms-xf86audio/download/
diff --git a/audio/xmms-xymms/Makefile b/audio/xmms-xymms/Makefile
index aee3d735e232..3749b944210b 100644
--- a/audio/xmms-xymms/Makefile
+++ b/audio/xmms-xymms/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xymms
DISTVERSION= 0.9.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= audio
MASTER_SITES= SF
PKGNAMEPREFIX= xmms-
diff --git a/audio/xmmsctrl/Makefile b/audio/xmmsctrl/Makefile
index 952b7f35291b..f3e7a297527f 100644
--- a/audio/xmmsctrl/Makefile
+++ b/audio/xmmsctrl/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xmmsctrl
PORTVERSION= 1.8
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio
MASTER_SITES= http://user.it.uu.se/~adavid/utils/ \
http://distro.ibiblio.org/pub/linux/distributions/pdaxrom/src/ \
diff --git a/biology/xmolwt/Makefile b/biology/xmolwt/Makefile
index 5458fd5db619..ae96c0cee4cd 100644
--- a/biology/xmolwt/Makefile
+++ b/biology/xmolwt/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xmolwt
PORTVERSION= 0.7
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= biology
MASTER_SITES= http://www.st.hirosaki-u.ac.jp/~rmiya/xmolwt/
diff --git a/comms/hf/Makefile b/comms/hf/Makefile
index bc1488d78c92..52e2f72363d6 100644
--- a/comms/hf/Makefile
+++ b/comms/hf/Makefile
@@ -3,7 +3,7 @@
PORTNAME= hf
PORTVERSION= 0.8
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= comms hamradio
MASTER_SITES= SF/${PORTNAME}term/${PORTNAME}/${PORTVERSION}
diff --git a/converters/gbase/Makefile b/converters/gbase/Makefile
index 58efb254267a..96da5b495eb0 100644
--- a/converters/gbase/Makefile
+++ b/converters/gbase/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gbase
PORTVERSION= 0.5
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= converters
MASTER_SITES= http://www.fluxcode.net/files/
diff --git a/deskutils/babytrans/Makefile b/deskutils/babytrans/Makefile
index 1b7ba18b013e..31ed9b641ec4 100644
--- a/deskutils/babytrans/Makefile
+++ b/deskutils/babytrans/Makefile
@@ -3,7 +3,7 @@
PORTNAME= babytrans
PORTVERSION= 0.9.1
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= deskutils
MASTER_SITES= http://fjolliton.free.fr/babytrans/
diff --git a/deskutils/gaddr/Makefile b/deskutils/gaddr/Makefile
index 4551acb8dd7c..49bbb30fee22 100644
--- a/deskutils/gaddr/Makefile
+++ b/deskutils/gaddr/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gaddr
PORTVERSION= 1.1.4
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= deskutils gnome
MASTER_SITES= http://www.wirelesscouch.net/software/gaddr/ \
http://bsd-geek.de/FreeBSD/distfiles/
diff --git a/deskutils/ithought/Makefile b/deskutils/ithought/Makefile
index 0670b195b144..46f1335dcffd 100644
--- a/deskutils/ithought/Makefile
+++ b/deskutils/ithought/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ithought
PORTVERSION= a5
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= deskutils
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-alpha
diff --git a/devel/gcvs/Makefile b/devel/gcvs/Makefile
index 984a32b9cdc8..0a5bcbec6090 100644
--- a/devel/gcvs/Makefile
+++ b/devel/gcvs/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gcvs
PORTVERSION= 1.0
-PORTREVISION= 14
+PORTREVISION= 15
PORTEPOCH= 1
CATEGORIES= devel tk
MASTER_SITES= SF/cvsgui/gCvs/${PORTNAME}-${PORTVERSION}
diff --git a/devel/glib12/Makefile b/devel/glib12/Makefile
index 3584fab0b657..55d47df48e9a 100644
--- a/devel/glib12/Makefile
+++ b/devel/glib12/Makefile
@@ -3,7 +3,7 @@
PORTNAME= glib
PORTVERSION= 1.2.10
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= devel
MASTER_SITES= GNOME
PKGNAMESUFFIX= 12
@@ -11,19 +11,15 @@ PKGNAMESUFFIX= 12
MAINTAINER= gnome@FreeBSD.org
COMMENT= Some useful routines of C programming (previous stable version)
-USE_CSTD= gnu89
-USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
+INSTALL_TARGET= install-strip
+USES= libtool pathfix
+USE_CSTD= gnu89
USE_LDCONFIG= yes
-CONFIGURE_ARGS= --includedir=${PREFIX}/include/glib12
INFO= glib
post-install:
- ${LN} -sf ${PREFIX}/bin/glib-config ${STAGEDIR}${PREFIX}/bin/glib12-config
-.for lib in glib gmodule gthread
- @${RM} ${STAGEDIR}${PREFIX}/lib/lib${lib}.la ${STAGEDIR}${PREFIX}/lib/lib${lib}.so
- @${MV} ${STAGEDIR}${PREFIX}/lib/lib${lib}.a ${STAGEDIR}${PREFIX}/lib/lib${lib}-12.a
-.endfor
+ ${LN} -sf glib-config ${STAGEDIR}${PREFIX}/bin/glib12-config
.include <bsd.port.mk>
diff --git a/devel/glib12/files/patch-Makefile.ins b/devel/glib12/files/patch-Makefile.ins
index 4d8702c68a86..6338ae863d22 100644
--- a/devel/glib12/files/patch-Makefile.ins
+++ b/devel/glib12/files/patch-Makefile.ins
@@ -1,14 +1,5 @@
--- Makefile.in.orig Thu Mar 15 10:48:50 2001
+++ Makefile.in Wed Nov 20 14:39:44 2002
-@@ -37,7 +37,7 @@
- DESTDIR =
-
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
-+pkglibdir = $(prefix)/libdata/pkgconfig
- pkgincludedir = $(includedir)/@PACKAGE@
-
- top_builddir = .
@@ -96,9 +96,9 @@
AUTOMAKE_OPTIONS = 1.4
@@ -17,38 +8,19 @@
+SUBDIRS = . gmodule gthread docs
-configincludedir = $(pkglibdir)/include
-+configincludedir = $(includedir)
++configincludedir = $(includedir)/glib-1.2
bin_SCRIPTS = glib-config
-@@ -114,7 +114,7 @@
- libglib_la_SOURCES = garray.c gcache.c gcompletion.c gdataset.c gdate.c gerror.c ghash.c ghook.c giochannel.c giounix.c glist.c gmain.c gmem.c gmessages.c gmutex.c gnode.c gprimes.c grel.c gscanner.c gslist.c gstrfuncs.c gstring.c gtimer.c gtree.c gutils.c
-
-
--glibincludedir = $(includedir)/glib-1.2
-+glibincludedir = $(includedir)
- glibinclude_HEADERS = glib.h
-
-
-@@ -134,7 +134,7 @@
- m4datadir = $(datadir)/aclocal
- m4data_DATA = glib.m4
-
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(pkglibdir)
- pkgconfig_DATA = glib.pc gmodule.pc gthread.pc
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -574,7 +574,7 @@
+@@ -574,7 +574,6 @@
|| exit 1; \
fi; \
done
- $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
-+
garray.lo garray.o : garray.c glib.h glibconfig.h
gcache.lo gcache.o : gcache.c glib.h glibconfig.h
gcompletion.lo gcompletion.o : gcompletion.c glib.h glibconfig.h
-@@ -629,7 +629,7 @@
+@@ -629,7 +628,7 @@
uninstall-configincludeDATA uninstall-m4dataDATA \
uninstall-pkgconfigDATA uninstall-glibincludeHEADERS
uninstall: uninstall-recursive
@@ -59,15 +31,6 @@
install-strip:
--- gmodule/Makefile.in.orig Fri Mar 2 17:37:21 2001
+++ gmodule/Makefile.in Tue Mar 6 09:24:01 2001
-@@ -100,7 +100,7 @@
-
- BUILT_SOURCES = gmoduleconf.h
-
--glibincludedir = $(includedir)/glib-1.2
-+glibincludedir = $(includedir)
- glibinclude_HEADERS = gmodule.h
-
-
@@ -341,7 +341,7 @@
install: install-am
uninstall-am: uninstall-libLTLIBRARIES uninstall-glibincludeHEADERS
@@ -79,15 +42,6 @@
$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
--- gthread/Makefile.in.orig Tue Mar 6 09:12:20 2001
+++ gthread/Makefile.in Tue Mar 6 09:12:59 2001
-@@ -127,7 +127,7 @@
- testgthread_OBJECTS = testgthread.o
- testgthread_DEPENDENCIES = ../libglib.la libgthread.la
- testgthread_LDFLAGS =
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ @G_THREAD_CFLAGS@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
@@ -300,7 +300,7 @@
install: install-am
uninstall-am: uninstall-libLTLIBRARIES
diff --git a/devel/glib12/files/patch-configure b/devel/glib12/files/patch-configure
index 25f89584cd38..07a28339f25d 100644
--- a/devel/glib12/files/patch-configure
+++ b/devel/glib12/files/patch-configure
@@ -1,20 +1,5 @@
--- configure.orig 2001-03-15 16:44:01.000000000 +0100
+++ configure 2012-12-12 11:10:38.000000000 +0100
-@@ -587,10 +587,10 @@
-
-
- # libtool versioning
--LT_RELEASE=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION
--LT_CURRENT=`expr $GLIB_MICRO_VERSION - $GLIB_INTERFACE_AGE`
--LT_REVISION=$GLIB_INTERFACE_AGE
--LT_AGE=`expr $GLIB_BINARY_AGE - $GLIB_INTERFACE_AGE`
-+LT_RELEASE=12
-+LT_CURRENT=3
-+LT_REVISION=0
-+LT_AGE=0
-
-
-
@@ -3496,7 +3496,7 @@
@@ -24,43 +9,6 @@
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:3503: checking for $ac_func" >&5
-@@ -4390,6 +4390,12 @@
- linux*)
- G_MODULE_LDFLAGS='-rdynamic'
- ;;
-+ freebsd*)
-+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ if test $objformat = "elf"; then
-+ G_MODULE_LDFLAGS='-Wl,-E'
-+ fi
-+ ;;
- esac
- LIBS_orig="$LIBS"
- LDFLAGS_orig="$LDFLAGS"
-@@ -5177,11 +5183,8 @@
- G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
- fi
- ;;
-- *-freebsd2.2*)
-- G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_THREAD_SAFE"
--
-- # FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support
-- # -mthreads flag.
-+ *-*-freebsd*)
-+ G_THREAD_LIBS="-pthread"
- ;;
- esac
-
-@@ -5469,9 +5472,6 @@
-
-
-
--CFLAGS="$CFLAGS $G_THREAD_CFLAGS"
--
--
- case "$mutex_has_default" in
- "yes")
- echo $ac_n "checking size of $mutex_default_type""... $ac_c" 1>&6
@@ -5568,6 +5568,63 @@
diff --git a/devel/glib12/files/patch-glib-config.in b/devel/glib12/files/patch-glib-config.in
deleted file mode 100644
index 8ced7ad51c72..000000000000
--- a/devel/glib12/files/patch-glib-config.in
+++ /dev/null
@@ -1,27 +0,0 @@
---- glib-config.in.orig Tue Mar 6 09:49:34 2001
-+++ glib-config.in Tue Mar 6 09:51:05 2001
-@@ -88,20 +88,20 @@
- if test "$lib_gthread" = "yes"; then
- cflags="$cflags @G_THREAD_CFLAGS@"
- fi
-- echo -I@includedir@/glib-1.2 -I@libdir@/glib/include $includes $cflags
-+ echo -I@includedir@ $includes $cflags
- fi
- if test "$echo_libs" = "yes"; then
- libsp=""
- libsa=""
- if test "$lib_glib" = "yes"; then
-- libsp="$libsp -lglib"
-+ libsp="$libsp -lglib-@LT_RELEASE@"
- fi
- if test "$lib_gthread" = "yes"; then
-- libsp="-lgthread $libsp"
-+ libsp="-lgthread-@LT_RELEASE@ $libsp"
- libsa="$libsa @G_THREAD_LIBS@"
- fi
- if test "$lib_gmodule" = "yes"; then
-- libsp="@G_MODULE_LDFLAGS@ -lgmodule $libsp"
-+ libsp="@G_MODULE_LDFLAGS@ -lgmodule-@LT_RELEASE@ $libsp"
- libsa="$libsa @G_MODULE_LIBS@"
- fi
- echo -L@libdir@ $libsp $libsa
diff --git a/devel/glib12/files/patch-glib.pc.in b/devel/glib12/files/patch-glib.pc.in
deleted file mode 100644
index 0e38edab69c5..000000000000
--- a/devel/glib12/files/patch-glib.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- glib.pc.in.orig Wed Nov 29 20:15:33 2000
-+++ glib.pc.in Fri Jun 14 00:07:23 2002
-@@ -6,6 +6,6 @@
- Name: GLib
- Description: C Utility Library
- Version: @VERSION@
--Libs: -L${libdir} -lglib
--Cflags: -I${includedir}/glib-1.2 -I${libdir}/glib/include
-+Libs: -L${libdir} -lglib-12
-+Cflags: -I${includedir}
-
diff --git a/devel/glib12/files/patch-gmodule.pc.in b/devel/glib12/files/patch-gmodule.pc.in
deleted file mode 100644
index f9816891293c..000000000000
--- a/devel/glib12/files/patch-gmodule.pc.in
+++ /dev/null
@@ -1,9 +0,0 @@
---- gmodule.pc.in.orig Wed Aug 20 22:07:40 2003
-+++ gmodule.pc.in Wed Aug 20 22:08:12 2003
-@@ -7,5 +7,5 @@
- Description: Dynamic module loader for GLib
- Requires: glib
- Version: @VERSION@
--Libs: -L${libdir} @G_MODULE_LDFLAGS@ -lgmodule @G_MODULE_LIBS@
-+Libs: -L${libdir} @G_MODULE_LDFLAGS@ -lgmodule-12 @G_MODULE_LIBS@
- Cflags:
diff --git a/devel/glib12/files/patch-gmodule__gmodule-dl.c b/devel/glib12/files/patch-gmodule__gmodule-dl.c
deleted file mode 100644
index 5460f6300bc1..000000000000
--- a/devel/glib12/files/patch-gmodule__gmodule-dl.c
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- gmodule/gmodule-dl.c 2001/12/12 04:39:42 1.1
-+++ gmodule/gmodule-dl.c 2001/12/12 04:41:05
-@@ -100,6 +100,7 @@
- static gpointer
- _g_module_self (void)
- {
-+#ifndef __FreeBSD__
- gpointer handle;
-
- /* to query symbols from the program itself, special link options
-@@ -111,6 +112,9 @@
- g_module_set_error (fetch_dlerror ());
-
- return handle;
-+#else
-+ return RTLD_DEFAULT;
-+#endif
- }
-
- static void
diff --git a/devel/glib12/files/patch-gstrfuncs.c b/devel/glib12/files/patch-gstrfuncs.c
index eb5957f900fa..9f18f738f56d 100644
--- a/devel/glib12/files/patch-gstrfuncs.c
+++ b/devel/glib12/files/patch-gstrfuncs.c
@@ -1,41 +1,46 @@
--- gstrfuncs.c.orig 2001-02-27 07:00:22.000000000 +0100
+++ gstrfuncs.c 2004-03-01 13:19:49.531603760 +0100
-@@ -867,7 +867,7 @@
+@@ -867,8 +867,8 @@ g_printf_string_upper_bound (const gchar
/* beware of positional parameters
*/
case '$':
- g_warning (G_GNUC_PRETTY_FUNCTION
-+ g_warning ("%s%s", G_GNUC_PRETTY_FUNCTION,
- "(): unable to handle positional parameters (%%n$)");
+- "(): unable to handle positional parameters (%%n$)");
++ g_warning ("%s: unable to handle positional parameters (%%n$)",
++ G_GNUC_PRETTY_FUNCTION);
len += 1024; /* try adding some safety padding */
break;
-@@ -1034,7 +1034,7 @@
+
+@@ -1034,8 +1034,8 @@ g_printf_string_upper_bound (const gchar
/* n . dddddddddddddddddddddddd E +- eeee */
conv_len += 1 + 1 + MAX (24, spec.precision) + 1 + 1 + 4;
if (spec.mod_extra_long)
- g_warning (G_GNUC_PRETTY_FUNCTION
-+ g_warning ("%s%s", G_GNUC_PRETTY_FUNCTION,
- "(): unable to handle long double, collecting double only");
+- "(): unable to handle long double, collecting double only");
++ g_warning ("%s: unable to handle long double, collecting double only",
++ G_GNUC_PRETTY_FUNCTION);
#ifdef HAVE_LONG_DOUBLE
#error need to implement special handling for long double
-@@ -1077,7 +1077,7 @@
+ #endif
+@@ -1077,8 +1077,8 @@ g_printf_string_upper_bound (const gchar
conv_done = TRUE;
if (spec.mod_long)
{
- g_warning (G_GNUC_PRETTY_FUNCTION
-+ g_warning ("%s%s", G_GNUC_PRETTY_FUNCTION,
- "(): unable to handle wide char strings");
+- "(): unable to handle wide char strings");
++ g_warning ("%s: unable to handle wide char strings",
++ G_GNUC_PRETTY_FUNCTION);
len += 1024; /* try adding some safety padding */
}
-@@ -1108,9 +1108,8 @@
+ break;
+@@ -1108,8 +1108,8 @@ g_printf_string_upper_bound (const gchar
conv_len += format - spec_start;
break;
default:
- g_warning (G_GNUC_PRETTY_FUNCTION
- "(): unable to handle `%c' while parsing format",
-- c);
-+ g_warning ("%s(): unable to handle `%c' while parsing format",
-+ G_GNUC_PRETTY_FUNCTION, c);
++ g_warning ("%s: unable to handle `%c' while parsing format",
++ G_GNUC_PRETTY_FUNCTION,
+ c);
break;
}
- conv_done |= conv_len > 0;
diff --git a/devel/glib12/files/patch-gthread.pc.in b/devel/glib12/files/patch-gthread.pc.in
deleted file mode 100644
index 4086046cc5c2..000000000000
--- a/devel/glib12/files/patch-gthread.pc.in
+++ /dev/null
@@ -1,9 +0,0 @@
---- gthread.pc.in.orig Wed Aug 20 22:07:53 2003
-+++ gthread.pc.in Wed Aug 20 22:08:33 2003
-@@ -7,5 +7,5 @@
- Description: Thread support for GLib
- Requires: glib
- Version: @VERSION@
--Libs: -L${libdir} -lgthread @G_THREAD_LIBS@
-+Libs: -L${libdir} -lgthread-12 @G_THREAD_LIBS@
- Cflags: @G_THREAD_CFLAGS@
diff --git a/devel/glib12/pkg-plist b/devel/glib12/pkg-plist
index 46ed1710cdad..e332ccba69da 100644
--- a/devel/glib12/pkg-plist
+++ b/devel/glib12/pkg-plist
@@ -1,20 +1,23 @@
bin/glib-config
bin/glib12-config
-include/glib12/glib.h
-include/glib12/glibconfig.h
-include/glib12/gmodule.h
-lib/libglib-12.a
-lib/libglib-12.so
-lib/libglib-12.so.3
-lib/libgmodule-12.a
-lib/libgmodule-12.so
-lib/libgmodule-12.so.3
-lib/libgthread-12.a
-lib/libgthread-12.so
-lib/libgthread-12.so.3
+include/glib-1.2/glib.h
+include/glib-1.2/glibconfig.h
+include/glib-1.2/gmodule.h
+lib/libglib-1.2.so.0
+lib/libglib-1.2.so.0.0.10
+lib/libglib.a
+lib/libglib.so
+lib/libgmodule-1.2.so.0
+lib/libgmodule-1.2.so.0.0.10
+lib/libgmodule.a
+lib/libgmodule.so
+lib/libgthread-1.2.so.0
+lib/libgthread-1.2.so.0.0.10
+lib/libgthread.a
+lib/libgthread.so
libdata/pkgconfig/glib.pc
libdata/pkgconfig/gmodule.pc
libdata/pkgconfig/gthread.pc
share/aclocal/glib.m4
man/man1/glib-config.1.gz
-@dirrm include/glib12
+@dirrm include/glib-1.2
diff --git a/devel/libole2/Makefile b/devel/libole2/Makefile
index 072d9646025b..91f1c755c39a 100644
--- a/devel/libole2/Makefile
+++ b/devel/libole2/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libole2
PORTVERSION= 0.2.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel gnome
MASTER_SITES= GNOME
diff --git a/devel/liboop/Makefile b/devel/liboop/Makefile
index 4ba1ba08924f..acf8dd0aaeaf 100644
--- a/devel/liboop/Makefile
+++ b/devel/liboop/Makefile
@@ -3,7 +3,7 @@
PORTNAME= liboop
PORTVERSION= 1.0
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= devel
MASTER_SITES= GENTOO/distfiles \
http://download.ofb.net/liboop/
diff --git a/devel/p5-Devel-LeakTrace/Makefile b/devel/p5-Devel-LeakTrace/Makefile
index cf27c38f8131..48f8743fa353 100644
--- a/devel/p5-Devel-LeakTrace/Makefile
+++ b/devel/p5-Devel-LeakTrace/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Devel-LeakTrace
PORTVERSION= 0.05
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/editors/gnotepad+/Makefile b/editors/gnotepad+/Makefile
index a5ba899da275..7ade913a232a 100644
--- a/editors/gnotepad+/Makefile
+++ b/editors/gnotepad+/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gnotepad+
PORTVERSION= 1.3.3
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= editors www gnome
MASTER_SITES= SF/gnotepad/gnotepad-stable/${PORTVERSION} \
SF/gnotepad/gnotepad%20User_s%20Manual/${DOCVERSION}:doc
diff --git a/editors/manedit/Makefile b/editors/manedit/Makefile
index 2848a59b12fa..b059f42c0ceb 100644
--- a/editors/manedit/Makefile
+++ b/editors/manedit/Makefile
@@ -3,7 +3,7 @@
PORTNAME= manedit
PORTVERSION= 1.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= editors
MASTER_SITES= http://wolfsinger.com/~wolfpack/packages/
diff --git a/emulators/bfe/Makefile b/emulators/bfe/Makefile
index 01b082b17686..9c4a7ab724a7 100644
--- a/emulators/bfe/Makefile
+++ b/emulators/bfe/Makefile
@@ -3,7 +3,7 @@
PORTNAME= bfe2
PORTVERSION= 20030723
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= emulators
MASTER_SITES= SF/bfe/source/23jul2003
DISTNAME= ${PORTNAME}-23jul2003
diff --git a/emulators/generator-cbiere/Makefile b/emulators/generator-cbiere/Makefile
index 4b771b070cac..89c582916e54 100644
--- a/emulators/generator-cbiere/Makefile
+++ b/emulators/generator-cbiere/Makefile
@@ -3,7 +3,7 @@
PORTNAME= generator
PORTVERSION= 0.35.r4
-PORTREVISION= 5
+PORTREVISION= 6
PORTEPOCH= 1
CATEGORIES= emulators
MASTER_SITES= http://www.squish.net/generator/cbiere/generator/
diff --git a/emulators/generator/Makefile b/emulators/generator/Makefile
index ce347619c2f3..ac9cec60c94a 100644
--- a/emulators/generator/Makefile
+++ b/emulators/generator/Makefile
@@ -3,7 +3,7 @@
PORTNAME= generator
PORTVERSION= 0.35
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= emulators
MASTER_SITES= http://www.squish.net/generator/files/
diff --git a/emulators/xsystem35/Makefile b/emulators/xsystem35/Makefile
index 5f5f8b1c8a12..72fb715465ec 100644
--- a/emulators/xsystem35/Makefile
+++ b/emulators/xsystem35/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xsystem35
PORTVERSION= 1.7.2
-PORTREVISION= 17
+PORTREVISION= 18
CATEGORIES= emulators
MASTER_SITES= http://8ne.sakura.ne.jp:20008/chika/unitbase/xsys35/down/
diff --git a/games/corewars/Makefile b/games/corewars/Makefile
index 79d7426efbd5..606933e5339f 100644
--- a/games/corewars/Makefile
+++ b/games/corewars/Makefile
@@ -2,7 +2,7 @@
PORTNAME= corewars
PORTVERSION= 0.9.13
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20%28stable%2C%20tar.gz%29/${PORTVERSION}
diff --git a/games/dopewars/Makefile b/games/dopewars/Makefile
index cc6813cafaf5..1eafb6044c2f 100644
--- a/games/dopewars/Makefile
+++ b/games/dopewars/Makefile
@@ -3,7 +3,7 @@
PORTNAME= dopewars
PORTVERSION= 1.5.12
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= games
MASTER_SITES= SF
diff --git a/games/garith/Makefile b/games/garith/Makefile
index c1319fa9b607..bd879648d6ed 100644
--- a/games/garith/Makefile
+++ b/games/garith/Makefile
@@ -3,7 +3,7 @@
PORTNAME= garith
PORTVERSION= 2.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games
MASTER_SITES= http://www.cnm-vra.com/micah/garith/ CENKES
# Latest version (2.3.1) does not build with gtk 1.2.10
diff --git a/games/gtklife/Makefile b/games/gtklife/Makefile
index ef025f796ea4..2b7b5569c80c 100644
--- a/games/gtklife/Makefile
+++ b/games/gtklife/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gtklife
PORTVERSION= 5.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= games
MASTER_SITES= http://ironphoenix.org/tril/gtklife/
diff --git a/games/hex/Makefile b/games/hex/Makefile
index b3b827132352..0b57fb550ded 100644
--- a/games/hex/Makefile
+++ b/games/hex/Makefile
@@ -3,7 +3,7 @@
PORTNAME= hex
PORTVERSION= 0.0.2
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= games
MASTER_SITES= http://www.earth.li/projectpurple/files/
diff --git a/games/mindguard/Makefile b/games/mindguard/Makefile
index cf04c49888fb..125cc8ef62bd 100644
--- a/games/mindguard/Makefile
+++ b/games/mindguard/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mindguard
PORTVERSION= 0.0.0.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= games
MASTER_SITES= http://zapatopi.net/mindguard/
EXTRACT_SUFX= .tgz
diff --git a/games/netspades/Makefile b/games/netspades/Makefile
index 50e05c86a89c..bf77cb4b3662 100644
--- a/games/netspades/Makefile
+++ b/games/netspades/Makefile
@@ -3,7 +3,7 @@
PORTNAME= NetSpades
PORTVERSION= 4.2.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= games
MASTER_SITES= TUCOWS/x11/entertain \
http://www.ece.rice.edu/~brentmh/spades/
diff --git a/games/wmquake/Makefile b/games/wmquake/Makefile
index 8fe73a42c1ad..da44fd88b8c2 100644
--- a/games/wmquake/Makefile
+++ b/games/wmquake/Makefile
@@ -3,7 +3,7 @@
PORTNAME= wmquake
PORTVERSION= 1.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= http://www.ne.jp/asahi/linux/timecop/software/ \
${MASTER_SITE_LOCAL}
diff --git a/games/xbill/Makefile b/games/xbill/Makefile
index 1dfeb45b6aad..60867374e50b 100644
--- a/games/xbill/Makefile
+++ b/games/xbill/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xbill
PORTVERSION= 2.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= games
MASTER_SITES= http://www.xbill.org/download/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/games/xpuyopuyo/Makefile b/games/xpuyopuyo/Makefile
index 78e9059938ca..b026005611aa 100644
--- a/games/xpuyopuyo/Makefile
+++ b/games/xpuyopuyo/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xpuyopuyo
PORTVERSION= 0.9.8
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= games
MASTER_SITES= http://chaos2.org/xpuyopuyo/
diff --git a/games/znibbles/Makefile b/games/znibbles/Makefile
index 3151e4f63a2f..8164aea9f4d7 100644
--- a/games/znibbles/Makefile
+++ b/games/znibbles/Makefile
@@ -3,7 +3,7 @@
PORTNAME= znibbles
PORTVERSION= 0.0.7
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= games
MASTER_SITES= http://old.koalateam.com/ftp/pub/games/znibbles/ \
http://www.jfouffa.com/vmallet/archives/
diff --git a/german/steak/Makefile b/german/steak/Makefile
index 2ad807e2bc39..bec87c28386d 100644
--- a/german/steak/Makefile
+++ b/german/steak/Makefile
@@ -3,7 +3,7 @@
PORTNAME= steak
PORTVERSION= 1.7.3
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= german
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Steak%20${PORTVERSION} \
http://www.tm.informatik.uni-frankfurt.de/%7Erazi/steak/program/
diff --git a/graphics/bbrb/Makefile b/graphics/bbrb/Makefile
index 7be5845cbf93..65700ce8d85d 100644
--- a/graphics/bbrb/Makefile
+++ b/graphics/bbrb/Makefile
@@ -3,7 +3,7 @@
PORTNAME= bbrb
PORTVERSION= 0.4.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= graphics
MASTER_SITES= SF
diff --git a/graphics/chbg/Makefile b/graphics/chbg/Makefile
index 58c06413e0ee..085dd212c6c9 100644
--- a/graphics/chbg/Makefile
+++ b/graphics/chbg/Makefile
@@ -3,7 +3,7 @@
PORTNAME= chbg
PORTVERSION= 1.5
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= graphics gnome
MASTER_SITES= SF
diff --git a/graphics/danpei/Makefile b/graphics/danpei/Makefile
index e6695aa6d964..d4c3c16277fb 100644
--- a/graphics/danpei/Makefile
+++ b/graphics/danpei/Makefile
@@ -3,7 +3,7 @@
PORTNAME= danpei
PORTVERSION= 2.9.7
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= graphics
MASTER_SITES= SF
diff --git a/graphics/gcolor/Makefile b/graphics/gcolor/Makefile
index 07d65fe986d7..9243832e107c 100644
--- a/graphics/gcolor/Makefile
+++ b/graphics/gcolor/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gcolor
PORTVERSION= 0.4
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics x11
MASTER_SITES= SF
diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index 6c5da48b02da..3ace2d2f6f16 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gdk-pixbuf
PORTVERSION= 0.22.0
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= graphics
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/gdk-pixbuf/0.22
diff --git a/graphics/graphopt/Makefile b/graphics/graphopt/Makefile
index c6a7ec9b7258..9f1036eca388 100644
--- a/graphics/graphopt/Makefile
+++ b/graphics/graphopt/Makefile
@@ -3,7 +3,7 @@
PORTNAME= graphopt
PORTVERSION= 0.4.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/graphics/gtkgraph/Makefile b/graphics/gtkgraph/Makefile
index ac5928f0f113..8cd338fa7a9a 100644
--- a/graphics/gtkgraph/Makefile
+++ b/graphics/gtkgraph/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gtkgraph
PORTVERSION= 0.6.1
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= graphics math
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= jedgar
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index f3e6988e8245..7c545b176a54 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -4,7 +4,7 @@
PORTNAME= imlib
PORTVERSION= 1.9.15
-PORTREVISION= 16
+PORTREVISION= 17
CATEGORIES= graphics
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
diff --git a/japanese/ebview/Makefile b/japanese/ebview/Makefile
index 30f7eefcd373..ed4460b22472 100644
--- a/japanese/ebview/Makefile
+++ b/japanese/ebview/Makefile
@@ -2,7 +2,7 @@
PORTNAME= ebview
PORTVERSION= 0.2.1
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= japanese
MASTER_SITES= SF
diff --git a/japanese/jmode/Makefile b/japanese/jmode/Makefile
index dd44215b56bd..507624d5c396 100644
--- a/japanese/jmode/Makefile
+++ b/japanese/jmode/Makefile
@@ -3,7 +3,7 @@
PORTNAME= jmode
PORTVERSION= 0.6.7
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= japanese
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
MASTER_SITE_SUBDIR= anthy/5467
diff --git a/japanese/jyuroku/Makefile b/japanese/jyuroku/Makefile
index 2cbcbd52c02b..1687948a3ccb 100644
--- a/japanese/jyuroku/Makefile
+++ b/japanese/jyuroku/Makefile
@@ -3,7 +3,7 @@
PORTNAME= jyuroku
PORTVERSION= 1.32
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= japanese
MASTER_SITES= http://homepage3.nifty.com/seto-yoneji/
EXTRACT_SUFX= .tgz
diff --git a/japanese/netype/Makefile b/japanese/netype/Makefile
index 4b39f0a94c88..c5a15d8d2dd2 100644
--- a/japanese/netype/Makefile
+++ b/japanese/netype/Makefile
@@ -3,7 +3,7 @@
PORTNAME= netype
PORTVERSION= 0.1.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= japanese
MASTER_SITES= http://www.i.his.fukui-u.ac.jp/~funakami/software/netype/src/
DISTNAME= ${PORTNAME}-0.1.0
diff --git a/korean/ami/Makefile b/korean/ami/Makefile
index c0b39ebd1bdc..11ef1ba46bed 100644
--- a/korean/ami/Makefile
+++ b/korean/ami/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ami
PORTVERSION= 1.2.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= korean x11
MASTER_SITES= http://kldp.net/frs/download.php/942/ \
http://www.kr.freebsd.org/~hwang/ami/:hjdic \
diff --git a/mail/faces/Makefile b/mail/faces/Makefile
index a5bd26820c6e..f282aee4c374 100644
--- a/mail/faces/Makefile
+++ b/mail/faces/Makefile
@@ -3,7 +3,7 @@
PORTNAME= faces
PORTVERSION= 1.7.7
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= mail
MASTER_SITES= SF
diff --git a/mail/gbuffy/Makefile b/mail/gbuffy/Makefile
index 2ef2879481cf..e7afef8c3821 100644
--- a/mail/gbuffy/Makefile
+++ b/mail/gbuffy/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gbuffy
PORTVERSION= 0.2.6
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= mail
MASTER_SITES= http://www.fiction.net/blong/programs/gbuffy/gbuffy-${PORTVERSION}/
diff --git a/mail/pop3lite/Makefile b/mail/pop3lite/Makefile
index 1454e9d6c75e..8c045f1731fa 100644
--- a/mail/pop3lite/Makefile
+++ b/mail/pop3lite/Makefile
@@ -3,7 +3,7 @@
PORTNAME= pop3lite
PORTVERSION= 0.2.4a
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= mail
MASTER_SITES= SF
diff --git a/mail/wmmaiload/Makefile b/mail/wmmaiload/Makefile
index 815011398b93..342e664943d3 100644
--- a/mail/wmmaiload/Makefile
+++ b/mail/wmmaiload/Makefile
@@ -3,7 +3,7 @@
PORTNAME= wmmaiload
PORTVERSION= 2.2.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= mail windowmaker
MASTER_SITES= http://tnemeth.free.fr/projets/programmes/
diff --git a/math/geg/Makefile b/math/geg/Makefile
index f21d68efa0f8..8b3a03ce7c90 100644
--- a/math/geg/Makefile
+++ b/math/geg/Makefile
@@ -3,7 +3,7 @@
PORTNAME= geg
PORTVERSION= 1.0.2
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_SUNSITE} \
http://www.infolaunch.com/~daveb/
diff --git a/math/grpn/Makefile b/math/grpn/Makefile
index 1a6f7b89edb8..48795ddfaa9e 100644
--- a/math/grpn/Makefile
+++ b/math/grpn/Makefile
@@ -3,7 +3,7 @@
PORTNAME= grpn
PORTVERSION= 1.1.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= math
MASTER_SITES= http://lashwhip.com/grpn/
diff --git a/math/surf/Makefile b/math/surf/Makefile
index 1f547525806c..b3b04e3048bf 100644
--- a/math/surf/Makefile
+++ b/math/surf/Makefile
@@ -3,7 +3,7 @@
PORTNAME= surf
PORTVERSION= 1.0.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
MASTER_SITES= SF
diff --git a/misc/grun/Makefile b/misc/grun/Makefile
index 6220e730253f..8009d9d916ed 100644
--- a/misc/grun/Makefile
+++ b/misc/grun/Makefile
@@ -3,7 +3,7 @@
PORTNAME= grun
PORTVERSION= 0.8.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= misc
MASTER_SITES= http://www.brettnacher.org/users/dominik/FreeBSD/
diff --git a/misc/gtkfind/Makefile b/misc/gtkfind/Makefile
index 421190ebdddd..935565924207 100644
--- a/misc/gtkfind/Makefile
+++ b/misc/gtkfind/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gtkfind
PORTVERSION= 1.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= misc
MASTER_SITES= http://www.bayofrum.net/dist/${PORTNAME}/ \
http://www.purplehat.org/downloads/gtkfind/
diff --git a/multimedia/dv2jpg/Makefile b/multimedia/dv2jpg/Makefile
index 42455392f604..92bd6a2bd640 100644
--- a/multimedia/dv2jpg/Makefile
+++ b/multimedia/dv2jpg/Makefile
@@ -3,7 +3,7 @@
PORTNAME= dv2jpg
PORTVERSION= 1.1
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= multimedia
MASTER_SITES= SF
diff --git a/multimedia/libmovtar/Makefile b/multimedia/libmovtar/Makefile
index 12a0c7bf4386..7508ed40f6bc 100644
--- a/multimedia/libmovtar/Makefile
+++ b/multimedia/libmovtar/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libmovtar
PORTVERSION= 0.1.3
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= multimedia
MASTER_SITES= SF/mjpeg/OldFiles
diff --git a/multimedia/openquicktime/Makefile b/multimedia/openquicktime/Makefile
index 4e1c9d33aee9..7ce3ec25dcb1 100644
--- a/multimedia/openquicktime/Makefile
+++ b/multimedia/openquicktime/Makefile
@@ -3,7 +3,7 @@
PORTNAME= openquicktime
PORTVERSION= 1.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= multimedia
MASTER_SITES= SF/${PORTNAME}/OpenQuicktime%20v1/${PORTVERSION}b
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile
index 075e14af0696..4c84c73eba2a 100644
--- a/multimedia/xmms/Makefile
+++ b/multimedia/xmms/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xmms
PORTVERSION= 1.2.11
-PORTREVISION= 24
+PORTREVISION= 25
CATEGORIES= multimedia audio ipv6
MASTER_SITES= http://www.xmms.org/files/1.2.x/ \
http://legacy.xmms2.org/ \
diff --git a/multimedia/xtheater/Makefile b/multimedia/xtheater/Makefile
index 1df53023127f..5e93c446aff2 100644
--- a/multimedia/xtheater/Makefile
+++ b/multimedia/xtheater/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xtheater
PORTVERSION= 1.0.0.p1
-PORTREVISION= 11
+PORTREVISION= 12
PORTEPOCH= 1
CATEGORIES= multimedia
MASTER_SITES= SF/${PORTNAME}/Xtheater/1.0.0-pre1
diff --git a/net-im/gale/Makefile b/net-im/gale/Makefile
index 5b946f6a0a81..cb39a8a27960 100644
--- a/net-im/gale/Makefile
+++ b/net-im/gale/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gale
PORTVERSION= 0.99f
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= net-im
MASTER_SITES= http://download.ofb.net/${PORTNAME}/
DISTNAME= ${PORTNAME}-${PORTVERSION}ruit
diff --git a/net-mgmt/driftnet/Makefile b/net-mgmt/driftnet/Makefile
index 3a393beb5007..deb2d1dcb635 100644
--- a/net-mgmt/driftnet/Makefile
+++ b/net-mgmt/driftnet/Makefile
@@ -3,7 +3,7 @@
PORTNAME= driftnet
PORTVERSION= 0.1.6
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= net-mgmt
MASTER_SITES= http://www.ex-parrot.com/~chris/driftnet/ \
http://www.vanheusden.com/mirrors/
diff --git a/net-p2p/gnewtellium/Makefile b/net-p2p/gnewtellium/Makefile
index c408673e01c3..224abdeb720f 100644
--- a/net-p2p/gnewtellium/Makefile
+++ b/net-p2p/gnewtellium/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gnewtellium
PORTVERSION= 0.05b
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= net-p2p
MASTER_SITES= SF
diff --git a/net-p2p/gtkhx/Makefile b/net-p2p/gtkhx/Makefile
index a952ce545d98..8b2610c4845b 100644
--- a/net-p2p/gtkhx/Makefile
+++ b/net-p2p/gtkhx/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gtkhx
PORTVERSION= 0.9.4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= net-p2p
MASTER_SITES= SF
diff --git a/net-p2p/lopster/Makefile b/net-p2p/lopster/Makefile
index 5a25e7dc53b8..ee636ffd519f 100644
--- a/net-p2p/lopster/Makefile
+++ b/net-p2p/lopster/Makefile
@@ -3,7 +3,7 @@
PORTNAME= lopster
PORTVERSION= 1.2.2
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= net-p2p
MASTER_SITES= SF \
http://lopster.sourceforge.net/download/
diff --git a/net-p2p/napshare/Makefile b/net-p2p/napshare/Makefile
index 51cfbc9dc417..416c99240705 100644
--- a/net-p2p/napshare/Makefile
+++ b/net-p2p/napshare/Makefile
@@ -3,7 +3,7 @@
PORTNAME= napshare
PORTVERSION= 1.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-p2p
MASTER_SITES= SF/${PORTNAME}/NapShare%20V${PORTVERSION}/Linux
diff --git a/net/bsdproxy/Makefile b/net/bsdproxy/Makefile
index 9ca7d47a33a4..b228029f3c84 100644
--- a/net/bsdproxy/Makefile
+++ b/net/bsdproxy/Makefile
@@ -3,6 +3,7 @@
PORTNAME= bsdproxy
PORTVERSION= 0.04
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://daveb.net/bsdproxy/
diff --git a/net/gini/Makefile b/net/gini/Makefile
index de0a616ec71a..7601b382dae7 100644
--- a/net/gini/Makefile
+++ b/net/gini/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gini
PORTVERSION= 0.5.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= net multimedia
MASTER_SITES= SF/${PORTNAME}/OldFiles
diff --git a/net/ipsorc/Makefile b/net/ipsorc/Makefile
index 6b61f62395d5..6fb9353f918e 100644
--- a/net/ipsorc/Makefile
+++ b/net/ipsorc/Makefile
@@ -2,7 +2,7 @@
PORTNAME= ipsorc
PORTVERSION= 1.7.5
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net security
MASTER_SITES= http://200ok.org/distfiles/ipsorc/ \
http://bsdforge.com/projects/source/net/ipsorcery/
diff --git a/net/jags/Makefile b/net/jags/Makefile
index 6b0394ab9ec3..d3343b04a19d 100644
--- a/net/jags/Makefile
+++ b/net/jags/Makefile
@@ -3,7 +3,7 @@
PORTNAME= jags
PORTVERSION= 0.22.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net
MASTER_SITES= SF/${PORTNAME}/Jags/${PORTNAME}-${PORTVERSION}
diff --git a/net/libnetdude/Makefile b/net/libnetdude/Makefile
index a0b7c4b9b8ec..48aa15542406 100644
--- a/net/libnetdude/Makefile
+++ b/net/libnetdude/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libnetdude
PORTVERSION= 0.12
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
MASTER_SITES= SF/netdude/${PORTNAME}/${PORTVERSION}
diff --git a/net/netdude/Makefile b/net/netdude/Makefile
index 87d90222e0d5..b33f5e12ff0b 100644
--- a/net/netdude/Makefile
+++ b/net/netdude/Makefile
@@ -3,7 +3,7 @@
PORTNAME= netdude
PORTVERSION= 0.5.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
diff --git a/net/nocatsplash/Makefile b/net/nocatsplash/Makefile
index cc868ef9e244..ea46c07327be 100644
--- a/net/nocatsplash/Makefile
+++ b/net/nocatsplash/Makefile
@@ -3,7 +3,7 @@
PORTNAME= nocatsplash
PORTVERSION= 0.82
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
MASTER_SITES= http://farrokhi.net/distfiles/ \
http://nocat.net/download/NoCatSplash/
diff --git a/net/wmlj/Makefile b/net/wmlj/Makefile
index ee57d1b71bd1..ff6244f1b5d3 100644
--- a/net/wmlj/Makefile
+++ b/net/wmlj/Makefile
@@ -3,7 +3,7 @@
PORTNAME= wmlj
PORTVERSION= 0.4.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= net
MASTER_SITES= SF
diff --git a/net/xferstats/Makefile b/net/xferstats/Makefile
index 2f84e96e2576..938b2063343d 100644
--- a/net/xferstats/Makefile
+++ b/net/xferstats/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xferstats
PORTVERSION= 2.16
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= ftp://ftp.wu-ftpd.org/pub/support/
diff --git a/palm/pilrc/Makefile b/palm/pilrc/Makefile
index 803508143586..e1faca1b91ea 100644
--- a/palm/pilrc/Makefile
+++ b/palm/pilrc/Makefile
@@ -2,7 +2,7 @@
PORTNAME= pilrc
PORTVERSION= 3.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= palm
MASTER_SITES= SF
diff --git a/print/gsview/Makefile b/print/gsview/Makefile
index bbd8d1e1aaff..8c5f1afec57f 100644
--- a/print/gsview/Makefile
+++ b/print/gsview/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gsview
PORTVERSION= 4.9
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= print
MASTER_SITES= LOCAL/bf
diff --git a/print/libppd/Makefile b/print/libppd/Makefile
index e80227c326e5..d4098abfd2d2 100644
--- a/print/libppd/Makefile
+++ b/print/libppd/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libppd
PORTVERSION= 0.10
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= print
MASTER_SITES= SF/lpr/${PORTNAME}/${PORTVERSION}
diff --git a/print/pup/Makefile b/print/pup/Makefile
index 216575881f53..b20bab0f4881 100644
--- a/print/pup/Makefile
+++ b/print/pup/Makefile
@@ -3,7 +3,7 @@
PORTNAME= pup
PORTVERSION= 1.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= print
MASTER_SITES= SF
DISTNAME= ${PORTNAME}_${PORTVERSION}_src
diff --git a/security/crank/Makefile b/security/crank/Makefile
index 60e179fda046..95c3a27bb361 100644
--- a/security/crank/Makefile
+++ b/security/crank/Makefile
@@ -3,7 +3,7 @@
PORTNAME= crank
PORTVERSION= 0.2.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= security
MASTER_SITES= SF
diff --git a/security/gpasman/Makefile b/security/gpasman/Makefile
index 11c77fe25259..1b9298248823 100644
--- a/security/gpasman/Makefile
+++ b/security/gpasman/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gpasman
PORTVERSION= 1.3.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= security
MASTER_SITES= http://gpasman.sourceforge.net/files/
diff --git a/security/gsfv/Makefile b/security/gsfv/Makefile
index 7acaed32cb99..fdab549dfdc1 100644
--- a/security/gsfv/Makefile
+++ b/security/gsfv/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gsfv
PORTVERSION= 0.2.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= security
MASTER_SITES= LOCAL/ijliao
diff --git a/security/gtk-knocker/Makefile b/security/gtk-knocker/Makefile
index a4371be28dd0..96dc7580f276 100644
--- a/security/gtk-knocker/Makefile
+++ b/security/gtk-knocker/Makefile
@@ -3,7 +3,7 @@
PORTNAME= knocker
PORTVERSION= 0.6.6
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= security net x11
MASTER_SITES= SF/${PORTNAME}/gtk-${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= gtk-
diff --git a/security/pinentry-gtk/Makefile b/security/pinentry-gtk/Makefile
index 50b52e27f10b..c2468de127f5 100644
--- a/security/pinentry-gtk/Makefile
+++ b/security/pinentry-gtk/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= pinentry
-PORTREVISION= 0
+PORTREVISION= 1
COMMENT= GTK version of the gnupg password dialog
diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile
index 6ba9ef577453..52af55d1eb5a 100644
--- a/security/pinentry/Makefile
+++ b/security/pinentry/Makefile
@@ -3,7 +3,7 @@
PORTNAME= pinentry
PORTVERSION= 0.8.3
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES= security
MASTER_SITES= GNUPG/pinentry
diff --git a/security/ssh-gui/Makefile b/security/ssh-gui/Makefile
index a0027ebc59e6..0d8f660e00d2 100644
--- a/security/ssh-gui/Makefile
+++ b/security/ssh-gui/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ssh-gui
PORTVERSION= 0.7.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= security
MASTER_SITES= SF
diff --git a/security/stegdetect/Makefile b/security/stegdetect/Makefile
index b9a035e80e6e..7d603cb4e700 100644
--- a/security/stegdetect/Makefile
+++ b/security/stegdetect/Makefile
@@ -3,7 +3,7 @@
PORTNAME= stegdetect
PORTVERSION= 0.6
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= security
MASTER_SITES= http://www.outguess.org/ \
http://distfiles.master.finkmirrors.net/ \
diff --git a/sysutils/gcombust/Makefile b/sysutils/gcombust/Makefile
index 362727803b8e..3c46c987044c 100644
--- a/sysutils/gcombust/Makefile
+++ b/sysutils/gcombust/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gcombust
PORTVERSION= 0.1.55
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= sysutils
MASTER_SITES= http://mirror.symnds.com/software/misc/ \
http://www.egr.msu.edu/~mcdouga9/
diff --git a/sysutils/mount.app/Makefile b/sysutils/mount.app/Makefile
index 4a924789403b..9cd87906d244 100644
--- a/sysutils/mount.app/Makefile
+++ b/sysutils/mount.app/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mountapp
PORTVERSION= 3.0
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= sysutils windowmaker
MASTER_SITES= SF
diff --git a/sysutils/wmcube-gdk/Makefile b/sysutils/wmcube-gdk/Makefile
index 3a66ae4278c3..8c9c4ec175f1 100644
--- a/sysutils/wmcube-gdk/Makefile
+++ b/sysutils/wmcube-gdk/Makefile
@@ -3,7 +3,7 @@
PORTNAME= wmcube
PORTVERSION= 0.98p2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= sysutils windowmaker
MASTER_SITES= http://www.ne.jp/asahi/linux/timecop/software/
PKGNAMESUFFIX= -gdk
diff --git a/textproc/gdict/Makefile b/textproc/gdict/Makefile
index afda8609018b..f2b3217bbc3c 100644
--- a/textproc/gdict/Makefile
+++ b/textproc/gdict/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gdict
PORTVERSION= 0.7
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc
MASTER_SITES= http://www.brettnacher.org/users/dominik/FreeBSD/
diff --git a/x11-clocks/asclock-gtk/Makefile b/x11-clocks/asclock-gtk/Makefile
index 1d998ae880e2..7fe8d7720202 100644
--- a/x11-clocks/asclock-gtk/Makefile
+++ b/x11-clocks/asclock-gtk/Makefile
@@ -2,7 +2,7 @@
PORTNAME= asclock-gtk
PORTVERSION= 2.1.10
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11-clocks afterstep windowmaker
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= kuriyama
diff --git a/x11-clocks/wmclockmon/Makefile b/x11-clocks/wmclockmon/Makefile
index 6fd399f314f5..dcfaeab78ded 100644
--- a/x11-clocks/wmclockmon/Makefile
+++ b/x11-clocks/wmclockmon/Makefile
@@ -3,7 +3,7 @@
PORTNAME= wmclockmon
PORTVERSION= 0.8.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-clocks windowmaker
MASTER_SITES= http://tnemeth.free.fr/projets/programmes/
diff --git a/x11-clocks/wmfishtime/Makefile b/x11-clocks/wmfishtime/Makefile
index b32088f6ce37..19030b258107 100644
--- a/x11-clocks/wmfishtime/Makefile
+++ b/x11-clocks/wmfishtime/Makefile
@@ -3,7 +3,7 @@
PORTNAME= wmfishtime
PORTVERSION= 1.24
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-clocks windowmaker
MASTER_SITES= http://www.ne.jp/asahi/linux/timecop/software/ \
http://atreides.freenix.no/~anders/
diff --git a/x11-fm/mtoolsfm/Makefile b/x11-fm/mtoolsfm/Makefile
index d3db22b507b5..77a95afffc63 100644
--- a/x11-fm/mtoolsfm/Makefile
+++ b/x11-fm/mtoolsfm/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mtoolsfm
PORTVERSION= 1.9.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fm
MASTER_SITES= SF
DISTNAME= MToolsFM-${PORTVERSION}
diff --git a/x11-fonts/gfe/Makefile b/x11-fonts/gfe/Makefile
index e06cfb8786c7..006b3e693c72 100644
--- a/x11-fonts/gfe/Makefile
+++ b/x11-fonts/gfe/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gfe
PORTVERSION= 0.0.4
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-fonts
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= X11/fonts
diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index 859819a7d273..4600fcd62c49 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -4,28 +4,30 @@
PORTNAME= gtk
PORTVERSION= 1.2.10
-PORTREVISION= 23
+PORTREVISION= 24
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/gtk+/1.2
-PKGNAMESUFFIX= 1
+PKGNAMESUFFIX= 12
DISTNAME= gtk+-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
COMMENT= Gimp Toolkit for X11 GUI (previous stable version)
-USES= perl5
+USES= libtool pathfix perl5
USE_PERL5= build
USE_XORG= x11 ice xext sm inputproto xi
USE_GNOME= glib12
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool
-CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk12 --with-native-locale \
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --with-native-locale \
--with-xinput=xfree
CPPFLAGS+= -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib
+INSTALL_TARGET= install-strip
INFO= gdk gtk
+
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
@@ -36,15 +38,14 @@ CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+= NLS="@comment "
.endif
+post-patch:
+ @${MV} ${WRKSRC}/gtk/gtkrc.zh_TW.big5 ${WRKSRC}/gtk/gtkrc.zh_TW.Big5
+
pre-build:
${RM} -rf ${WRKSRC}/docs/gtk.info*
post-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk/themes/engines
- @${LN} -sf ${PREFIX}/bin/gtk-config ${STAGEDIR}${PREFIX}/bin/gtk12-config
-.for lib in gdk gtk
- @${RM} ${STAGEDIR}${PREFIX}/lib/lib${lib}.la ${STAGEDIR}${PREFIX}/lib/lib${lib}.so
- @${MV} ${STAGEDIR}${PREFIX}/lib/lib${lib}.a ${STAGEDIR}${PREFIX}/lib/lib${lib}-12.a
-.endfor
+ @${LN} -sf gtk-config ${STAGEDIR}${PREFIX}/bin/gtk12-config
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtk12/files/patch-Makefile.in b/x11-toolkits/gtk12/files/patch-Makefile.in
index 258db13435f7..0663b3ea4373 100644
--- a/x11-toolkits/gtk12/files/patch-Makefile.in
+++ b/x11-toolkits/gtk12/files/patch-Makefile.in
@@ -1,23 +1,5 @@
--- Makefile.in.orig Sun Apr 1 23:14:07 2001
+++ Makefile.in Wed Nov 20 14:56:58 2002
-@@ -35,7 +35,7 @@
- DESTDIR =
-
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
-+pkglibdir = $(prefix)/libdata/pkgconfig
- pkgincludedir = $(includedir)/@PACKAGE@
-
- top_builddir = .
-@@ -136,7 +136,7 @@
- EXTRA_DIST = HACKING gtk+.spec.in gtk.m4 makecopyright TODO NEWS.pre-1-0 ChangeLog.pre-1-0 README.cvs-commits intl/libgettext.h intl/po2tbl.sed.in examples/aspectframe/Makefile examples/aspectframe/aspectframe.c examples/Makefile examples/README.1ST examples/extract.awk examples/extract.sh examples/base/Makefile examples/base/base.c examples/buttons/Makefile examples/buttons/buttons.c examples/buttons/info.xpm examples/calendar/Makefile examples/calendar/calendar.c examples/clist/Makefile examples/clist/clist.c examples/entry/Makefile examples/entry/entry.c examples/eventbox/Makefile examples/eventbox/eventbox.c examples/filesel/Makefile examples/filesel/filesel.c examples/gtkdial/Makefile examples/gtkdial/dial_test.c examples/gtkdial/gtkdial.c examples/gtkdial/gtkdial.h examples/helloworld/Makefile examples/helloworld/helloworld.c examples/helloworld2/Makefile examples/helloworld2/helloworld2.c examples/list/Makefile examples/list/list.c examples/menu/Makefile examples/menu/menu.c examples/menu/itemfactory.c examples/notebook/Makefile examples/notebook/notebook.c examples/packbox/Makefile examples/packbox/packbox.c examples/packer/Makefile examples/packer/pack.c examples/paned/Makefile examples/paned/paned.c examples/pixmap/Makefile examples/pixmap/pixmap.c examples/progressbar/Makefile examples/progressbar/progressbar.c examples/radiobuttons/Makefile examples/radiobuttons/radiobuttons.c examples/rangewidgets/Makefile examples/rangewidgets/rangewidgets.c examples/rulers/Makefile examples/rulers/rulers.c examples/scribble-simple/Makefile examples/scribble-simple/scribble-simple.c examples/scrolledwin/Makefile examples/scrolledwin/scrolledwin.c examples/selection/Makefile examples/selection/gettargets.c examples/selection/setselection.c examples/statusbar/Makefile examples/statusbar/statusbar.c examples/table/Makefile examples/table/table.c examples/text/Makefile examples/text/text.c examples/tictactoe/Makefile examples/tictactoe/tictactoe.c examples/tictactoe/tictactoe.h examples/tictactoe/ttt_test.c examples/tree/Makefile examples/tree/tree.c examples/wheelbarrow/Makefile examples/wheelbarrow/wheelbarrow.c examples/fixed/fixed.c examples/fixed/Makefile examples/frame/frame.c examples/frame/Makefile examples/spinbutton/spinbutton.c examples/spinbutton/Makefile examples/find-examples.sh gdk.pc.in gtk+.pc.in
-
-
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(pkglibdir)
- pkgconfig_DATA = gdk.pc gtk+.pc
-
- m4datadir = $(datadir)/aclocal
@@ -438,7 +438,6 @@
|| exit 1; \
fi; \
diff --git a/x11-toolkits/gtk12/files/patch-configure b/x11-toolkits/gtk12/files/patch-configure
index c29a6955e4e4..f80ea04b54c1 100644
--- a/x11-toolkits/gtk12/files/patch-configure
+++ b/x11-toolkits/gtk12/files/patch-configure
@@ -1,29 +1,5 @@
--- configure.orig Tue May 11 05:42:09 1999
+++ configure Mon May 17 22:59:13 1999
-@@ -606,10 +606,10 @@
-
-
- # libtool versioning
--LT_RELEASE=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION
--LT_CURRENT=`expr $GTK_MICRO_VERSION - $GTK_INTERFACE_AGE`
--LT_REVISION=$GTK_INTERFACE_AGE
--LT_AGE=`expr $GTK_BINARY_AGE - $GTK_INTERFACE_AGE`
-+LT_RELEASE=12
-+LT_CURRENT=2
-+LT_REVISION=0
-+LT_AGE=0
-
-
-
-@@ -3689,7 +3689,7 @@
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- CATOBJEXT=.mo
-- DATADIRNAME=lib
-+ DATADIRNAME=share
- fi
- rm -f conftest*
- INSTOBJEXT=.mo
@@ -4446,6 +4446,7 @@
glib_thread_cflags="$GLIB_CFLAGS"
glib_libs=`$GLIB_CONFIG glib gmodule --libs`
diff --git a/x11-toolkits/gtk12/files/patch-gdk.pc.in b/x11-toolkits/gtk12/files/patch-gdk.pc.in
deleted file mode 100644
index 5db084b049ac..000000000000
--- a/x11-toolkits/gtk12/files/patch-gdk.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- gdk.pc.in.orig Wed Nov 29 20:18:35 2000
-+++ gdk.pc.in Fri Jun 14 00:04:34 2002
-@@ -7,5 +7,5 @@
- Description: GIMP Drawing Kit
- Version: @VERSION@
- Requires: glib
--Libs: -L${libdir} @x_ldflags@ -lgdk @INTLLIBS@ @GDK_WLIBS@ @x_libs@ -lm
--Cflags: -I${includedir}/gtk-1.2 @x_cflags@
-+Libs: -L${libdir} @x_ldflags@ -lgdk-12 @INTLLIBS@ @GDK_WLIBS@ @x_libs@ -lm
-+Cflags: -I${includedir} @x_cflags@
diff --git a/x11-toolkits/gtk12/files/patch-gdk__Makefile.in b/x11-toolkits/gtk12/files/patch-gdk__Makefile.in
deleted file mode 100644
index c9887ad4ae65..000000000000
--- a/x11-toolkits/gtk12/files/patch-gdk__Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gdk/Makefile.in.orig Tue Mar 6 10:45:09 2001
-+++ gdk/Makefile.in Tue Mar 6 10:45:21 2001
-@@ -134,7 +134,7 @@
- lib_LTLIBRARIES = libgdk.la
-
- # libtool stuff: set version and export symbols for resolving
--libgdkincludedir = $(includedir)/gtk-1.2/gdk
-+libgdkincludedir = $(includedir)/gdk
- libgdk_la_LDFLAGS = @STRIP_BEGIN@ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -export-dynamic @GLIB_DEPLIBS@ @x_ldflags@ @x_libs@ -lm @STRIP_END@
-
-
diff --git a/x11-toolkits/gtk12/files/patch-gtk+.pc.in b/x11-toolkits/gtk12/files/patch-gtk+.pc.in
deleted file mode 100644
index d9ab159ec758..000000000000
--- a/x11-toolkits/gtk12/files/patch-gtk+.pc.in
+++ /dev/null
@@ -1,9 +0,0 @@
---- gtk+.pc.in 2002/06/10 15:32:34 1.1
-+++ gtk+.pc.in 2002/06/10 15:32:40
-@@ -7,5 +7,5 @@
- Description: GIMP Tool Kit
- Version: @VERSION@
- Requires: gdk
--Libs: -L${libdir} -lgtk
-+Libs: -L${libdir} -lgtk-12
- Cflags:
diff --git a/x11-toolkits/gtk12/files/patch-gtk-config.in b/x11-toolkits/gtk12/files/patch-gtk-config.in
deleted file mode 100644
index 5ef60b088b4d..000000000000
--- a/x11-toolkits/gtk12/files/patch-gtk-config.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- gtk-config.in.orig Sat Oct 21 18:20:40 2000
-+++ gtk-config.in Tue Mar 6 10:11:59 2001
-@@ -91,7 +91,7 @@
- fi
-
- if test "$echo_cflags" = "yes"; then
-- echo -I@includedir@/gtk-1.2 $glib_cflags @x_cflags@
-+ echo -I@includedir@ $glib_cflags @x_cflags@
- fi
-
- if test "$echo_libs" = "yes"; then
-@@ -107,6 +107,6 @@
- fi
- done
-
-- echo $libdirs @x_ldflags@ -lgtk -lgdk $my_glib_libs @INTLLIBS@ @x_libs@ @GDK_WLIBS@ -lm
-+ echo $libdirs @x_ldflags@ -lgtk-@LT_RELEASE@ -lgdk-@LT_RELEASE@ $my_glib_libs @INTLLIBS@ @x_libs@ @GDK_WLIBS@ -lm
- fi
-
diff --git a/x11-toolkits/gtk12/files/patch-gtk__Makefile.in b/x11-toolkits/gtk12/files/patch-gtk__Makefile.in
index ce3ac1f0c307..e0dc3531df8d 100644
--- a/x11-toolkits/gtk12/files/patch-gtk__Makefile.in
+++ b/x11-toolkits/gtk12/files/patch-gtk__Makefile.in
@@ -9,39 +9,18 @@
#
-@@ -134,10 +134,8 @@
- lib_LTLIBRARIES = libgtk.la
-
- # libtool stuff: set version and export symbols for resolving
--libgtkincludedir = $(includedir)/gtk-1.2/gtk
--libgtk_la_LDFLAGS = @STRIP_BEGIN@ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -export-dynamic @GLIB_DEPLIBS@ @x_ldflags@ @x_libs@ -lm @STRIP_END@
--
--# $(top_builddir)/gdk/libgdk.la
-+libgtkincludedir = $(includedir)/gtk
-+libgtk_la_LDFLAGS = @STRIP_BEGIN@ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -export-dynamic @GLIB_DEPLIBS@ @x_ldflags@ @x_libs@ -lm $(top_builddir)/gdk/libgdk.la @STRIP_END@
-
- #
- # setup source file variables
-@@ -190,8 +188,8 @@
+@@ -190,8 +190,8 @@
gen_sources = xgen-gdef xgen-gtbh xgen-gtbvc xgen-gtbic xgen-gtbec xgen-gmh xgen-gmc
CLEANFILES = $(gen_sources)
-gtkconfdir = $(sysconfdir)/gtk
-gtkconf_DATA = gtkrc.az gtkrc.el gtkrc.eo gtkrc.he gtkrc.hy gtkrc.ja gtkrc.ko gtkrc.ru gtkrc.tr gtkrc.th gtkrc.uk gtkrc.iso-8859-2 gtkrc.iso-8859-5 gtkrc.iso-8859-13 gtkrc.iso-8859-14 gtkrc.iso-8859-15 gtkrc.zh_CN gtkrc.zh_TW.big5 gtkrc.ka_GE.georgianacademy gtkrc.ka_GE.georgianps gtkrc.vi_VN.tcvn gtkrc.vi_VN.viscii gtkrc.cp1251 gtkrc.cp1255
+gtkconfdir = $(datadir)/themes/Default/gtk
-+gtkconf_DATA = gtkrc.az gtkrc.el gtkrc.eo gtkrc.he gtkrc.hy gtkrc.ja gtkrc.ko gtkrc.ru gtkrc.tr gtkrc.th gtkrc.uk gtkrc.iso-8859-2 gtkrc.iso-8859-5 gtkrc.iso-8859-13 gtkrc.iso-8859-14 gtkrc.iso-8859-15 gtkrc.zh_CN gtkrc.ka_GE.georgianacademy gtkrc.ka_GE.georgianps gtkrc.vi_VN.tcvn gtkrc.vi_VN.viscii gtkrc.cp1251 gtkrc.cp1255
++gtkconf_DATA = gtkrc.az gtkrc.el gtkrc.eo gtkrc.he gtkrc.hy gtkrc.ja gtkrc.ko gtkrc.ru gtkrc.tr gtkrc.th gtkrc.uk gtkrc.iso-8859-2 gtkrc.iso-8859-5 gtkrc.iso-8859-13 gtkrc.iso-8859-14 gtkrc.iso-8859-15 gtkrc.zh_CN gtkrc.zh_TW.Big5 gtkrc.ka_GE.georgianacademy gtkrc.ka_GE.georgianps gtkrc.vi_VN.tcvn gtkrc.vi_VN.viscii gtkrc.cp1251 gtkrc.cp1255
#
-@@ -415,6 +413,7 @@
- $(INSTALL_DATA) $$p $(DESTDIR)$(gtkconfdir)/$$p; \
- fi; fi; \
- done
-+ $(INSTALL_DATA) gtkrc.zh_TW.big5 $(DESTDIR)$(gtkconfdir)/gtkrc.zh_TW.Big5
-
- uninstall-gtkconfDATA:
- @$(NORMAL_UNINSTALL)
-@@ -1362,7 +1361,7 @@
+@@ -1362,7 +1362,7 @@
uninstall-am: uninstall-libLTLIBRARIES uninstall-gtkconfDATA \
uninstall-libgtkincludeHEADERS uninstall-local
uninstall: uninstall-am
diff --git a/x11-toolkits/gtk12/pkg-plist b/x11-toolkits/gtk12/pkg-plist
index a66cda9012b5..67d1a614abae 100644
--- a/x11-toolkits/gtk12/pkg-plist
+++ b/x11-toolkits/gtk12/pkg-plist
@@ -1,131 +1,133 @@
bin/gtk-config
bin/gtk12-config
-include/gtk12/gdk/gdk.h
-include/gtk12/gdk/gdkcursors.h
-include/gtk12/gdk/gdki18n.h
-include/gtk12/gdk/gdkkeysyms.h
-include/gtk12/gdk/gdkprivate.h
-include/gtk12/gdk/gdkrgb.h
-include/gtk12/gdk/gdktypes.h
-include/gtk12/gdk/gdkx.h
-include/gtk12/gtk/gtk.h
-include/gtk12/gtk/gtkaccelgroup.h
-include/gtk12/gtk/gtkaccellabel.h
-include/gtk12/gtk/gtkadjustment.h
-include/gtk12/gtk/gtkalignment.h
-include/gtk12/gtk/gtkarg.h
-include/gtk12/gtk/gtkarrow.h
-include/gtk12/gtk/gtkaspectframe.h
-include/gtk12/gtk/gtkbbox.h
-include/gtk12/gtk/gtkbin.h
-include/gtk12/gtk/gtkbindings.h
-include/gtk12/gtk/gtkbox.h
-include/gtk12/gtk/gtkbutton.h
-include/gtk12/gtk/gtkcalendar.h
-include/gtk12/gtk/gtkcheckbutton.h
-include/gtk12/gtk/gtkcheckmenuitem.h
-include/gtk12/gtk/gtkclist.h
-include/gtk12/gtk/gtkcolorsel.h
-include/gtk12/gtk/gtkcombo.h
-include/gtk12/gtk/gtkcompat.h
-include/gtk12/gtk/gtkcontainer.h
-include/gtk12/gtk/gtkctree.h
-include/gtk12/gtk/gtkcurve.h
-include/gtk12/gtk/gtkdata.h
-include/gtk12/gtk/gtkdebug.h
-include/gtk12/gtk/gtkdialog.h
-include/gtk12/gtk/gtkdnd.h
-include/gtk12/gtk/gtkdrawingarea.h
-include/gtk12/gtk/gtkeditable.h
-include/gtk12/gtk/gtkentry.h
-include/gtk12/gtk/gtkenums.h
-include/gtk12/gtk/gtkeventbox.h
-include/gtk12/gtk/gtkfeatures.h
-include/gtk12/gtk/gtkfilesel.h
-include/gtk12/gtk/gtkfixed.h
-include/gtk12/gtk/gtkfontsel.h
-include/gtk12/gtk/gtkframe.h
-include/gtk12/gtk/gtkgamma.h
-include/gtk12/gtk/gtkgc.h
-include/gtk12/gtk/gtkhandlebox.h
-include/gtk12/gtk/gtkhbbox.h
-include/gtk12/gtk/gtkhbox.h
-include/gtk12/gtk/gtkhpaned.h
-include/gtk12/gtk/gtkhruler.h
-include/gtk12/gtk/gtkhscale.h
-include/gtk12/gtk/gtkhscrollbar.h
-include/gtk12/gtk/gtkhseparator.h
-include/gtk12/gtk/gtkimage.h
-include/gtk12/gtk/gtkinputdialog.h
-include/gtk12/gtk/gtkinvisible.h
-include/gtk12/gtk/gtkitem.h
-include/gtk12/gtk/gtkitemfactory.h
-include/gtk12/gtk/gtklabel.h
-include/gtk12/gtk/gtklayout.h
-include/gtk12/gtk/gtklist.h
-include/gtk12/gtk/gtklistitem.h
-include/gtk12/gtk/gtkmain.h
-include/gtk12/gtk/gtkmarshal.h
-include/gtk12/gtk/gtkmenu.h
-include/gtk12/gtk/gtkmenubar.h
-include/gtk12/gtk/gtkmenufactory.h
-include/gtk12/gtk/gtkmenuitem.h
-include/gtk12/gtk/gtkmenushell.h
-include/gtk12/gtk/gtkmisc.h
-include/gtk12/gtk/gtknotebook.h
-include/gtk12/gtk/gtkobject.h
-include/gtk12/gtk/gtkoptionmenu.h
-include/gtk12/gtk/gtkpacker.h
-include/gtk12/gtk/gtkpaned.h
-include/gtk12/gtk/gtkpixmap.h
-include/gtk12/gtk/gtkplug.h
-include/gtk12/gtk/gtkpreview.h
-include/gtk12/gtk/gtkprivate.h
-include/gtk12/gtk/gtkprogress.h
-include/gtk12/gtk/gtkprogressbar.h
-include/gtk12/gtk/gtkradiobutton.h
-include/gtk12/gtk/gtkradiomenuitem.h
-include/gtk12/gtk/gtkrange.h
-include/gtk12/gtk/gtkrc.h
-include/gtk12/gtk/gtkruler.h
-include/gtk12/gtk/gtkscale.h
-include/gtk12/gtk/gtkscrollbar.h
-include/gtk12/gtk/gtkscrolledwindow.h
-include/gtk12/gtk/gtkselection.h
-include/gtk12/gtk/gtkseparator.h
-include/gtk12/gtk/gtksignal.h
-include/gtk12/gtk/gtksocket.h
-include/gtk12/gtk/gtkspinbutton.h
-include/gtk12/gtk/gtkstatusbar.h
-include/gtk12/gtk/gtkstyle.h
-include/gtk12/gtk/gtktable.h
-include/gtk12/gtk/gtktearoffmenuitem.h
-include/gtk12/gtk/gtktext.h
-include/gtk12/gtk/gtkthemes.h
-include/gtk12/gtk/gtktipsquery.h
-include/gtk12/gtk/gtktogglebutton.h
-include/gtk12/gtk/gtktoolbar.h
-include/gtk12/gtk/gtktooltips.h
-include/gtk12/gtk/gtktree.h
-include/gtk12/gtk/gtktreeitem.h
-include/gtk12/gtk/gtktypebuiltins.h
-include/gtk12/gtk/gtktypeutils.h
-include/gtk12/gtk/gtkvbbox.h
-include/gtk12/gtk/gtkvbox.h
-include/gtk12/gtk/gtkviewport.h
-include/gtk12/gtk/gtkvpaned.h
-include/gtk12/gtk/gtkvruler.h
-include/gtk12/gtk/gtkvscale.h
-include/gtk12/gtk/gtkvscrollbar.h
-include/gtk12/gtk/gtkvseparator.h
-include/gtk12/gtk/gtkwidget.h
-include/gtk12/gtk/gtkwindow.h
-lib/libgdk-12.a
-lib/libgdk-12.so
-lib/libgdk-12.so.2
-lib/libgtk-12.a
-lib/libgtk-12.so
-lib/libgtk-12.so.2
+include/gtk-1.2/gdk/gdk.h
+include/gtk-1.2/gdk/gdkcursors.h
+include/gtk-1.2/gdk/gdki18n.h
+include/gtk-1.2/gdk/gdkkeysyms.h
+include/gtk-1.2/gdk/gdkprivate.h
+include/gtk-1.2/gdk/gdkrgb.h
+include/gtk-1.2/gdk/gdktypes.h
+include/gtk-1.2/gdk/gdkx.h
+include/gtk-1.2/gtk/gtk.h
+include/gtk-1.2/gtk/gtkaccelgroup.h
+include/gtk-1.2/gtk/gtkaccellabel.h
+include/gtk-1.2/gtk/gtkadjustment.h
+include/gtk-1.2/gtk/gtkalignment.h
+include/gtk-1.2/gtk/gtkarg.h
+include/gtk-1.2/gtk/gtkarrow.h
+include/gtk-1.2/gtk/gtkaspectframe.h
+include/gtk-1.2/gtk/gtkbbox.h
+include/gtk-1.2/gtk/gtkbin.h
+include/gtk-1.2/gtk/gtkbindings.h
+include/gtk-1.2/gtk/gtkbox.h
+include/gtk-1.2/gtk/gtkbutton.h
+include/gtk-1.2/gtk/gtkcalendar.h
+include/gtk-1.2/gtk/gtkcheckbutton.h
+include/gtk-1.2/gtk/gtkcheckmenuitem.h
+include/gtk-1.2/gtk/gtkclist.h
+include/gtk-1.2/gtk/gtkcolorsel.h
+include/gtk-1.2/gtk/gtkcombo.h
+include/gtk-1.2/gtk/gtkcompat.h
+include/gtk-1.2/gtk/gtkcontainer.h
+include/gtk-1.2/gtk/gtkctree.h
+include/gtk-1.2/gtk/gtkcurve.h
+include/gtk-1.2/gtk/gtkdata.h
+include/gtk-1.2/gtk/gtkdebug.h
+include/gtk-1.2/gtk/gtkdialog.h
+include/gtk-1.2/gtk/gtkdnd.h
+include/gtk-1.2/gtk/gtkdrawingarea.h
+include/gtk-1.2/gtk/gtkeditable.h
+include/gtk-1.2/gtk/gtkentry.h
+include/gtk-1.2/gtk/gtkenums.h
+include/gtk-1.2/gtk/gtkeventbox.h
+include/gtk-1.2/gtk/gtkfeatures.h
+include/gtk-1.2/gtk/gtkfilesel.h
+include/gtk-1.2/gtk/gtkfixed.h
+include/gtk-1.2/gtk/gtkfontsel.h
+include/gtk-1.2/gtk/gtkframe.h
+include/gtk-1.2/gtk/gtkgamma.h
+include/gtk-1.2/gtk/gtkgc.h
+include/gtk-1.2/gtk/gtkhandlebox.h
+include/gtk-1.2/gtk/gtkhbbox.h
+include/gtk-1.2/gtk/gtkhbox.h
+include/gtk-1.2/gtk/gtkhpaned.h
+include/gtk-1.2/gtk/gtkhruler.h
+include/gtk-1.2/gtk/gtkhscale.h
+include/gtk-1.2/gtk/gtkhscrollbar.h
+include/gtk-1.2/gtk/gtkhseparator.h
+include/gtk-1.2/gtk/gtkimage.h
+include/gtk-1.2/gtk/gtkinputdialog.h
+include/gtk-1.2/gtk/gtkinvisible.h
+include/gtk-1.2/gtk/gtkitem.h
+include/gtk-1.2/gtk/gtkitemfactory.h
+include/gtk-1.2/gtk/gtklabel.h
+include/gtk-1.2/gtk/gtklayout.h
+include/gtk-1.2/gtk/gtklist.h
+include/gtk-1.2/gtk/gtklistitem.h
+include/gtk-1.2/gtk/gtkmain.h
+include/gtk-1.2/gtk/gtkmarshal.h
+include/gtk-1.2/gtk/gtkmenu.h
+include/gtk-1.2/gtk/gtkmenubar.h
+include/gtk-1.2/gtk/gtkmenufactory.h
+include/gtk-1.2/gtk/gtkmenuitem.h
+include/gtk-1.2/gtk/gtkmenushell.h
+include/gtk-1.2/gtk/gtkmisc.h
+include/gtk-1.2/gtk/gtknotebook.h
+include/gtk-1.2/gtk/gtkobject.h
+include/gtk-1.2/gtk/gtkoptionmenu.h
+include/gtk-1.2/gtk/gtkpacker.h
+include/gtk-1.2/gtk/gtkpaned.h
+include/gtk-1.2/gtk/gtkpixmap.h
+include/gtk-1.2/gtk/gtkplug.h
+include/gtk-1.2/gtk/gtkpreview.h
+include/gtk-1.2/gtk/gtkprivate.h
+include/gtk-1.2/gtk/gtkprogress.h
+include/gtk-1.2/gtk/gtkprogressbar.h
+include/gtk-1.2/gtk/gtkradiobutton.h
+include/gtk-1.2/gtk/gtkradiomenuitem.h
+include/gtk-1.2/gtk/gtkrange.h
+include/gtk-1.2/gtk/gtkrc.h
+include/gtk-1.2/gtk/gtkruler.h
+include/gtk-1.2/gtk/gtkscale.h
+include/gtk-1.2/gtk/gtkscrollbar.h
+include/gtk-1.2/gtk/gtkscrolledwindow.h
+include/gtk-1.2/gtk/gtkselection.h
+include/gtk-1.2/gtk/gtkseparator.h
+include/gtk-1.2/gtk/gtksignal.h
+include/gtk-1.2/gtk/gtksocket.h
+include/gtk-1.2/gtk/gtkspinbutton.h
+include/gtk-1.2/gtk/gtkstatusbar.h
+include/gtk-1.2/gtk/gtkstyle.h
+include/gtk-1.2/gtk/gtktable.h
+include/gtk-1.2/gtk/gtktearoffmenuitem.h
+include/gtk-1.2/gtk/gtktext.h
+include/gtk-1.2/gtk/gtkthemes.h
+include/gtk-1.2/gtk/gtktipsquery.h
+include/gtk-1.2/gtk/gtktogglebutton.h
+include/gtk-1.2/gtk/gtktoolbar.h
+include/gtk-1.2/gtk/gtktooltips.h
+include/gtk-1.2/gtk/gtktree.h
+include/gtk-1.2/gtk/gtktreeitem.h
+include/gtk-1.2/gtk/gtktypebuiltins.h
+include/gtk-1.2/gtk/gtktypeutils.h
+include/gtk-1.2/gtk/gtkvbbox.h
+include/gtk-1.2/gtk/gtkvbox.h
+include/gtk-1.2/gtk/gtkviewport.h
+include/gtk-1.2/gtk/gtkvpaned.h
+include/gtk-1.2/gtk/gtkvruler.h
+include/gtk-1.2/gtk/gtkvscale.h
+include/gtk-1.2/gtk/gtkvscrollbar.h
+include/gtk-1.2/gtk/gtkvseparator.h
+include/gtk-1.2/gtk/gtkwidget.h
+include/gtk-1.2/gtk/gtkwindow.h
+lib/libgdk-1.2.so.0
+lib/libgdk-1.2.so.0.9.1
+lib/libgdk.a
+lib/libgdk.so
+lib/libgtk-1.2.so.0
+lib/libgtk-1.2.so.0.9.1
+lib/libgtk.a
+lib/libgtk.so
libdata/pkgconfig/gdk.pc
libdata/pkgconfig/gtk+.pc
share/aclocal/gtk.m4
@@ -220,7 +222,6 @@ share/themes/Default/gtk/gtkrc.yi
share/themes/Default/gtk/gtkrc.zh_CN
share/themes/Default/gtk/gtkrc.zh_TW.Big5
man/man1/gtk-config.1.gz
-@exec mkdir -p %D/lib/gtk/themes/engines
%%NLS%%@dirrmtry share/locale/sp/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/sp
@dirrm lib/gtk/themes/engines
@@ -228,7 +229,7 @@ man/man1/gtk-config.1.gz
@dirrm lib/gtk
@dirrm share/themes/Default/gtk
@dirrmtry share/themes/Default
-@dirrm include/gtk12/gtk
-@dirrm include/gtk12/gdk
-@dirrm include/gtk12
-@unexec rmdir %D/share/themes 2>/dev/null || /usr/bin/true
+@dirrmtry share/themes
+@dirrm include/gtk-1.2/gtk
+@dirrm include/gtk-1.2/gdk
+@dirrm include/gtk-1.2
diff --git a/x11-toolkits/p5-Gtk/Makefile b/x11-toolkits/p5-Gtk/Makefile
index 81db0e303607..2d16da63d6cd 100644
--- a/x11-toolkits/p5-Gtk/Makefile
+++ b/x11-toolkits/p5-Gtk/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Gtk
PORTVERSION= 0.7010
+PORTREVISION= 1
CATEGORIES= x11-toolkits lang perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/x11/deskmenu/Makefile b/x11/deskmenu/Makefile
index 5902fe5f3fed..e46747691adb 100644
--- a/x11/deskmenu/Makefile
+++ b/x11/deskmenu/Makefile
@@ -3,7 +3,7 @@
PORTNAME= deskmenu
PORTVERSION= 1.3.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11
MASTER_SITES= http://matt.peterson.org/FreeBSD/ports/ \
http://gd.tuwien.ac.at/opsys/linux/gentoo/distfiles/
diff --git a/x11/dgs/Makefile b/x11/dgs/Makefile
index dd0a9706505a..25249e7817bf 100644
--- a/x11/dgs/Makefile
+++ b/x11/dgs/Makefile
@@ -3,7 +3,7 @@
PORTNAME= dgs
PORTVERSION= 0.5.9.1
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ../old-gnu/dgs
diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile
index f3889d53b525..07648d56c9fe 100644
--- a/x11/gdkxft/Makefile
+++ b/x11/gdkxft/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gdkxft
PORTVERSION= 1.5
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11
MASTER_SITES= SF
diff --git a/x11/gmessage/Makefile b/x11/gmessage/Makefile
index 6ddfc62bf214..b34b4b0b0cf6 100644
--- a/x11/gmessage/Makefile
+++ b/x11/gmessage/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gmessage
PORTVERSION= 0.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11
MASTER_SITES= http://www.brettnacher.org/users/dominik/FreeBSD/
diff --git a/x11/gtk-launch/Makefile b/x11/gtk-launch/Makefile
index 59d613d25f92..a3e55ff44fc3 100644
--- a/x11/gtk-launch/Makefile
+++ b/x11/gtk-launch/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gtk-launch
DISTVERSION= 1.1b
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11
MASTER_SITES= http://pierric.descamps.free.fr/pierric/downloads/ \
CRITICAL
diff --git a/x11/gtk-theme-switch/Makefile b/x11/gtk-theme-switch/Makefile
index 0cef3430d75c..2883daae084f 100644
--- a/x11/gtk-theme-switch/Makefile
+++ b/x11/gtk-theme-switch/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gtk-theme-switch
PORTVERSION= 1.0.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11
MASTER_SITES= http://www.muhri.net/
PKGNAMESUFFIX= 1
diff --git a/x11/peeper/Makefile b/x11/peeper/Makefile
index c1bc6d8488a2..1fb6f7bea3ed 100644
--- a/x11/peeper/Makefile
+++ b/x11/peeper/Makefile
@@ -3,7 +3,7 @@
PORTNAME= peeper
PORTVERSION= 0.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= x11
MASTER_SITES= http://peeper.sourceforge.net/
diff --git a/x11/xdialog/Makefile b/x11/xdialog/Makefile
index 6821672a54d8..09648c7ef8fd 100644
--- a/x11/xdialog/Makefile
+++ b/x11/xdialog/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xdialog
PORTVERSION= 2.3.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11
MASTER_SITES= http://xdialog.free.fr/
DISTNAME= ${PORTNAME:S/x/X/}-${PORTVERSION}