Update to 0.14.7.

Stagify.
Use new lib_depend syntax.
Add USES=libtool

5 files changed, 42 insertions, 40 deletions

diff --git a/science/gchemutils/Makefile b/science/gchemutils/Makefile
index 08db3af6c095..35629c531b0d 100644
--- a/science/gchemutils/Makefile
+++ b/science/gchemutils/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gchemutils
-PORTVERSION=	0.14.2
+PORTVERSION=	0.14.7
 CATEGORIES=	science
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTVERSION:R}
@@ -13,9 +13,9 @@ COMMENT=	C++ classes and Gtk3 widgets related to chemistry
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/bodr.pc:${PORTSDIR}/science/bodr \
 		${LOCALBASE}/libdata/pkgconfig/chemical-mime-data.pc:${PORTSDIR}/science/chemical-mime-data
-LIB_DEPENDS=	gtkglext-x11-1.0:${PORTSDIR}/x11-toolkits/gtkglext \
-		openbabel:${PORTSDIR}/science/openbabel \
-		goffice-0.10:${PORTSDIR}/devel/goffice010
+LIB_DEPENDS=	libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext \
+		libopenbabel.so:${PORTSDIR}/science/openbabel \
+		libgoffice-0.10.so:${PORTSDIR}/devel/goffice010
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/bodr.pc:${PORTSDIR}/science/bodr \
 		${LOCALBASE}/libdata/pkgconfig/chemical-mime-data.pc:${PORTSDIR}/science/chemical-mime-data
 
@@ -24,7 +24,8 @@ PORTSCOUT=	limitw:1,even
 USE_XZ=		yes
 USE_XORG=	x11
 USE_GNOME=	gnomedocutils gtk30 intlhack libgsf libxml2
-USES=		desktop-file-utils gettext pathfix shared-mime-info gmake pkgconfig
+USES=		desktop-file-utils gettext gmake libtool pathfix pkgconfig \
+		shared-mime-info
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -37,15 +38,13 @@ GLIB_SCHEMAS=	org.gnome.gchemutils.crystal.gschema.xml \
 		org.gnome.gchemutils.paint.gschema.xml \
 		org.gnome.gchemutils.paint.plugins.arrows.gschema.xml
 
-MAN1=		gchem3d.1 gchemcalc.1 gchempaint.1 gchemtable.1 gcrystal.1 \
-		gspectrum.1
+VER=		${PORTVERSION:R}
+PLIST_SUB=	VER=${VER} GOFFICE=0.10 VERSION=${PORTVERSION}
 
-PLIST_SUB=	VER=0.14 GOFFICE=0.10
-
-OPTIONS_DEFINE=	XUL
+OPTIONS_DEFINE=	GNUMERIC XUL
+GNUMERIC_DESC=	Build gnumeric plugin
 XUL_DESC=	Build browser plugin (requires libxul)
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MXUL}
@@ -58,7 +57,18 @@ CONFIGURE_ARGS+=--disable-mozilla-plugin
 PLIST_SUB+=	XUL="@comment "
 .endif
 
+.if ${PORT_OPTIONS:MGNUMERIC} || exists(${LOCALBASE}/lib/libspreadsheet.so)
+LIB_DEPENDS+=	libspreadsheet.so:${PORTSDIR}/math/gnumeric
+PLIST_SUB+=	GNUMERIC=""
+.else
+PLIST_SUB+=	GNUMERIC="@comment "
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-ldl||g' ${WRKSRC}/libs/gcp/Makefile.in
 
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.*
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*/*/*/*/*.so
+
 .include <bsd.port.mk>
diff --git a/science/gchemutils/distinfo b/science/gchemutils/distinfo
index 6abbcb7eff61..9656abe30372 100644
--- a/science/gchemutils/distinfo
+++ b/science/gchemutils/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome-chemistry-utils-0.14.2.tar.xz) = 85462b95b9d72e95b34ebaa0d07dc101595adf2159e480e3483ab8f440028dfe
-SIZE (gnome-chemistry-utils-0.14.2.tar.xz) = 5572856
+SHA256 (gnome-chemistry-utils-0.14.7.tar.xz) = 5679e20f5675adb8de58e8a537cbe9f4346f43188b1317edd8e6039ab68e94a3
+SIZE (gnome-chemistry-utils-0.14.7.tar.xz) = 5779532
diff --git a/science/gchemutils/files/patch-libs_gcu_application.cc b/science/gchemutils/files/patch-libs_gcu_application.cc
deleted file mode 100644
index 174845148580..000000000000
--- a/science/gchemutils/files/patch-libs_gcu_application.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- libs/gcu/application.cc.orig	2013-04-22 13:49:38.000000000 +0000
-+++ libs/gcu/application.cc	2013-04-22 13:49:53.000000000 +0000
-@@ -39,6 +39,7 @@
- #include <cstring>
- #include <clocale>
- #include <netinet/in.h>
-+#include <sys/socket.h>
- #include <sys/un.h>
- #include <unistd.h>
- #include <set>
diff --git a/science/gchemutils/files/patch-libs_gcugtk_spectrumdoc.cc b/science/gchemutils/files/patch-libs_gcugtk_spectrumdoc.cc
deleted file mode 100644
index 4ecd95070095..000000000000
--- a/science/gchemutils/files/patch-libs_gcugtk_spectrumdoc.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- libs/gcugtk/spectrumdoc.cc.orig	2013-12-03 20:54:28.000000000 +0100
-+++ libs/gcugtk/spectrumdoc.cc	2013-12-03 20:55:55.000000000 +0100
-@@ -1478,7 +1478,7 @@
- 			break;	// this should not occur, but a corrupted or bad file is always possible
- 		s.getline (line, 300);
- 		if (strstr (line, "##")) {
--			s.seekg (-strlen (line) -1, _S_cur);
-+			s.seekg (-strlen (line) -1, s.cur);
- 			if (read > npoints) {
- 				g_warning (_("Found too many data!"));
- 				// FIXME: throw an exception
diff --git a/science/gchemutils/pkg-plist b/science/gchemutils/pkg-plist
index 004b7df048e7..ca6b11de8109 100644
--- a/science/gchemutils/pkg-plist
+++ b/science/gchemutils/pkg-plist
@@ -44,25 +44,39 @@ lib/gchemutils/%%VER%%/plugins/paint/text.so
 lib/goffice/%%GOFFICE%%/plugins/gchemutils/gchemutils.la
 lib/goffice/%%GOFFICE%%/plugins/gchemutils/gchemutils.so
 lib/goffice/%%GOFFICE%%/plugins/gchemutils/plugin.xml
+%%GNUMERIC%%lib/gnumeric/1.12/plugins/gchemutils/plugin.la
+%%GNUMERIC%%lib/gnumeric/1.12/plugins/gchemutils/plugin.so
+%%GNUMERIC%%lib/gnumeric/1.12/plugins/gchemutils/plugin.xml
 lib/libgccv-%%VER%%.la
 lib/libgccv-%%VER%%.so
-lib/libgccv-%%VER%%.so.14
+lib/libgccv-%%VER%%.so.0
+lib/libgccv-%%VER%%.so.%%VERSION%%
 lib/libgcugtk-%%VER%%.la
 lib/libgcugtk-%%VER%%.so
-lib/libgcugtk-%%VER%%.so.14
+lib/libgcugtk-%%VER%%.so.0
+lib/libgcugtk-%%VER%%.so.%%VERSION%%
 lib/libgcp-%%VER%%.la
 lib/libgcp-%%VER%%.so
-lib/libgcp-%%VER%%.so.14
+lib/libgcp-%%VER%%.so.0
+lib/libgcp-%%VER%%.so.%%VERSION%%
 lib/libgcrystal-%%VER%%.la
 lib/libgcrystal-%%VER%%.so
-lib/libgcrystal-%%VER%%.so.14
+lib/libgcrystal-%%VER%%.so.0
+lib/libgcrystal-%%VER%%.so.%%VERSION%%
 lib/libgcu-%%VER%%.la
 lib/libgcu-%%VER%%.so
-lib/libgcu-%%VER%%.so.14
+lib/libgcu-%%VER%%.so.0
+lib/libgcu-%%VER%%.so.%%VERSION%%
 %%XUL%%lib/xulrunner/plugins/libmozgcu.la
 %%XUL%%lib/xulrunner/plugins/libmozgcu.so
 %%XUL%%libexec/chem-viewer
 libexec/babelserver
+man/man1/gchem3d.1.gz
+man/man1/gchemcalc.1.gz
+man/man1/gchempaint.1.gz
+man/man1/gchemtable.1.gz
+man/man1/gcrystal.1.gz
+man/man1/gspectrum.1.gz
 share/applications/gchem3d-%%VER%%.desktop
 share/applications/gchemcalc-%%VER%%.desktop
 share/applications/gcrystal-%%VER%%.desktop
@@ -355,7 +369,6 @@ share/mime/packages/gchemutils.xml
 @dirrm share/gnome/help/gchem3d-%%VER%%/C/figures
 @dirrm share/gnome/help/gchem3d-%%VER%%/C
 @dirrm share/gnome/help/gchem3d-%%VER%%
-@dirrmtry share/mime/chemical
 @dirrmtry share/mimelnk/application
 @dirrmtry share/mimelnk
 %%XUL%%@dirrmtry lib/xulrunner/plugins