4 files changed, 56 insertions, 21 deletions

diff --git a/deskutils/genius/Makefile b/deskutils/genius/Makefile
index 5081131a4780..fc862b0997bf 100644
--- a/deskutils/genius/Makefile
+++ b/deskutils/genius/Makefile
@@ -7,26 +7,29 @@
 
 PORTNAME=	genius
 PORTVERSION=	0.5.5
+PORTREVISION=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://ftp.5z.com/pub/genius/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Arbitrary precision calculator for Gnome Desktop Environment
 
-BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
-LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4 \
-		intl.4:${PORTSDIR}/devel/gettext \
-		popt.0:${PORTSDIR}/devel/popt
+LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
 
 USE_PERL5_BUILD=	yes
-USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix gnomehack gtk20 gconf2 libgnome libgnomeui vte
-USE_LIBTOOL=	yes
+USE_GNOME=	gnomeprefix gnomehack libgnomeui vte
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
+INSTALLS_SHLIB=	yes
+LDCONFIG_DIRS+=	%%PREFIX%%/lib/genius
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+.include <bsd.port.pre.mk>
 
-.include <bsd.port.mk>
+.if ${OSVERSION} < 500018
+BROKEN=		"Requires readline 4.2 or newer"
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/deskutils/genius/files/patch-ltmain.sh b/deskutils/genius/files/patch-ltmain.sh
new file mode 100644
index 000000000000..d311d361a2c1
--- /dev/null
+++ b/deskutils/genius/files/patch-ltmain.sh
@@ -0,0 +1,15 @@
+--- ltmain.sh.orig	Sat Apr 26 04:18:44 2003
++++ ltmain.sh	Wed Jun  4 01:37:42 2003
+@@ -4280,10 +4280,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/deskutils/genius/files/patch-src::calc.c b/deskutils/genius/files/patch-src::calc.c
new file mode 100644
index 000000000000..4c62ece4375f
--- /dev/null
+++ b/deskutils/genius/files/patch-src::calc.c
@@ -0,0 +1,20 @@
+--- src/calc.c.orig	Tue Jun  3 01:11:20 2003
++++ src/calc.c	Wed Jun  4 13:38:50 2003
+@@ -30,6 +30,8 @@
+ #include <signal.h>
+ #ifdef HAVE_WORDEXP
+ #include <wordexp.h>
++#else
++#include <glob.h>
+ #endif
+ #include <stdio.h>
+ #include <string.h>
+@@ -2402,7 +2404,7 @@
+ 		return NULL;
+ 	}
+ 	for (i = 0; i < gl.gl_pathc; i++) {
+-		list = g_slist_prepend (list, g_strdup (gl.gl_pathc[i]));
++		list = g_slist_prepend (list, g_strdup (gl.gl_pathv[i]));
+ 	}
+ 	globfree (&gl);
+ #endif
diff --git a/deskutils/genius/pkg-plist b/deskutils/genius/pkg-plist
index c8310bba38c3..c655895c73f7 100644
--- a/deskutils/genius/pkg-plist
+++ b/deskutils/genius/pkg-plist
@@ -15,12 +15,9 @@ include/genius/plug_api.h
 include/genius/structs.h
 include/genius/utype.h
 lib/genius/libtestplugin.a
-lib/genius/libtestplugin.la
 lib/genius/libtestplugin.so
 lib/genius/libtestplugin.so.0
 libexec/genius-readline-helper-fifo
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/gnome/applications/gnome-genius.desktop
 share/gnome/genius/gel/calculus/differentiation.gel
 share/gnome/genius/gel/calculus/integration.gel
@@ -60,14 +57,14 @@ share/locale/pl/LC_MESSAGES/genius.mo
 share/locale/pt/LC_MESSAGES/genius.mo
 share/locale/sv/LC_MESSAGES/genius.mo
 @dirrm share/gnome/genius/plugins
-@dirrm share/gnome/genius/gel/calculus
-@dirrm share/gnome/genius/gel/combinatorics
-@dirrm share/gnome/genius/gel/equation_solving
-@dirrm share/gnome/genius/gel/functions
-@dirrm share/gnome/genius/gel/linear_algebra
-@dirrm share/gnome/genius/gel/misc
-@dirrm share/gnome/genius/gel/number_theory
 @dirrm share/gnome/genius/gel/statistics
+@dirrm share/gnome/genius/gel/number_theory
+@dirrm share/gnome/genius/gel/misc
+@dirrm share/gnome/genius/gel/linear_algebra
+@dirrm share/gnome/genius/gel/functions
+@dirrm share/gnome/genius/gel/equation_solving
+@dirrm share/gnome/genius/gel/combinatorics
+@dirrm share/gnome/genius/gel/calculus
 @dirrm share/gnome/genius/gel
 @dirrm share/gnome/genius
 @dirrm lib/genius