10 files changed, 256 insertions, 88 deletions

diff --git a/polish/gnugadu/Makefile b/polish/gnugadu/Makefile
index 328355e39418..caf111f36b39 100644
--- a/polish/gnugadu/Makefile
+++ b/polish/gnugadu/Makefile
@@ -6,51 +6,52 @@
 #
 
 PORTNAME=	gnugadu
-PORTVERSION=	0.2.2
+PORTVERSION=	1.0.0
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.slackware.pl/gg/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	ggadu
 DISTNAME=	gg-${PORTVERSION}
 
-MAINTAINER=	doc@lublin.t1.pl
+MAINTAINER=	dotz@irc.pl
 COMMENT=	A GaduGadu client for X11/GTK
 
-WRKSRC=	${WRKDIR}/gg-${PORTVERSION}
-
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
-WANT_GNOME=	yes
+USE_REINPLACE=	yes
+USE_SUBMAKE=	yes
 GNU_CONFIGURE=	yes
 
-.include <bsd.port.pre.mk>
-.if ${HAVE_GNOME:Mesound}!=""
-USE_GNOME+=	esound
-PKGNAMESUFFIX=	-esound
-.else
-CONFIGURE_ARGS+=	--disable-esd
+.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
+IS_INTERACTIVE=	yes
 .endif
 
-.if defined(WITH_GNOME)
-CONFIGURE_ARGS+=	--enable-gnome
-USE_GNOME=	yes
-.else
-pre-everything::
-	@${ECHO_MSG}	"Define WITH_GNOME to include GNOME support"
-.endif
-.if defined(WITH_DOCKAPP)
-CONFIGURE_ARGS+=	--enable-dockapp
-.else
-pre-everything::
-	@${ECHO_MSG}	"Define WITH_DOCKAPP to include WindowMaker support"
-.endif
+SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
+		TOUCH="${TOUCH}" \
+		MKDIR="${MKDIR}" \
+		CAT="${CAT}" \
+		GNUGADU_OPTIONS="${GNUGADU_OPTIONS}" \
+		REALCURDIR="${.CURDIR}"
+
+pre-fetch:
+	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.gg
 
 post-patch:
-	@${PERL} -pi -e 's,CFLAGS =, CFLAGS += \@GTK_CFLAGS\@,; \
-		s,GTK_ CFLAGS,GTK_CFLAGS,' ${WRKSRC}/Makefile.in \
+	@${REINPLACE_CMD} -e 's,GTK_ CFLAGS,GTK_CFLAGS,' \
+		-e 's,CFLAGS =, CFLAGS += @GTK_CFLAGS@ ${PTHREAD_CFLAGS},' \
+		-e 's,@GTK_LIBS@,@GTK_LIBS@ ${PTHREAD_LIBS},'\
+		${WRKSRC}/Makefile.in \
 		${WRKSRC}/src/Makefile.in
-	@${PERL} -pi -e 's,-O2,,; s,gtk-config,${GTK_CONFIG},' \
+	@${REINPLACE_CMD} -e 's,-O2,,' -e 's,gtk-config,${GTK_CONFIG},' \
 		${WRKSRC}/configure
 
 post-install:
-	     strip ${PREFIX}/bin/gg
+	${STRIP_CMD} ${PREFIX}/bin/gg
+
+post-clean:
+	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
+
+.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
+.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
+.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/polish/gnugadu/distinfo b/polish/gnugadu/distinfo
index ca6d1287d5aa..fb985acd11e5 100644
--- a/polish/gnugadu/distinfo
+++ b/polish/gnugadu/distinfo
@@ -1 +1 @@
-MD5 (gg-0.2.2.tar.gz) = aadc23b792708d8320c064ea29958ce6
+MD5 (gg-1.0.0.tar.gz) = 7b32d4c866ef59dfe22373a83b1a9a2a
diff --git a/polish/gnugadu/pkg-descr b/polish/gnugadu/pkg-descr
index b7984e15bb8c..431011ad8180 100644
--- a/polish/gnugadu/pkg-descr
+++ b/polish/gnugadu/pkg-descr
@@ -1,4 +1,4 @@
 A GaduGadu client for X11/GTK.  GaduGadu is an ICQ-like messenger for the
 Polish language.
 
-WWW: http://netkrab.slackware.pl/gg/
+WWW: http://ggadu.sourceforge.net/
diff --git a/polish/gnugadu/pkg-plist b/polish/gnugadu/pkg-plist
index f97275bca30e..44815a0ba837 100644
--- a/polish/gnugadu/pkg-plist
+++ b/polish/gnugadu/pkg-plist
@@ -1,36 +1,42 @@
 bin/gg
 share/gg/pixmaps/arrow.xpm
+share/gg/pixmaps/away-descr.xpm
+share/gg/pixmaps/away-mobile-descr.xpm
+share/gg/pixmaps/away-mobile.xpm
 share/gg/pixmaps/away.xpm
+share/gg/pixmaps/cell.xpm
 share/gg/pixmaps/cellphone.xpm
 share/gg/pixmaps/chat.xpm
 share/gg/pixmaps/config.xpm
+share/gg/pixmaps/empty.xpm
+share/gg/pixmaps/gg-logo.xpm
 share/gg/pixmaps/gg.xpm
+share/gg/pixmaps/go-chat.xpm
+share/gg/pixmaps/go-msg.xpm
 share/gg/pixmaps/ignored.xpm
+share/gg/pixmaps/invisible-descr.xpm
 share/gg/pixmaps/invisible.xpm
 share/gg/pixmaps/malehead.xpm
+share/gg/pixmaps/mobile.xpm
 share/gg/pixmaps/msg.xpm
+share/gg/pixmaps/new-msg.xpm
+share/gg/pixmaps/offline-descr.xpm
+share/gg/pixmaps/offline-mobile-descr.xpm
+share/gg/pixmaps/offline-mobile.xpm
 share/gg/pixmaps/offline.xpm
+share/gg/pixmaps/online-descr.xpm
+share/gg/pixmaps/online-mobile-descr.xpm
+share/gg/pixmaps/online-mobile.xpm
 share/gg/pixmaps/online.xpm
 share/gg/pixmaps/online_connecting.xpm
-share/gg/pixmaps/search.xpm
-share/gg/pixmaps/away-mobile.xpm
-share/gg/pixmaps/cell.xpm
-share/gg/pixmaps/gg-logo.xpm
-share/gg/pixmaps/go-chat.xpm
-share/gg/pixmaps/go-msg.xpm
-share/gg/pixmaps/mobile.xpm
-share/gg/pixmaps/offline-mobile.xpm
-share/gg/pixmaps/online-mobile.xpm
 share/gg/pixmaps/pubdir_info.xpm
+share/gg/pixmaps/search.xpm
 share/gg/pixmaps/search_unknown.xpm
 share/gg/pixmaps/wmexit.xpm
 share/gg/pixmaps/wmmsg.xpm
 share/gg/sounds/msg.wav
 share/gg/sounds/usr.wav
 share/gg/sounds/yahoo.wav
-@unexec rmdir %D/share/gnome/apps/Internet 2>/dev/null || true
-@unexec rmdir %D/share/gnome/apps 2>/dev/null || true
-@unexec rmdir %D/share/gnome 2>/dev/null || true
 @dirrm share/gg/sounds
 @dirrm share/gg/pixmaps
 @dirrm share/gg
diff --git a/polish/gnugadu/scripts/configure.gg b/polish/gnugadu/scripts/configure.gg
new file mode 100644
index 000000000000..2a1949ef5284
--- /dev/null
+++ b/polish/gnugadu/scripts/configure.gg
@@ -0,0 +1,77 @@
+#!/bin/sh
+# $FreeBSD$
+
+if [ -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc ]; then
+	exit
+fi
+
+tempfile=`/usr/bin/mktemp -t checklist`
+
+if [ "${BATCH}" ]; then
+	if [ "${GNUGADU_OPTIONS}" ]; then
+		set ${GNUGADU_OPTIONS}
+	else
+		set \"esd\"
+	fi
+else
+	/usr/bin/dialog --title "configuration options" --clear \
+		--checklist "\n\
+Please select desired options:" -1 -1 16 \
+esd		"esd support" ON \
+arts		"arts support" OFF \
+gnome		"GNOME support" OFF \
+panel		"GNOME applet support" OFF \
+2> $tempfile
+
+	retval=$?
+
+	if [ -s $tempfile ]; then
+		set `cat $tempfile`
+	fi
+	rm -f $tempfile
+
+	case $retval in
+		0)	if [ -z "$*" ]; then
+				echo "Nothing selected"
+			fi
+			;;
+		1)	echo "Cancel pressed."
+			exit 1
+			;;
+	esac
+fi
+
+${MKDIR} ${WRKDIRPREFIX}${REALCURDIR}
+exec > ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
+
+while [ "$1" ]; do
+	case $1 in
+		\"esd\")
+			echo "USE_GNOME+=     esound"
+			echo "CONFIGURE_ARGS+=	--enable-esd"
+			esd="yes"
+			;;
+		\"arts\")
+			echo "CONFIGURE_ARGS+=	--enable-arts"
+			echo "LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts"
+ 			;;
+		\"gnome\")
+			echo "USE_GNOME+=	gnomelibs"
+			echo "CONFIGURE_ARGS+=	--enable-gnome"			
+			;;
+		\"panel\")
+			echo "USE_GNOME+=	gnomepanel"
+			echo "CONFIGURE_ARGS+=	--enable-panel"
+			;;
+		*)
+			echo "Invalid option(s): $1" >&2
+			rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
+			exit 1
+			;;
+	esac
+	shift
+done
+
+if [ -z "${esd}" ]; then
+	echo "CONFIGURE_ARGS+=	--disable-esd --without-esd"
+fi
diff --git a/polish/gnugadu2/Makefile b/polish/gnugadu2/Makefile
index 328355e39418..caf111f36b39 100644
--- a/polish/gnugadu2/Makefile
+++ b/polish/gnugadu2/Makefile
@@ -6,51 +6,52 @@
 #
 
 PORTNAME=	gnugadu
-PORTVERSION=	0.2.2
+PORTVERSION=	1.0.0
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.slackware.pl/gg/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	ggadu
 DISTNAME=	gg-${PORTVERSION}
 
-MAINTAINER=	doc@lublin.t1.pl
+MAINTAINER=	dotz@irc.pl
 COMMENT=	A GaduGadu client for X11/GTK
 
-WRKSRC=	${WRKDIR}/gg-${PORTVERSION}
-
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
-WANT_GNOME=	yes
+USE_REINPLACE=	yes
+USE_SUBMAKE=	yes
 GNU_CONFIGURE=	yes
 
-.include <bsd.port.pre.mk>
-.if ${HAVE_GNOME:Mesound}!=""
-USE_GNOME+=	esound
-PKGNAMESUFFIX=	-esound
-.else
-CONFIGURE_ARGS+=	--disable-esd
+.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
+IS_INTERACTIVE=	yes
 .endif
 
-.if defined(WITH_GNOME)
-CONFIGURE_ARGS+=	--enable-gnome
-USE_GNOME=	yes
-.else
-pre-everything::
-	@${ECHO_MSG}	"Define WITH_GNOME to include GNOME support"
-.endif
-.if defined(WITH_DOCKAPP)
-CONFIGURE_ARGS+=	--enable-dockapp
-.else
-pre-everything::
-	@${ECHO_MSG}	"Define WITH_DOCKAPP to include WindowMaker support"
-.endif
+SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
+		TOUCH="${TOUCH}" \
+		MKDIR="${MKDIR}" \
+		CAT="${CAT}" \
+		GNUGADU_OPTIONS="${GNUGADU_OPTIONS}" \
+		REALCURDIR="${.CURDIR}"
+
+pre-fetch:
+	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.gg
 
 post-patch:
-	@${PERL} -pi -e 's,CFLAGS =, CFLAGS += \@GTK_CFLAGS\@,; \
-		s,GTK_ CFLAGS,GTK_CFLAGS,' ${WRKSRC}/Makefile.in \
+	@${REINPLACE_CMD} -e 's,GTK_ CFLAGS,GTK_CFLAGS,' \
+		-e 's,CFLAGS =, CFLAGS += @GTK_CFLAGS@ ${PTHREAD_CFLAGS},' \
+		-e 's,@GTK_LIBS@,@GTK_LIBS@ ${PTHREAD_LIBS},'\
+		${WRKSRC}/Makefile.in \
 		${WRKSRC}/src/Makefile.in
-	@${PERL} -pi -e 's,-O2,,; s,gtk-config,${GTK_CONFIG},' \
+	@${REINPLACE_CMD} -e 's,-O2,,' -e 's,gtk-config,${GTK_CONFIG},' \
 		${WRKSRC}/configure
 
 post-install:
-	     strip ${PREFIX}/bin/gg
+	${STRIP_CMD} ${PREFIX}/bin/gg
+
+post-clean:
+	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
+
+.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
+.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
+.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/polish/gnugadu2/distinfo b/polish/gnugadu2/distinfo
index ca6d1287d5aa..fb985acd11e5 100644
--- a/polish/gnugadu2/distinfo
+++ b/polish/gnugadu2/distinfo
@@ -1 +1 @@
-MD5 (gg-0.2.2.tar.gz) = aadc23b792708d8320c064ea29958ce6
+MD5 (gg-1.0.0.tar.gz) = 7b32d4c866ef59dfe22373a83b1a9a2a
diff --git a/polish/gnugadu2/pkg-descr b/polish/gnugadu2/pkg-descr
index b7984e15bb8c..431011ad8180 100644
--- a/polish/gnugadu2/pkg-descr
+++ b/polish/gnugadu2/pkg-descr
@@ -1,4 +1,4 @@
 A GaduGadu client for X11/GTK.  GaduGadu is an ICQ-like messenger for the
 Polish language.
 
-WWW: http://netkrab.slackware.pl/gg/
+WWW: http://ggadu.sourceforge.net/
diff --git a/polish/gnugadu2/pkg-plist b/polish/gnugadu2/pkg-plist
index f97275bca30e..44815a0ba837 100644
--- a/polish/gnugadu2/pkg-plist
+++ b/polish/gnugadu2/pkg-plist
@@ -1,36 +1,42 @@
 bin/gg
 share/gg/pixmaps/arrow.xpm
+share/gg/pixmaps/away-descr.xpm
+share/gg/pixmaps/away-mobile-descr.xpm
+share/gg/pixmaps/away-mobile.xpm
 share/gg/pixmaps/away.xpm
+share/gg/pixmaps/cell.xpm
 share/gg/pixmaps/cellphone.xpm
 share/gg/pixmaps/chat.xpm
 share/gg/pixmaps/config.xpm
+share/gg/pixmaps/empty.xpm
+share/gg/pixmaps/gg-logo.xpm
 share/gg/pixmaps/gg.xpm
+share/gg/pixmaps/go-chat.xpm
+share/gg/pixmaps/go-msg.xpm
 share/gg/pixmaps/ignored.xpm
+share/gg/pixmaps/invisible-descr.xpm
 share/gg/pixmaps/invisible.xpm
 share/gg/pixmaps/malehead.xpm
+share/gg/pixmaps/mobile.xpm
 share/gg/pixmaps/msg.xpm
+share/gg/pixmaps/new-msg.xpm
+share/gg/pixmaps/offline-descr.xpm
+share/gg/pixmaps/offline-mobile-descr.xpm
+share/gg/pixmaps/offline-mobile.xpm
 share/gg/pixmaps/offline.xpm
+share/gg/pixmaps/online-descr.xpm
+share/gg/pixmaps/online-mobile-descr.xpm
+share/gg/pixmaps/online-mobile.xpm
 share/gg/pixmaps/online.xpm
 share/gg/pixmaps/online_connecting.xpm
-share/gg/pixmaps/search.xpm
-share/gg/pixmaps/away-mobile.xpm
-share/gg/pixmaps/cell.xpm
-share/gg/pixmaps/gg-logo.xpm
-share/gg/pixmaps/go-chat.xpm
-share/gg/pixmaps/go-msg.xpm
-share/gg/pixmaps/mobile.xpm
-share/gg/pixmaps/offline-mobile.xpm
-share/gg/pixmaps/online-mobile.xpm
 share/gg/pixmaps/pubdir_info.xpm
+share/gg/pixmaps/search.xpm
 share/gg/pixmaps/search_unknown.xpm
 share/gg/pixmaps/wmexit.xpm
 share/gg/pixmaps/wmmsg.xpm
 share/gg/sounds/msg.wav
 share/gg/sounds/usr.wav
 share/gg/sounds/yahoo.wav
-@unexec rmdir %D/share/gnome/apps/Internet 2>/dev/null || true
-@unexec rmdir %D/share/gnome/apps 2>/dev/null || true
-@unexec rmdir %D/share/gnome 2>/dev/null || true
 @dirrm share/gg/sounds
 @dirrm share/gg/pixmaps
 @dirrm share/gg
diff --git a/polish/gnugadu2/scripts/configure.gg b/polish/gnugadu2/scripts/configure.gg
new file mode 100644
index 000000000000..2a1949ef5284
--- /dev/null
+++ b/polish/gnugadu2/scripts/configure.gg
@@ -0,0 +1,77 @@
+#!/bin/sh
+# $FreeBSD$
+
+if [ -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc ]; then
+	exit
+fi
+
+tempfile=`/usr/bin/mktemp -t checklist`
+
+if [ "${BATCH}" ]; then
+	if [ "${GNUGADU_OPTIONS}" ]; then
+		set ${GNUGADU_OPTIONS}
+	else
+		set \"esd\"
+	fi
+else
+	/usr/bin/dialog --title "configuration options" --clear \
+		--checklist "\n\
+Please select desired options:" -1 -1 16 \
+esd		"esd support" ON \
+arts		"arts support" OFF \
+gnome		"GNOME support" OFF \
+panel		"GNOME applet support" OFF \
+2> $tempfile
+
+	retval=$?
+
+	if [ -s $tempfile ]; then
+		set `cat $tempfile`
+	fi
+	rm -f $tempfile
+
+	case $retval in
+		0)	if [ -z "$*" ]; then
+				echo "Nothing selected"
+			fi
+			;;
+		1)	echo "Cancel pressed."
+			exit 1
+			;;
+	esac
+fi
+
+${MKDIR} ${WRKDIRPREFIX}${REALCURDIR}
+exec > ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
+
+while [ "$1" ]; do
+	case $1 in
+		\"esd\")
+			echo "USE_GNOME+=     esound"
+			echo "CONFIGURE_ARGS+=	--enable-esd"
+			esd="yes"
+			;;
+		\"arts\")
+			echo "CONFIGURE_ARGS+=	--enable-arts"
+			echo "LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts"
+ 			;;
+		\"gnome\")
+			echo "USE_GNOME+=	gnomelibs"
+			echo "CONFIGURE_ARGS+=	--enable-gnome"			
+			;;
+		\"panel\")
+			echo "USE_GNOME+=	gnomepanel"
+			echo "CONFIGURE_ARGS+=	--enable-panel"
+			;;
+		*)
+			echo "Invalid option(s): $1" >&2
+			rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
+			exit 1
+			;;
+	esac
+	shift
+done
+
+if [ -z "${esd}" ]; then
+	echo "CONFIGURE_ARGS+=	--disable-esd --without-esd"
+fi