From 766637c905aeaa3a5ced007b78364ac5b8cfe6f7 Mon Sep 17 00:00:00 2001
From: Guido Falsi <madpilot@FreeBSD.org>
Date: Fri, 18 Jul 2014 14:03:05 +0000
Subject: [PATCH] - Strip binaries - Convert to USES=libtool

PR:		191370
Submitted by:	tkato432@yahoo.com
---
 deskutils/gnotime/Makefile  | 16 ++++++++++++----
 deskutils/gnotime/pkg-plist |  6 +++---
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/deskutils/gnotime/Makefile b/deskutils/gnotime/Makefile
index 2558610e2a23..49f58a7d692e 100644
--- a/deskutils/gnotime/Makefile
+++ b/deskutils/gnotime/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gnotime
 PORTVERSION=	2.4.1
+PORTREVISION=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	SF/gttr/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
 		SF/qof/qof/${QOF_VERSION}:qof
@@ -16,16 +17,18 @@ LICENSE=	GPLv2 # (or later)
 
 LIB_DEPENDS=	libguile.so:${PORTSDIR}/lang/guile
 
-USES=		gettext gmake pathfix pkgconfig
+USES=		gettext gmake libtool pathfix pkgconfig
 USE_XORG=	xscrnsaver
 USE_GNOME=	gnomeprefix gtkhtml3 intlhack libgnomeui
-USE_AUTOTOOLS=	libtool libltdl
+USE_AUTOTOOLS=	libtoolize libltdl
+GNU_CONFIGURE=	yes
 LIBTOOLFILES=	configure ../${QOF_DISTNAME}/configure
 CONFIGURE_ENV=	GUILE_CFLAGS="$$(guile-config compile)" \
 		GUILE_LIBS="$$(guile-config link)" \
 		LIBQOF_CFLAGS="${LIBQOF_CFLAGS}" \
 		LIBQOF_LIBS="${LIBQOF_LIBS}"
 CONFIGURE_ARGS=	--disable-silent-rules
+INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 INSTALLS_OMF=	yes
 
@@ -41,6 +44,9 @@ LIBQOF_CFLAGS=	-I${QOF_WRKSRC}/qof
 LIBQOF_LIBS=	-L${QOF_WRKSRC}/qof/.libs -lqof
 
 post-patch:
+	@${REINPLACE_CMD} -e \
+		'/^install-data-am/s|install-data-local||' \
+		${WRKSRC}/gconf/Makefile.in
 	@${REINPLACE_CMD} -e \
 		'/^AM_CFLAGS =/s|-g||' ${WRKSRC}/src/Makefile.in
 	@${REINPLACE_CMD} -e \
@@ -63,11 +69,13 @@ pre-configure:
 		--disable-sqlite --disable-gdasql)
 
 pre-build:
-	@(cd ${QOF_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
+	(cd ${QOF_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
 		${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
+	${FIND} ${QOF_WRKSRC} -type f -name '*.la' | \
+		${XARGS} ${GREP} -l 'libtool library' | ${XARGS} ${RM}
 
 pre-install:
-	@(cd ${QOF_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
+	(cd ${QOF_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
 		${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
 
 .include <bsd.port.mk>
diff --git a/deskutils/gnotime/pkg-plist b/deskutils/gnotime/pkg-plist
index 0dbcf6e7d7e6..be00c4ca6849 100644
--- a/deskutils/gnotime/pkg-plist
+++ b/deskutils/gnotime/pkg-plist
@@ -37,17 +37,17 @@ include/qof/qofundo.h
 include/qof/qofutil.h
 include/qof/sql_parser.h
 lib/libqof-backend-qsf.a
-lib/libqof-backend-qsf.la
 lib/libqof-backend-qsf.so
 lib/libqof-backend-qsf.so.0
+lib/libqof-backend-qsf.so.0.0.7
 lib/libqof.a
-lib/libqof.la
 lib/libqof.so
 lib/libqof.so.1
+lib/libqof.so.1.0.10
 lib/libqofsql.a
-lib/libqofsql.la
 lib/libqofsql.so
 lib/libqofsql.so.1
+lib/libqofsql.so.1.0.1
 libdata/pkgconfig/qof-1.pc
 libdata/pkgconfig/qof.pc
 man/man1/gnotime-remote.1.gz