svn commit: r393393 - in head/x11/libfm: . files

[Thomas Zander]

Author: riggs
Date: Sat Aug  1 10:15:50 2015
New Revision: 393393
URL: https://svnweb.freebsd.org/changeset/ports/393393

Log:
  - Convert x11/libfm and x11/libfm-extra to Master-Slave Port
    (same application, CATEGORIES, DISTFILES, install path)
  - Bump PORTREVISION
  - Add missing fm-actions header
  - Move patches to Makefile
  
  PR:		200824
  Submitted by:	horia at racoviceanu.com (maintainer)

Deleted:
  head/x11/libfm/files/
Modified:
  head/x11/libfm/Makefile
  head/x11/libfm/pkg-plist

Modified: head/x11/libfm/Makefile
==============================================================================
--- head/x11/libfm/Makefile	Sat Aug  1 10:09:19 2015	(r393392)
+++ head/x11/libfm/Makefile	Sat Aug  1 10:15:50 2015	(r393393)
@@ -3,45 +3,87 @@
 
 PORTNAME=	libfm
 PORTVERSION=	1.2.3
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	SF/pcmanfm/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/LibFM/
 
 MAINTAINER=	horia at racoviceanu.com
-COMMENT=	Core library of PCManFM file manager
+COMMENT?=	Core library of PCManFM file manager
 
 LICENSE=	LGPL21
 
+.if ! defined(EXTRA_ONLY)
 BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
 		valac:${PORTSDIR}/lang/vala
 LIB_DEPENDS=	libmenu-cache.so:${PORTSDIR}/x11/menu-cache \
 		libexif.so:${PORTSDIR}/graphics/libexif
+.endif
 
-USES=		desktop-file-utils gmake libtool pathfix pkgconfig \
-		shared-mime-info gettext-tools tar:xz
-USE_GNOME=	glib20 gtk20
+SLAVEDIRS=	${CATEGORIES}/${PORTNAME}-extra
+
+USES=		gettext-tools gmake libtool pathfix pkgconfig tar:xz
+USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--sysconfdir=${LOCALBASE}/etc --disable-static \
-	--with-gtk=2
+CONFIGURE_ARGS=	--sysconfdir=${LOCALBASE}/etc --disable-static
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
+.if ! defined(EXTRA_ONLY)
+USES+=		desktop-file-utils shared-mime-info
+USE_GNOME+=	gtk20
+CONFIGURE_ARGS+=--with-gtk=2
+.else
+USE_GNOME+=	intltool intlhack
+CONFIGURE_ARGS+=--with-extra-only
+.endif
+
+MICRO_VERSION=	0.3
+ABI_VERSION=	4
+PLIST_SUB+=	MICRO_VERSION=${MICRO_VERSION} \
+		ABI_VERSION=${ABI_VERSION}
+
 PORTDOCS=	AUTHORS NEWS README
 
 OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_SUB=	yes
+
 NLS_USES=	gettext-runtime
 NLS_CONFIGURE_ENABLE=	nls
-OPTIONS_SUB=	yes
 
 post-patch:
+	${REINPLACE_CMD} -e 's|^[[:blank:]]\{5,\}USE_NLS=yes|#&|' \
+		${WRKSRC}/configure
+
+	${REINPLACE_CMD} -e '/^pkgincludedir/s|- at FMLIBVER@||; \
+		/@LN_S@ @PACKAGE at -@FMLIBVER@/d' \
+		${WRKSRC}/src/Makefile.in
+
+.if ! defined(EXTRA_ONLY)
 	${REINPLACE_CMD} -e 's|DATA = libfm-extra.pc|DATA =|' \
 		${WRKSRC}/Makefile.in
 
+	${REINPLACE_CMD} -e '/^LIBFM_EXTRA_INCLUDES/,+4 s|^|@EXTRALIB_ONLY_TRUE@|; \
+		/FALSE at lib_LTLIBRARIES/s| libfm-extra.la||; \
+		s|libfm-extra.la \\|-lfm-extra \\|' \
+		${WRKSRC}/src/Makefile.in
+
+	${REINPLACE_CMD} -e 's|- at FMLIBVER@||' ${WRKSRC}/src/actions/Makefile.in
+
+	${REINPLACE_CMD} -e '/^vfs_menu_la_DEPENDENCIES/{s| \\||;n;d;}; \
+		/^vfs_menu_la_LIBADD/s|$$(top.*|-lfm-extra|' \
+		${WRKSRC}/src/modules/Makefile.in
+
 post-install:
-	${MV} ${STAGEDIR}${PREFIX}/etc/xdg/libfm/libfm.conf \
-		${STAGEDIR}${PREFIX}/etc/xdg/libfm/libfm.conf.sample
+	${MV} ${STAGEDIR}${PREFIX}/etc/xdg/${PORTNAME}/${PORTNAME}.conf \
+		${STAGEDIR}${PREFIX}/etc/xdg/${PORTNAME}/${PORTNAME}.conf.sample
+
+	${INSTALL_DATA} ${WRKSRC}/src/actions/fm-actions.h \
+		${STAGEDIR}${PREFIX}/include/${PORTNAME}
+
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>

Modified: head/x11/libfm/pkg-plist
==============================================================================
--- head/x11/libfm/pkg-plist	Sat Aug  1 10:09:19 2015	(r393392)
+++ head/x11/libfm/pkg-plist	Sat Aug  1 10:15:50 2015	(r393393)
@@ -1,6 +1,7 @@
 bin/libfm-pref-apps
 bin/lxshortcut
 @sample etc/xdg/libfm/libfm.conf.sample
+include/libfm/fm-actions.h
 include/libfm/fm-app-chooser-combo-box.h
 include/libfm/fm-app-chooser-dlg.h
 include/libfm/fm-app-info.h
@@ -67,11 +68,11 @@ include/libfm/fm-thumbnailer.h
 include/libfm/fm-utils.h
 include/libfm/fm.h
 lib/libfm-gtk.so
-lib/libfm-gtk.so.4
-lib/libfm-gtk.so.4.0.3
+lib/libfm-gtk.so.%%ABI_VERSION%%
+lib/libfm-gtk.so.%%ABI_VERSION%%.%%MICRO_VERSION%%
 lib/libfm.so
-lib/libfm.so.4
-lib/libfm.so.4.0.3
+lib/libfm.so.%%ABI_VERSION%%
+lib/libfm.so.%%ABI_VERSION%%.%%MICRO_VERSION%%
 lib/libfm/modules/gtk-fileprop-x-desktop.so
 lib/libfm/modules/gtk-fileprop-x-shortcut.so
 lib/libfm/modules/gtk-menu-actions.so