upgrade to 0.5.5

5 files changed, 57 insertions, 33 deletions

diff --git a/deskutils/genius/Makefile b/deskutils/genius/Makefile
index 4e3b8acef1b9..5081131a4780 100644
--- a/deskutils/genius/Makefile
+++ b/deskutils/genius/Makefile
@@ -6,25 +6,27 @@
 #
 
 PORTNAME=	genius
-PORTVERSION=	0.4.6
+PORTVERSION=	0.5.5
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://ftp.5z.com/pub/genius/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Arbitrary precision calculator for Gnome Desktop Environment
 
-LIB_DEPENDS=	gmp.3:${PORTSDIR}/math/libgmp-freebsd
+BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
+LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4 \
+		intl.4:${PORTSDIR}/devel/gettext \
+		popt.0:${PORTSDIR}/devel/popt
 
+USE_PERL5_BUILD=	yes
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
-USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomelibs
+USE_GNOME=	gnomeprefix gnomehack gtk20 gconf2 libgnome libgnomeui vte
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/deskutils/genius/distinfo b/deskutils/genius/distinfo
index 2db2667430ca..2e5931ea0180 100644
--- a/deskutils/genius/distinfo
+++ b/deskutils/genius/distinfo
@@ -1 +1 @@
-MD5 (genius-0.4.6.tar.gz) = 19ea130f7620e3aacb78319924b3c0f0
+MD5 (genius-0.5.5.tar.gz) = ac3227f0cf8041df0efc7c26894e6e33
diff --git a/deskutils/genius/files/patch-aa b/deskutils/genius/files/patch-aa
deleted file mode 100644
index 91b0520385dc..000000000000
--- a/deskutils/genius/files/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
---- configure.orig	Tue May 11 05:56:50 1999
-+++ configure	Sat May 22 21:23:18 1999
-@@ -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
diff --git a/deskutils/genius/pkg-descr b/deskutils/genius/pkg-descr
index 61a0a4882251..b3e749ff0ba6 100644
--- a/deskutils/genius/pkg-descr
+++ b/deskutils/genius/pkg-descr
@@ -16,4 +16,4 @@ Features of Genius:
  * complex numbers
  * more ...
 
-WWW: http://www.5z.com/jirka/linux.html#genius
+WWW: http://www.5z.com/jirka/genius.html
diff --git a/deskutils/genius/pkg-plist b/deskutils/genius/pkg-plist
index 4780c733e1f9..c8310bba38c3 100644
--- a/deskutils/genius/pkg-plist
+++ b/deskutils/genius/pkg-plist
@@ -1,17 +1,53 @@
 bin/genius
 bin/gnome-genius
-include/genius/calc.h
+bin/loader.gel
+include/genius/compil.h
+include/genius/dict.h
 include/genius/eval.h
+include/genius/geloutput.h
+include/genius/lexer.h
+include/genius/matop.h
+include/genius/matrix.h
+include/genius/matrixw.h
+include/genius/mpwrap.h
+include/genius/mpzextra.h
 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/apps/Utilities/gnome-genius.desktop
-share/gnome/genius/gel/lib.gel
+share/gnome/applications/gnome-genius.desktop
+share/gnome/genius/gel/calculus/differentiation.gel
+share/gnome/genius/gel/calculus/integration.gel
+share/gnome/genius/gel/calculus/limits.gel
+share/gnome/genius/gel/calculus/sums_products.gel
+share/gnome/genius/gel/combinatorics/factorial.gel
+share/gnome/genius/gel/combinatorics/misc.gel
+share/gnome/genius/gel/combinatorics/recursive_sequences.gel
+share/gnome/genius/gel/equation_solving/find_root.gel
+share/gnome/genius/gel/functions/delta.gel
+share/gnome/genius/gel/functions/elementary.gel
+share/gnome/genius/gel/functions/numerical.gel
+share/gnome/genius/gel/functions/orthogonal_polynomials.gel
 share/gnome/genius/gel/lib.cgel
+share/gnome/genius/gel/linear_algebra/bilinear_forms.gel
+share/gnome/genius/gel/linear_algebra/linear_algebra.gel
+share/gnome/genius/gel/linear_algebra/misc.gel
+share/gnome/genius/gel/linear_algebra/special_matrices.gel
+share/gnome/genius/gel/linear_algebra/subspaces.gel
+share/gnome/genius/gel/misc/misc.gel
+share/gnome/genius/gel/number_theory/factoring.gel
+share/gnome/genius/gel/number_theory/misc.gel
+share/gnome/genius/gel/number_theory/modulus.gel
+share/gnome/genius/gel/number_theory/primes.gel
+share/gnome/genius/gel/number_theory/quadratic.gel
+share/gnome/genius/gel/statistics/basic.gel
+share/gnome/genius/manual.txt
 share/gnome/genius/plugins/test.plugin
 share/locale/cs/LC_MESSAGES/genius.mo
 share/locale/de/LC_MESSAGES/genius.mo
@@ -24,6 +60,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
 @dirrm share/gnome/genius
 @dirrm lib/genius