Attachment #157686 for bug #200824





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@racoviceanu.com
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

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
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 '/^pkgincludedir/s|-@FMLIBVER@||; \
		/@LN_S@ @PACKAGE@-@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@lib_LTLIBRARIES/s| libfm-extra.la||; \
		s|libfm-extra.la \\|-lfm-extra \\|' \
		${WRKSRC}/src/Makefile.in

	${REINPLACE_CMD} -e 's|-@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/${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>

Lines 1-11 Link Here

(-)files/patch-configure (-11 lines)
1	--- configure.orig 2014-10-14 16:46:23 UTC
2	+++ configure
3	@@ -14933,7 +14933,7 @@ $as_echo "#define HAVE_LC_MESSAGES 1" >>
4
5	fi
6	fi
7	- USE_NLS=yes
8	+# USE_NLS=yes
9
10
11	gt_cv_have_gettext=no




--- 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@
@@ -892,14 +892,14 @@ libfm_gtk_SOURCES = \
 @EXTRALIB_ONLY_FALSE@	gtk/fm-thumbnail.h \
 @EXTRALIB_ONLY_FALSE@	$(NULL)
 
-LIBFM_EXTRA_INCLUDES = \
-	fm-extra.h \
-	fm-version.h \
-	extra/fm-xml-file.h \
-	$(NULL)
+@EXTRALIB_ONLY_TRUE@LIBFM_EXTRA_INCLUDES = \
+@EXTRALIB_ONLY_TRUE@	fm-extra.h \
+@EXTRALIB_ONLY_TRUE@	fm-version.h \
+@EXTRALIB_ONLY_TRUE@	extra/fm-xml-file.h \
+@EXTRALIB_ONLY_TRUE@	$(NULL)
 
 EXTRA_LTLIBRARIES = libfm-gtk.la libfm-gtk3.la
-@EXTRALIB_ONLY_FALSE@lib_LTLIBRARIES = libfm-extra.la libfm.la @LIBFM_GTK_LTLIBRARIES@
+@EXTRALIB_ONLY_FALSE@lib_LTLIBRARIES = libfm.la @LIBFM_GTK_LTLIBRARIES@
 @EXTRALIB_ONLY_TRUE@lib_LTLIBRARIES = libfm-extra.la
 libfm_la_SOURCES = \
 	$(libfm_SOURCES) \
@@ -1042,7 +1042,7 @@ lxshortcut_LDADD = \
 @ENABLE_DEMO_TRUE@	$(GTK_LIBS) \
 @ENABLE_DEMO_TRUE@	$(INTLLIBS) \
 @ENABLE_DEMO_TRUE@	libfm.la \
-@ENABLE_DEMO_TRUE@	libfm-extra.la \
+@ENABLE_DEMO_TRUE@	-lfm-extra \
 @ENABLE_DEMO_TRUE@	@LIBFM_GTK_LTLIBRARIES@ \
 @ENABLE_DEMO_TRUE@	$(NULL)
 
@@ -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 \

Lines 1-11 Link Here

(-)files/patch-src_actions_Makefile.in (-11 lines)
1	--- src/actions/Makefile.in.orig 2014-10-14 16:46:21 UTC
2	+++ src/actions/Makefile.in
3	@@ -424,7 +424,7 @@ AM_VALAFLAGS = \
4	--header fm-actions.h \
5	$(NULL)
6
7	-libfmactionsincludedir = $(includedir)/@PACKAGE@-@FMLIBVER@
8	+libfmactionsincludedir = $(includedir)/@PACKAGE@
9	libfmactionsinclude_HEADERS = \
10	fm-actions.h \
11	$(NULL)




--- src/modules/Makefile.in.orig	2014-10-14 16:46:21 UTC
+++ src/modules/Makefile.in
@@ -172,8 +172,7 @@ gtk_menu_trash_la_LINK = $(LIBTOOL) $(AM
 	$(gtk_menu_trash_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
 	-o $@
 @ENABLE_GTK_TRUE@am_gtk_menu_trash_la_rpath = -rpath $(pkglibdir)
-vfs_menu_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(top_builddir)/src/libfm-extra.la
+vfs_menu_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 vfs_menu_la_SOURCES = vfs-menu.c
 vfs_menu_la_OBJECTS = vfs_menu_la-vfs-menu.lo
 vfs_menu_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -447,7 +446,7 @@ PLUGINS_INSTALLED = $(pkglib_LTLIBRARIES
 
 # module-specific parameters
 vfs_menu_la_CFLAGS = $(MENU_CACHE_CFLAGS) -I$(top_srcdir)/src/extra
-vfs_menu_la_LIBADD = $(MENU_CACHE_LIBS) $(top_builddir)/src/libfm-extra.la
+vfs_menu_la_LIBADD = $(MENU_CACHE_LIBS) -lfm-extra
 gtk_fileprop_x_desktop_la_CFLAGS = $(GTK_CFLAGS) -I$(top_srcdir)/src/gtk
 gtk_fileprop_x_desktop_la_LIBADD = $(GTK_LIBS)
 gtk_fileprop_x_shortcut_la_CFLAGS = $(GTK_CFLAGS) -I$(top_srcdir)/src/gtk




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

include/libfm/fm-utils.h
include/libfm/fm.h
lib/libfm-gtk.so
lib/libfm-gtk.so.%%ABI_VERSION%%
lib/libfm-gtk.so.%%ABI_VERSION%%.%%MICRO_VERSION%%
lib/libfm.so
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

Return to bug 200824

Lines 3-47 Link Here

(-)Makefile (-9 / +48 lines)
3		3
4	PORTNAME= libfm	4	PORTNAME= libfm
5	PORTVERSION= 1.2.3	5	PORTVERSION= 1.2.3
		6	PORTREVISION= 1
6	CATEGORIES= x11	7	CATEGORIES= x11
7	MASTER_SITES= SF/pcmanfm/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/LibFM/	8	MASTER_SITES= SF/pcmanfm/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/LibFM/
8		9
9	MAINTAINER= horia@racoviceanu.com	10	MAINTAINER= horia@racoviceanu.com
10	COMMENT= Core library of PCManFM file manager	11	COMMENT?= Core library of PCManFM file manager
11		12
12	LICENSE= LGPL21	13	LICENSE= LGPL21
13		14
		15	.if ! defined(EXTRA_ONLY)
14	BUILD_DEPENDS= p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \	16	BUILD_DEPENDS= p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
15	valac:${PORTSDIR}/lang/vala	17	valac:${PORTSDIR}/lang/vala
16	LIB_DEPENDS= libmenu-cache.so:${PORTSDIR}/x11/menu-cache \	18	LIB_DEPENDS= libmenu-cache.so:${PORTSDIR}/x11/menu-cache \
17	libexif.so:${PORTSDIR}/graphics/libexif	19	libexif.so:${PORTSDIR}/graphics/libexif
		20	.endif
18		21
19	USES= desktop-file-utils gmake libtool pathfix pkgconfig \	22	SLAVEDIRS= ${CATEGORIES}/${PORTNAME}-extra
20	shared-mime-info gettext-tools tar:xz	23
21	USE_GNOME= glib20 gtk20	24	USES= gettext-tools gmake libtool pathfix pkgconfig tar:xz
		25	USE_GNOME= glib20
22	USE_LDCONFIG= yes	26	USE_LDCONFIG= yes
23	GNU_CONFIGURE= yes	27	GNU_CONFIGURE= yes
24	CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc --disable-static \	28	CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc --disable-static
25	--with-gtk=2
26	CPPFLAGS+= -I${LOCALBASE}/include	29	CPPFLAGS+= -I${LOCALBASE}/include
27	LIBS+= -L${LOCALBASE}/lib	30	LIBS+= -L${LOCALBASE}/lib
28	INSTALL_TARGET= install-strip	31	INSTALL_TARGET= install-strip
29		32
		33	.if ! defined(EXTRA_ONLY)
		34	USES+= desktop-file-utils shared-mime-info
		35	USE_GNOME+= gtk20
		36	CONFIGURE_ARGS+=--with-gtk=2
		37	.else
		38	USE_GNOME+= intltool intlhack
		39	CONFIGURE_ARGS+=--with-extra-only
		40	.endif
		41
		42	MICRO_VERSION= 0.3
		43	ABI_VERSION= 4
		44	PLIST_SUB+= MICRO_VERSION=${MICRO_VERSION} \
		45	ABI_VERSION=${ABI_VERSION}
		46
30	PORTDOCS= AUTHORS NEWS README	47	PORTDOCS= AUTHORS NEWS README
31		48
32	OPTIONS_DEFINE= DOCS NLS	49	OPTIONS_DEFINE= DOCS NLS
		50	OPTIONS_SUB= yes
		51
33	NLS_USES= gettext-runtime	52	NLS_USES= gettext-runtime
34	NLS_CONFIGURE_ENABLE= nls	53	NLS_CONFIGURE_ENABLE= nls
35	OPTIONS_SUB= yes
36		54
37	post-patch:	55	post-patch:
		56	${REINPLACE_CMD} -e '/^pkgincludedir/s\|-@FMLIBVER@\|\|; \
		57	/@LN_S@ @PACKAGE@-@FMLIBVER@/d' \
		58	${WRKSRC}/src/Makefile.in
		59
		60	.if ! defined(EXTRA_ONLY)
38	${REINPLACE_CMD} -e 's\|DATA = libfm-extra.pc\|DATA =\|' \	61	${REINPLACE_CMD} -e 's\|DATA = libfm-extra.pc\|DATA =\|' \
39	${WRKSRC}/Makefile.in	62	${WRKSRC}/Makefile.in
40		63
		64	${REINPLACE_CMD} -e '/^LIBFM_EXTRA_INCLUDES/,+4 s\|^\|@EXTRALIB_ONLY_TRUE@\|; \
		65	/FALSE@lib_LTLIBRARIES/s\| libfm-extra.la\|\|; \
		66	s\|libfm-extra.la \\\|-lfm-extra \\\|' \
		67	${WRKSRC}/src/Makefile.in
		68
		69	${REINPLACE_CMD} -e 's\|-@FMLIBVER@\|\|' ${WRKSRC}/src/actions/Makefile.in
		70
		71	${REINPLACE_CMD} -e '/^vfs_menu_la_DEPENDENCIES/{s\| \\\|\|;n;d;}; \
		72	/^vfs_menu_la_LIBADD/s\|$$(top.*\|-lfm-extra\|' \
		73	${WRKSRC}/src/modules/Makefile.in
		74
41	post-install:	75	post-install:
42	${MV} ${STAGEDIR}${PREFIX}/etc/xdg/libfm/libfm.conf \	76	${MV} ${STAGEDIR}${PREFIX}/etc/xdg/${PORTNAME}/${PORTNAME}.conf \
43	${STAGEDIR}${PREFIX}/etc/xdg/libfm/libfm.conf.sample	77	${STAGEDIR}${PREFIX}/etc/xdg/${PORTNAME}/${PORTNAME}.conf.sample
		78
		79	${INSTALL_DATA} ${WRKSRC}/src/actions/fm-actions.h \
		80	${STAGEDIR}${PREFIX}/include/${PORTNAME}
		81
44	@${MKDIR} ${STAGEDIR}${DOCSDIR}	82	@${MKDIR} ${STAGEDIR}${DOCSDIR}
45	${INSTALL_DATA} ${PORTDOCS:S\|^\|${WRKSRC}/\|} ${STAGEDIR}${DOCSDIR}	83	${INSTALL_DATA} ${PORTDOCS:S\|^\|${WRKSRC}/\|} ${STAGEDIR}${DOCSDIR}
		84	.endif
46		85
47	.include <bsd.port.mk>	86	.include <bsd.port.mk>

Lines 1-49 Link Here

(-)files/patch-src_Makefile.in (-49 lines)
1	--- src/Makefile.in.orig 2014-10-14 16:46:21 UTC
2	+++ src/Makefile.in
3	@@ -497,7 +497,7 @@ am__relativize = \
4	reldir="$$dir2"
5
6	# we use common include directory for all headers
7	-pkgincludedir = $(includedir)/@PACKAGE@-@FMLIBVER@
8	+pkgincludedir = $(includedir)/@PACKAGE@
9	ACLOCAL = @ACLOCAL@
10	ACTIONS_SUBDIR = @ACTIONS_SUBDIR@
11	ALL_LINGUAS = @ALL_LINGUAS@
12	@@ -892,14 +892,14 @@ libfm_gtk_SOURCES = \
13	@EXTRALIB_ONLY_FALSE@ gtk/fm-thumbnail.h \
14	@EXTRALIB_ONLY_FALSE@ $(NULL)
15
16	-LIBFM_EXTRA_INCLUDES = \
17	- fm-extra.h \
18	- fm-version.h \
19	- extra/fm-xml-file.h \
20	- $(NULL)
21	+@EXTRALIB_ONLY_TRUE@LIBFM_EXTRA_INCLUDES = \
22	+@EXTRALIB_ONLY_TRUE@ fm-extra.h \
23	+@EXTRALIB_ONLY_TRUE@ fm-version.h \
24	+@EXTRALIB_ONLY_TRUE@ extra/fm-xml-file.h \
25	+@EXTRALIB_ONLY_TRUE@ $(NULL)
26
27	EXTRA_LTLIBRARIES = libfm-gtk.la libfm-gtk3.la
28	-@EXTRALIB_ONLY_FALSE@lib_LTLIBRARIES = libfm-extra.la libfm.la @LIBFM_GTK_LTLIBRARIES@
29	+@EXTRALIB_ONLY_FALSE@lib_LTLIBRARIES = libfm.la @LIBFM_GTK_LTLIBRARIES@
30	@EXTRALIB_ONLY_TRUE@lib_LTLIBRARIES = libfm-extra.la
31	libfm_la_SOURCES = \
32	$(libfm_SOURCES) \
33	@@ -1042,7 +1042,7 @@ lxshortcut_LDADD = \
34	@ENABLE_DEMO_TRUE@ $(GTK_LIBS) \
35	@ENABLE_DEMO_TRUE@ $(INTLLIBS) \
36	@ENABLE_DEMO_TRUE@ libfm.la \
37	-@ENABLE_DEMO_TRUE@ libfm-extra.la \
38	+@ENABLE_DEMO_TRUE@ -lfm-extra \
39	@ENABLE_DEMO_TRUE@ @LIBFM_GTK_LTLIBRARIES@ \
40	@ENABLE_DEMO_TRUE@ $(NULL)
41
42	@@ -3079,7 +3079,6 @@ install-data-local:
43	rm -rf "$(DESTDIR)$(includedir)/@PACKAGE@"; \
44	fi
45	test -z "$(includedir)" \|\| $(MKDIR_P) "$(DESTDIR)$(includedir)"
46	- @LN_S@ @PACKAGE@-@FMLIBVER@ "$(DESTDIR)$(includedir)/@PACKAGE@"
47
48	uninstall-local:
49	@if test -L "$(DESTDIR)$(includedir)/@PACKAGE@"; then \

Lines 1-21 Link Here

(-)files/patch-src_modules_Makefile.in (-21 lines)
1	--- src/modules/Makefile.in.orig 2014-10-14 16:46:21 UTC
2	+++ src/modules/Makefile.in
3	@@ -172,8 +172,7 @@ gtk_menu_trash_la_LINK = $(LIBTOOL) $(AM
4	$(gtk_menu_trash_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
5	-o $@
6	@ENABLE_GTK_TRUE@am_gtk_menu_trash_la_rpath = -rpath $(pkglibdir)
7	-vfs_menu_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
8	- $(top_builddir)/src/libfm-extra.la
9	+vfs_menu_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
10	vfs_menu_la_SOURCES = vfs-menu.c
11	vfs_menu_la_OBJECTS = vfs_menu_la-vfs-menu.lo
12	vfs_menu_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
13	@@ -447,7 +446,7 @@ PLUGINS_INSTALLED = $(pkglib_LTLIBRARIES
14
15	# module-specific parameters
16	vfs_menu_la_CFLAGS = $(MENU_CACHE_CFLAGS) -I$(top_srcdir)/src/extra
17	-vfs_menu_la_LIBADD = $(MENU_CACHE_LIBS) $(top_builddir)/src/libfm-extra.la
18	+vfs_menu_la_LIBADD = $(MENU_CACHE_LIBS) -lfm-extra
19	gtk_fileprop_x_desktop_la_CFLAGS = $(GTK_CFLAGS) -I$(top_srcdir)/src/gtk
20	gtk_fileprop_x_desktop_la_LIBADD = $(GTK_LIBS)
21	gtk_fileprop_x_shortcut_la_CFLAGS = $(GTK_CFLAGS) -I$(top_srcdir)/src/gtk

Lines 1-6 Link Here

(-)pkg-plist (-4 / +5 lines)
1	bin/libfm-pref-apps	1	bin/libfm-pref-apps
2	bin/lxshortcut	2	bin/lxshortcut
3	@sample etc/xdg/libfm/libfm.conf.sample	3	@sample etc/xdg/libfm/libfm.conf.sample
		4	include/libfm/fm-actions.h
4	include/libfm/fm-app-chooser-combo-box.h	5	include/libfm/fm-app-chooser-combo-box.h
5	include/libfm/fm-app-chooser-dlg.h	6	include/libfm/fm-app-chooser-dlg.h
6	include/libfm/fm-app-info.h	7	include/libfm/fm-app-info.h
Lines 67-77 Link Here
67	include/libfm/fm-utils.h	68	include/libfm/fm-utils.h
68	include/libfm/fm.h	69	include/libfm/fm.h
69	lib/libfm-gtk.so	70	lib/libfm-gtk.so
70	lib/libfm-gtk.so.4	71	lib/libfm-gtk.so.%%ABI_VERSION%%
71	lib/libfm-gtk.so.4.0.3	72	lib/libfm-gtk.so.%%ABI_VERSION%%.%%MICRO_VERSION%%
72	lib/libfm.so	73	lib/libfm.so
73	lib/libfm.so.4	74	lib/libfm.so.%%ABI_VERSION%%
74	lib/libfm.so.4.0.3	75	lib/libfm.so.%%ABI_VERSION%%.%%MICRO_VERSION%%
75	lib/libfm/modules/gtk-fileprop-x-desktop.so	76	lib/libfm/modules/gtk-fileprop-x-desktop.so
76	lib/libfm/modules/gtk-fileprop-x-shortcut.so	77	lib/libfm/modules/gtk-fileprop-x-shortcut.so
77	lib/libfm/modules/gtk-menu-actions.so	78	lib/libfm/modules/gtk-menu-actions.so