4 files changed, 17 insertions, 39 deletions

diff --git a/x11/libfm-extra/Makefile b/x11/libfm-extra/Makefile
index f677604deeec..4693c7b0ed55 100644
--- a/x11/libfm-extra/Makefile
+++ b/x11/libfm-extra/Makefile
@@ -1,29 +1,26 @@
 # Created by: Kris Moore <kmoore@FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=	libfm-extra
-PORTVERSION=	1.2.3
-CATEGORIES=	x11
-MASTER_SITES=	SF/pcmanfm/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/LibFM/
-DISTNAME=	libfm-${PORTVERSION}
+PORTNAME=	libfm
+PORTREVISION=	1
+PKGNAMESUFFIX=	-extra
 
 MAINTAINER=	horia@racoviceanu.com
-COMMENT=	Core library of PCManFM file manager
+COMMENT=	LibFM-Extra library
 
 LICENSE=	LGPL21
 
-USES=		gmake libtool pathfix pkgconfig tar:xz gettext-tools
-USE_GNOME=	glib20 intltool intlhack
-USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-INSTALL_TARGET=	install-strip
+MASTERDIR=	${.CURDIR}/../${PORTNAME}
+
+DESCR=		${.CURDIR}/pkg-descr
+FILESDIR=	${.CURDIR}/files
+PATCHDIR=	${.CURDIR}/files
+PLIST=		${.CURDIR}/pkg-plist
 
-WRKSRC=	${WRKDIR}/libfm-${PORTVERSION}
+USE_LDCONFIG=	yes
 
-EXTRA_PATCHES+=	${.CURDIR}/../libfm/files/patch-configure
+EXTRA_ONLY=	yes
 
-CONFIGURE_ARGS=	--sysconfdir=${LOCALBASE}/etc --with-extra-only \
-	--disable-static \
-	--disable-nls
+OPTIONS_EXCLUDE=DOCS NLS
 
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/x11/libfm-extra/files/patch-src_Makefile.in b/x11/libfm-extra/files/patch-src_Makefile.in
deleted file mode 100644
index a3f40c1ec6ce..000000000000
--- a/x11/libfm-extra/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/Makefile.in.orig	2014-10-14 16:46:21 UTC
-+++ src/Makefile.in
-@@ -497,7 +497,7 @@ am__relativize = \
-   reldir="$$dir2"
- 
- # we use common include directory for all headers
--pkgincludedir = $(includedir)/@PACKAGE@-@FMLIBVER@
-+pkgincludedir = $(includedir)/@PACKAGE@
- ACLOCAL = @ACLOCAL@
- ACTIONS_SUBDIR = @ACTIONS_SUBDIR@
- ALL_LINGUAS = @ALL_LINGUAS@
-@@ -3079,7 +3079,6 @@ install-data-local:
- 		rm -rf "$(DESTDIR)$(includedir)/@PACKAGE@"; \
- 	fi
- 	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
--	@LN_S@ @PACKAGE@-@FMLIBVER@ "$(DESTDIR)$(includedir)/@PACKAGE@"
- 
- uninstall-local:
- 	@if test -L "$(DESTDIR)$(includedir)/@PACKAGE@"; then \
diff --git a/x11/libfm-extra/pkg-descr b/x11/libfm-extra/pkg-descr
index 925f8d9c8658..e5950859e9d2 100644
--- a/x11/libfm-extra/pkg-descr
+++ b/x11/libfm-extra/pkg-descr
@@ -1,3 +1,3 @@
-Library which provides the core functionality to PCManFM.
+libfm-extra library
 
 WWW: http://wiki.lxde.org/en/Libfm
diff --git a/x11/libfm-extra/pkg-plist b/x11/libfm-extra/pkg-plist
index 67a601d8392b..3e52b3f0419a 100644
--- a/x11/libfm-extra/pkg-plist
+++ b/x11/libfm-extra/pkg-plist
@@ -2,6 +2,6 @@ include/libfm/fm-extra.h
 include/libfm/fm-version.h
 include/libfm/fm-xml-file.h
 lib/libfm-extra.so
-lib/libfm-extra.so.4
-lib/libfm-extra.so.4.0.3
+lib/libfm-extra.so.%%ABI_VERSION%%
+lib/libfm-extra.so.%%ABI_VERSION%%.%%MICRO_VERSION%%
 libdata/pkgconfig/libfm-extra.pc