Update to version 0.4.2 and use new gnome ports.

PR:             11844
Submitted by:   Jeremy Lea <reg@shale.csir.co.za>

3 files changed, 47 insertions, 26 deletions

diff --git a/deskutils/genius/Makefile b/deskutils/genius/Makefile
index 44172e29aba7..437af47cff14 100644
--- a/deskutils/genius/Makefile
+++ b/deskutils/genius/Makefile
@@ -1,43 +1,33 @@
 # New ports collection makefile for:	genius
-# Version required:			0.4.0
+# Version required:			0.4.2
 # Date created:				1 May 1999
 # Whom:					Andrey Zakhvatov
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/05/03 04:41:08 steve Exp $
 #
 
-DISTNAME=	genius-0.4.0
+DISTNAME=	genius-0.4.2
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://ftp.5z.com/pub/genius/
 
 MAINTAINER=	andy@icc.surw.chel.su
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
-		art_lgpl.1:${PORTSDIR}/x11/gnomelibs \
-		audiofile.0:${PORTSDIR}/audio/libaudiofile \
-		esd.1:${PORTSDIR}/audio/esound \
-		gdk_imlib.3:${PORTSDIR}/graphics/imlib \
-		gdk12.1:${PORTSDIR}/x11-toolkits/gtk12 \
-		gif.3:${PORTSDIR}/graphics/png \
-		glib12.1:${PORTSDIR}/devel/glib12 \
-		gmodule12.1:${PORTSDIR}/devel/glib12 \
-		gnome.1:${PORTSDIR}/x11/gnomelibs \
-		gnomesupport.1:${PORTSDIR}/x11/gnomelibs \
-		gnomeui.1:${PORTSDIR}/x11/gnomelibs \
-		gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \
-		intl.1:${PORTSDIR}/devel/gettext \
-		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		png.3:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff34
+BUILD_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
+RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
+
+GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
-		--with-gnome=${X11BASE}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		GLIB_CONFIG="${LOCALBASE}/bin/glib12-config" \
-		GTK_CONFIG="${X11BASE}/bin/gtk12-config"
+		--with-gnome=${PREFIX}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		GLIB_CONFIG="${GLIB_CONFIG}" \
+		GTK_CONFIG="${GTK_CONFIG}" \
+		LIBS="-L${LOCALBASE}/lib"
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/deskutils/genius/distinfo b/deskutils/genius/distinfo
index 64c1141456f5..57ab05e3bda4 100644
--- a/deskutils/genius/distinfo
+++ b/deskutils/genius/distinfo
@@ -1 +1 @@
-MD5 (genius-0.4.0.tar.gz) = 2bbf46f415cc9a59cd6e77183425cd80
+MD5 (genius-0.4.2.tar.gz) = 140bf41fbe1c087fe15727791a0b5574
diff --git a/deskutils/genius/files/patch-aa b/deskutils/genius/files/patch-aa
new file mode 100644
index 000000000000..668f07860f1d
--- /dev/null
+++ b/deskutils/genius/files/patch-aa
@@ -0,0 +1,31 @@
+--- configure.orig	Tue May 11 05:56:50 1999
++++ configure	Sat May 22 21:23:18 1999
+@@ -3354,7 +3354,7 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-  PTHREAD_LIB="-lc_r"
++  PTHREAD_LIB=""
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
+@@ -5556,15 +5556,15 @@
+ fi
+ 
+         
+-	USE_INCLUDED_LIBINTL=yes
++#	USE_INCLUDED_LIBINTL=yes
+         CATOBJEXT=.gmo
+         INSTOBJEXT=.mo
+         DATADIRNAME=share
+-	INTLDEPS='$(top_builddir)/intl/libintl.a'
++	INTLDEPS='-lintl'
+ 	INTLLIBS=$INTLDEPS
+ 	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+-        nls_cv_header_intl=intl/libintl.h
+-        nls_cv_header_libgt=intl/libgettext.h
++#        nls_cv_header_intl=intl/libintl.h
++#        nls_cv_header_libgt=intl/libgettext.h
+       fi
+ 
+             if test "$XGETTEXT" != ":"; then