6 files changed, 186 insertions, 30 deletions

diff --git a/finance/gnucash-devel/Makefile b/finance/gnucash-devel/Makefile
index 5e31ffbada4c..e829f32a7517 100644
--- a/finance/gnucash-devel/Makefile
+++ b/finance/gnucash-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnucash
 PORTVERSION=	1.8.0
+PORTREVISION=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://www.gnucash.org/pub/gnucash/sources/stable/ \
 		ftp://ftp.gnucash.org/pub/gnucash/sources/stable/ \
@@ -48,7 +49,5 @@ MAN1=		gnc-prices.1 gnucash.1
 post-patch:
 	@${REINPLACE_CMD} -e 's^-l(pthread|c_r)^${PTHREAD_LIBS}^g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|LDFLAGS = -module|LDFLAGS = -module -avoid-version|g'
 
 .include <bsd.port.mk>
diff --git a/finance/gnucash-devel/files/patch-ltmain.sh b/finance/gnucash-devel/files/patch-ltmain.sh
index 1c2fba5d533f..64f959dd4d0a 100644
--- a/finance/gnucash-devel/files/patch-ltmain.sh
+++ b/finance/gnucash-devel/files/patch-ltmain.sh
@@ -27,16 +27,3 @@
  	  *)
  	    # Add libc to deplibs on all other systems if necessary.
  	    if test $build_libtool_need_lc = "yes"; then
-@@ -4286,10 +4297,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/finance/gnucash-devel/pkg-plist b/finance/gnucash-devel/pkg-plist
index ac72a5a74d31..f4962a5bf8dd 100644
--- a/finance/gnucash-devel/pkg-plist
+++ b/finance/gnucash-devel/pkg-plist
@@ -123,52 +123,144 @@ info/gnucash-design.info-1
 info/gnucash-design.info-2
 info/gnucash-design.info-3
 info/gnucash-design.info-4
+lib/gnucash/libgnc-business-ledger.la
 lib/gnucash/libgnc-business-ledger.so
+lib/gnucash/libgnc-business-ledger.so.0
+lib/gnucash/libgncmod-app-file.la
 lib/gnucash/libgncmod-app-file.so
+lib/gnucash/libgncmod-app-file.so.0
+lib/gnucash/libgncmod-app-utils.la
 lib/gnucash/libgncmod-app-utils.so
+lib/gnucash/libgncmod-app-utils.so.0
+lib/gnucash/libgncmod-backend-file.la
 lib/gnucash/libgncmod-backend-file.so
+lib/gnucash/libgncmod-backend-file.so.0
+lib/gnucash/libgncmod-binary-import.la
 lib/gnucash/libgncmod-binary-import.so
+lib/gnucash/libgncmod-binary-import.so.0
+lib/gnucash/libgncmod-business-backend-file.la
 lib/gnucash/libgncmod-business-backend-file.so
+lib/gnucash/libgncmod-business-backend-file.so.0
+lib/gnucash/libgncmod-business-core.la
 lib/gnucash/libgncmod-business-core.so
+lib/gnucash/libgncmod-business-core.so.0
+lib/gnucash/libgncmod-business-gnome.la
 lib/gnucash/libgncmod-business-gnome.so
+lib/gnucash/libgncmod-business-gnome.so.0
+lib/gnucash/libgncmod-business-utils.la
 lib/gnucash/libgncmod-business-utils.so
+lib/gnucash/libgncmod-business-utils.so.0
+lib/gnucash/libgncmod-calculation.la
 lib/gnucash/libgncmod-calculation.so
+lib/gnucash/libgncmod-calculation.so.0
+lib/gnucash/libgncmod-dialog-tax-table.la
 lib/gnucash/libgncmod-dialog-tax-table.so
+lib/gnucash/libgncmod-dialog-tax-table.so.0
+lib/gnucash/libgncmod-engine.la
 lib/gnucash/libgncmod-engine.so
+lib/gnucash/libgncmod-engine.so.0
+lib/gnucash/libgncmod-generic-import.la
 lib/gnucash/libgncmod-generic-import.so
+lib/gnucash/libgncmod-generic-import.so.0
+lib/gnucash/libgncmod-gnome-search.la
 lib/gnucash/libgncmod-gnome-search.so
+lib/gnucash/libgncmod-gnome-search.so.0
+lib/gnucash/libgncmod-gnome-utils.la
 lib/gnucash/libgncmod-gnome-utils.so
+lib/gnucash/libgncmod-gnome-utils.so.0
+lib/gnucash/libgncmod-ledger-core.la
 lib/gnucash/libgncmod-ledger-core.so
+lib/gnucash/libgncmod-ledger-core.so.0
+lib/gnucash/libgncmod-locale-reports-us.la
 lib/gnucash/libgncmod-locale-reports-us.so
+lib/gnucash/libgncmod-locale-reports-us.so.0
+lib/gnucash/libgncmod-network-utils.la
 lib/gnucash/libgncmod-network-utils.so
+lib/gnucash/libgncmod-network-utils.so.0
+lib/gnucash/libgncmod-qif-import.la
 lib/gnucash/libgncmod-qif-import.so
+lib/gnucash/libgncmod-qif-import.so.0
+lib/gnucash/libgncmod-register-core.la
 lib/gnucash/libgncmod-register-core.so
+lib/gnucash/libgncmod-register-core.so.0
+lib/gnucash/libgncmod-register-gnome.la
 lib/gnucash/libgncmod-register-gnome.so
+lib/gnucash/libgncmod-register-gnome.so.0
+lib/gnucash/libgncmod-report-gnome.la
 lib/gnucash/libgncmod-report-gnome.so
+lib/gnucash/libgncmod-report-gnome.so.0
+lib/gnucash/libgncmod-report-system.la
 lib/gnucash/libgncmod-report-system.so
+lib/gnucash/libgncmod-report-system.so.0
+lib/gnucash/libgncmod-standard-reports.la
 lib/gnucash/libgncmod-standard-reports.so
+lib/gnucash/libgncmod-standard-reports.so.0
+lib/gnucash/libgncmod-stylesheets.la
 lib/gnucash/libgncmod-stylesheets.so
+lib/gnucash/libgncmod-stylesheets.so.0
+lib/gnucash/libgncmod-tax-us.la
 lib/gnucash/libgncmod-tax-us.so
+lib/gnucash/libgncmod-tax-us.so.0
+lib/gnucash/libgncmod-utility-reports.la
 lib/gnucash/libgncmod-utility-reports.so
+lib/gnucash/libgncmod-utility-reports.so.0
+lib/gnucash/libgw-app-file.la
 lib/gnucash/libgw-app-file.so
+lib/gnucash/libgw-app-file.so.0
+lib/gnucash/libgw-app-utils.la
 lib/gnucash/libgw-app-utils.so
+lib/gnucash/libgw-app-utils.so.0
+lib/gnucash/libgw-binary-import.la
 lib/gnucash/libgw-binary-import.so
+lib/gnucash/libgw-binary-import.so.0
+lib/gnucash/libgw-business-core.la
 lib/gnucash/libgw-business-core.so
+lib/gnucash/libgw-business-core.so.0
+lib/gnucash/libgw-business-gnome.la
 lib/gnucash/libgw-business-gnome.so
+lib/gnucash/libgw-business-gnome.so.0
+lib/gnucash/libgw-dialog-tax-table.la
 lib/gnucash/libgw-dialog-tax-table.so
+lib/gnucash/libgw-dialog-tax-table.so.0
+lib/gnucash/libgw-engine.la
 lib/gnucash/libgw-engine.so
+lib/gnucash/libgw-engine.so.0
+lib/gnucash/libgw-gnc-module.la
 lib/gnucash/libgw-gnc-module.so
+lib/gnucash/libgw-gnc-module.so.0
+lib/gnucash/libgw-gnome-search.la
 lib/gnucash/libgw-gnome-search.so
+lib/gnucash/libgw-gnome-search.so.0
+lib/gnucash/libgw-gnome-utils.la
 lib/gnucash/libgw-gnome-utils.so
+lib/gnucash/libgw-gnome-utils.so.0
+lib/gnucash/libgw-kvp.la
 lib/gnucash/libgw-kvp.so
+lib/gnucash/libgw-kvp.so.0
+lib/gnucash/libgw-register-core.la
 lib/gnucash/libgw-register-core.so
+lib/gnucash/libgw-register-core.so.0
+lib/gnucash/libgw-report-gnome.la
 lib/gnucash/libgw-report-gnome.so
+lib/gnucash/libgw-report-gnome.so.0
+lib/libcore-utils.la
 lib/libcore-utils.so
+lib/libcore-utils.so.0
+lib/libgnc-app-file-gnome.la
 lib/libgnc-app-file-gnome.so
+lib/libgnc-app-file-gnome.so.0
+lib/libgncgnome.la
 lib/libgncgnome.so
+lib/libgncgnome.so.0
+lib/libgncmodule.la
 lib/libgncmodule.so
+lib/libgncmodule.so.0
+lib/libgw-core-utils.la
 lib/libgw-core-utils.so
+lib/libgw-core-utils.so.0
+lib/libgw-gnc.la
 lib/libgw-gnc.so
+lib/libgw-gnc.so.0
 libexec/gnucash/overrides/gnucash
 libexec/gnucash/overrides/gnucash-env
 libexec/gnucash/overrides/gnucash-make-guids
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 5e31ffbada4c..e829f32a7517 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnucash
 PORTVERSION=	1.8.0
+PORTREVISION=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://www.gnucash.org/pub/gnucash/sources/stable/ \
 		ftp://ftp.gnucash.org/pub/gnucash/sources/stable/ \
@@ -48,7 +49,5 @@ MAN1=		gnc-prices.1 gnucash.1
 post-patch:
 	@${REINPLACE_CMD} -e 's^-l(pthread|c_r)^${PTHREAD_LIBS}^g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|LDFLAGS = -module|LDFLAGS = -module -avoid-version|g'
 
 .include <bsd.port.mk>
diff --git a/finance/gnucash/files/patch-ltmain.sh b/finance/gnucash/files/patch-ltmain.sh
index 1c2fba5d533f..64f959dd4d0a 100644
--- a/finance/gnucash/files/patch-ltmain.sh
+++ b/finance/gnucash/files/patch-ltmain.sh
@@ -27,16 +27,3 @@
  	  *)
  	    # Add libc to deplibs on all other systems if necessary.
  	    if test $build_libtool_need_lc = "yes"; then
-@@ -4286,10 +4297,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/finance/gnucash/pkg-plist b/finance/gnucash/pkg-plist
index ac72a5a74d31..f4962a5bf8dd 100644
--- a/finance/gnucash/pkg-plist
+++ b/finance/gnucash/pkg-plist
@@ -123,52 +123,144 @@ info/gnucash-design.info-1
 info/gnucash-design.info-2
 info/gnucash-design.info-3
 info/gnucash-design.info-4
+lib/gnucash/libgnc-business-ledger.la
 lib/gnucash/libgnc-business-ledger.so
+lib/gnucash/libgnc-business-ledger.so.0
+lib/gnucash/libgncmod-app-file.la
 lib/gnucash/libgncmod-app-file.so
+lib/gnucash/libgncmod-app-file.so.0
+lib/gnucash/libgncmod-app-utils.la
 lib/gnucash/libgncmod-app-utils.so
+lib/gnucash/libgncmod-app-utils.so.0
+lib/gnucash/libgncmod-backend-file.la
 lib/gnucash/libgncmod-backend-file.so
+lib/gnucash/libgncmod-backend-file.so.0
+lib/gnucash/libgncmod-binary-import.la
 lib/gnucash/libgncmod-binary-import.so
+lib/gnucash/libgncmod-binary-import.so.0
+lib/gnucash/libgncmod-business-backend-file.la
 lib/gnucash/libgncmod-business-backend-file.so
+lib/gnucash/libgncmod-business-backend-file.so.0
+lib/gnucash/libgncmod-business-core.la
 lib/gnucash/libgncmod-business-core.so
+lib/gnucash/libgncmod-business-core.so.0
+lib/gnucash/libgncmod-business-gnome.la
 lib/gnucash/libgncmod-business-gnome.so
+lib/gnucash/libgncmod-business-gnome.so.0
+lib/gnucash/libgncmod-business-utils.la
 lib/gnucash/libgncmod-business-utils.so
+lib/gnucash/libgncmod-business-utils.so.0
+lib/gnucash/libgncmod-calculation.la
 lib/gnucash/libgncmod-calculation.so
+lib/gnucash/libgncmod-calculation.so.0
+lib/gnucash/libgncmod-dialog-tax-table.la
 lib/gnucash/libgncmod-dialog-tax-table.so
+lib/gnucash/libgncmod-dialog-tax-table.so.0
+lib/gnucash/libgncmod-engine.la
 lib/gnucash/libgncmod-engine.so
+lib/gnucash/libgncmod-engine.so.0
+lib/gnucash/libgncmod-generic-import.la
 lib/gnucash/libgncmod-generic-import.so
+lib/gnucash/libgncmod-generic-import.so.0
+lib/gnucash/libgncmod-gnome-search.la
 lib/gnucash/libgncmod-gnome-search.so
+lib/gnucash/libgncmod-gnome-search.so.0
+lib/gnucash/libgncmod-gnome-utils.la
 lib/gnucash/libgncmod-gnome-utils.so
+lib/gnucash/libgncmod-gnome-utils.so.0
+lib/gnucash/libgncmod-ledger-core.la
 lib/gnucash/libgncmod-ledger-core.so
+lib/gnucash/libgncmod-ledger-core.so.0
+lib/gnucash/libgncmod-locale-reports-us.la
 lib/gnucash/libgncmod-locale-reports-us.so
+lib/gnucash/libgncmod-locale-reports-us.so.0
+lib/gnucash/libgncmod-network-utils.la
 lib/gnucash/libgncmod-network-utils.so
+lib/gnucash/libgncmod-network-utils.so.0
+lib/gnucash/libgncmod-qif-import.la
 lib/gnucash/libgncmod-qif-import.so
+lib/gnucash/libgncmod-qif-import.so.0
+lib/gnucash/libgncmod-register-core.la
 lib/gnucash/libgncmod-register-core.so
+lib/gnucash/libgncmod-register-core.so.0
+lib/gnucash/libgncmod-register-gnome.la
 lib/gnucash/libgncmod-register-gnome.so
+lib/gnucash/libgncmod-register-gnome.so.0
+lib/gnucash/libgncmod-report-gnome.la
 lib/gnucash/libgncmod-report-gnome.so
+lib/gnucash/libgncmod-report-gnome.so.0
+lib/gnucash/libgncmod-report-system.la
 lib/gnucash/libgncmod-report-system.so
+lib/gnucash/libgncmod-report-system.so.0
+lib/gnucash/libgncmod-standard-reports.la
 lib/gnucash/libgncmod-standard-reports.so
+lib/gnucash/libgncmod-standard-reports.so.0
+lib/gnucash/libgncmod-stylesheets.la
 lib/gnucash/libgncmod-stylesheets.so
+lib/gnucash/libgncmod-stylesheets.so.0
+lib/gnucash/libgncmod-tax-us.la
 lib/gnucash/libgncmod-tax-us.so
+lib/gnucash/libgncmod-tax-us.so.0
+lib/gnucash/libgncmod-utility-reports.la
 lib/gnucash/libgncmod-utility-reports.so
+lib/gnucash/libgncmod-utility-reports.so.0
+lib/gnucash/libgw-app-file.la
 lib/gnucash/libgw-app-file.so
+lib/gnucash/libgw-app-file.so.0
+lib/gnucash/libgw-app-utils.la
 lib/gnucash/libgw-app-utils.so
+lib/gnucash/libgw-app-utils.so.0
+lib/gnucash/libgw-binary-import.la
 lib/gnucash/libgw-binary-import.so
+lib/gnucash/libgw-binary-import.so.0
+lib/gnucash/libgw-business-core.la
 lib/gnucash/libgw-business-core.so
+lib/gnucash/libgw-business-core.so.0
+lib/gnucash/libgw-business-gnome.la
 lib/gnucash/libgw-business-gnome.so
+lib/gnucash/libgw-business-gnome.so.0
+lib/gnucash/libgw-dialog-tax-table.la
 lib/gnucash/libgw-dialog-tax-table.so
+lib/gnucash/libgw-dialog-tax-table.so.0
+lib/gnucash/libgw-engine.la
 lib/gnucash/libgw-engine.so
+lib/gnucash/libgw-engine.so.0
+lib/gnucash/libgw-gnc-module.la
 lib/gnucash/libgw-gnc-module.so
+lib/gnucash/libgw-gnc-module.so.0
+lib/gnucash/libgw-gnome-search.la
 lib/gnucash/libgw-gnome-search.so
+lib/gnucash/libgw-gnome-search.so.0
+lib/gnucash/libgw-gnome-utils.la
 lib/gnucash/libgw-gnome-utils.so
+lib/gnucash/libgw-gnome-utils.so.0
+lib/gnucash/libgw-kvp.la
 lib/gnucash/libgw-kvp.so
+lib/gnucash/libgw-kvp.so.0
+lib/gnucash/libgw-register-core.la
 lib/gnucash/libgw-register-core.so
+lib/gnucash/libgw-register-core.so.0
+lib/gnucash/libgw-report-gnome.la
 lib/gnucash/libgw-report-gnome.so
+lib/gnucash/libgw-report-gnome.so.0
+lib/libcore-utils.la
 lib/libcore-utils.so
+lib/libcore-utils.so.0
+lib/libgnc-app-file-gnome.la
 lib/libgnc-app-file-gnome.so
+lib/libgnc-app-file-gnome.so.0
+lib/libgncgnome.la
 lib/libgncgnome.so
+lib/libgncgnome.so.0
+lib/libgncmodule.la
 lib/libgncmodule.so
+lib/libgncmodule.so.0
+lib/libgw-core-utils.la
 lib/libgw-core-utils.so
+lib/libgw-core-utils.so.0
+lib/libgw-gnc.la
 lib/libgw-gnc.so
+lib/libgw-gnc.so.0
 libexec/gnucash/overrides/gnucash
 libexec/gnucash/overrides/gnucash-env
 libexec/gnucash/overrides/gnucash-make-guids