- Update from 1.2.0 to 1.2.1

- Add libtoolize:env to USE_AUTOTOOLS
- Add static libraries to Options, remove from default
- Add nls to CONFIGURE_ARGS
while here
- Use @sample in pkg-plist

PR:		ports/191589
Submitted by:	Horia Racoviceanu <horia@racoviceanu.com>

3 files changed, 15 insertions, 28 deletions

diff --git a/x11/libfm/Makefile b/x11/libfm/Makefile
index c98b1f45a3cb..8b1642497ca9 100644
--- a/x11/libfm/Makefile
+++ b/x11/libfm/Makefile
@@ -2,13 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	libfm
-PORTVERSION=	1.2.0
-PORTREVISION=	2
+PORTVERSION=	1.2.1
 CATEGORIES=	x11
 MASTER_SITES=	SF/pcmanfm/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/libfm%20%28required%20by%20PCManFM%29/
 
 MAINTAINER=	horia@racoviceanu.com
-COMMENT=	The libFM backend library to PCManFM
+COMMENT=	LibFM backend library to PCManFM
 
 LICENSE=	GPLv2
 
@@ -19,7 +18,7 @@ LIB_DEPENDS=	libmenu-cache.so:${PORTSDIR}/x11/menu-cache \
 
 USES=		desktop-file-utils fam gmake pkgconfig shared-mime-info tar:xz libtool
 USE_GNOME=	gtk20
-USE_AUTOTOOLS=	aclocal automake
+USE_AUTOTOOLS=	aclocal automake libtoolize:env
 CONFIGURE_ARGS+=--sysconfdir=${LOCALBASE}/etc
 MAKE_ENV=	INSTALL_STRIP_FLAG=${STRIP}
 USE_LDCONFIG=	yes
@@ -29,12 +28,12 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 PORTDOCS=	AUTHORS NEWS README
 
-OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_DEFINE=	DOCS NLS STATIC
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext
-
-.include <bsd.port.options.mk>
+NLS_CONFIGURE_ENABLE=		nls
+STATIC_CONFIGURE_ENABLE=	static
 
 PLIST_SUB+=	MAJORVER=1.0
 PLIST_SUB+=	VER=4
@@ -42,25 +41,15 @@ PLIST_SUB+=	VER=4
 post-patch:
 	@${REINPLACE_CMD} -e 's|-DG_DISABLE_DEPRECATED||' \
 		${WRKSRC}/src/Makefile.in
-	@${REINPLACE_CMD} -e \
-		's|-Wno-unused-but-set-variable||' \
-		${WRKSRC}/src/actions/Makefile.am \
-		${WRKSRC}/src/actions/Makefile.in
 	@${REINPLACE_CMD} -e '/^pkgconfigdir/s|$$(libdir)|$$(prefix)/libdata|; \
 		s|libfm-gtk3.pc||' \
 		${WRKSRC}/Makefile.am
 	@${REINPLACE_CMD} -e '/libfm.conf/ d' ${WRKSRC}/data/Makefile.am
 
-.if ! ${PORT_OPTIONS:MNLS}
-	@${REINPLACE_CMD} -e 's|src po|src|' \
-		${WRKSRC}/Makefile.am
-.endif
-
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/xdg/libfm
 	${INSTALL_DATA} ${WRKSRC}/data/libfm.conf \
 		${STAGEDIR}${PREFIX}/etc/xdg/libfm/libfm.conf.sample
-
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
diff --git a/x11/libfm/distinfo b/x11/libfm/distinfo
index 151a34931e6f..2df9ef00f5e0 100644
--- a/x11/libfm/distinfo
+++ b/x11/libfm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libfm-1.2.0.tar.xz) = f0513484e43dcc576097508b7d666f7eb72530963e5a21692034a7ea6a6efc22
-SIZE (libfm-1.2.0.tar.xz) = 890064
+SHA256 (libfm-1.2.1.tar.xz) = 15b33e9ebe18f745c74cb847605a53b0b5892572f8dcc940a8aecbaee07fdd06
+SIZE (libfm-1.2.1.tar.xz) = 893176
diff --git a/x11/libfm/pkg-plist b/x11/libfm/pkg-plist
index 5c67120c4be6..332d5cf544fe 100644
--- a/x11/libfm/pkg-plist
+++ b/x11/libfm/pkg-plist
@@ -1,8 +1,6 @@
 bin/libfm-pref-apps
 bin/lxshortcut
-@unexec if cmp -s %D/etc/xdg/libfm/libfm.conf %D/etc/xdg/libfm/libfm.conf.sample; then rm -f %D/etc/xdg/libfm/libfm.conf; fi
-etc/xdg/libfm/libfm.conf.sample
-@exec if [ ! -f %D/etc/xdg/libfm/libfm.conf ] ; then cp -p %D/%F %B/libfm.conf; fi
+@sample etc/xdg/libfm/libfm.conf.sample
 include/libfm
 include/libfm-%%MAJORVER%%/fm-actions.h
 include/libfm-%%MAJORVER%%/fm-app-chooser-combo-box.h
@@ -73,18 +71,18 @@ include/libfm-%%MAJORVER%%/fm-utils.h
 include/libfm-%%MAJORVER%%/fm-version.h
 include/libfm-%%MAJORVER%%/fm-xml-file.h
 include/libfm-%%MAJORVER%%/fm.h
-lib/libfm-extra.a
+%%STATIC%%lib/libfm-extra.a
 lib/libfm-extra.so
 lib/libfm-extra.so.%%VER%%
-lib/libfm-extra.so.%%VER%%.0.0
-lib/libfm-gtk.a
+lib/libfm-extra.so.%%VER%%.0.1
+%%STATIC%%lib/libfm-gtk.a
 lib/libfm-gtk.so
 lib/libfm-gtk.so.%%VER%%
-lib/libfm-gtk.so.%%VER%%.0.0
-lib/libfm.a
+lib/libfm-gtk.so.%%VER%%.0.1
+%%STATIC%%lib/libfm.a
 lib/libfm.so
 lib/libfm.so.%%VER%%
-lib/libfm.so.%%VER%%.0.0
+lib/libfm.so.%%VER%%.0.1
 lib/libfm/modules/gtk-fileprop-x-desktop.so
 lib/libfm/modules/gtk-fileprop-x-shortcut.so
 lib/libfm/modules/gtk-menu-actions.so