Attachment #200850 for bug #229944

Lines 14-20 Link Here

(-)graphics/lximage-qt/Makefile (-1 / +1 lines)
14		14
15	LIB_DEPENDS= libexif.so:graphics/libexif \	15	LIB_DEPENDS= libexif.so:graphics/libexif \
16	libmenu-cache.so:x11/menu-cache \	16	libmenu-cache.so:x11/menu-cache \
17	libfm.so:x11/libfm	17	libfm.so:x11/libfm@gtk2
18		18
19	USES= cmake compiler:c++11-lib desktop-file-utils gettext-runtime \	19	USES= cmake compiler:c++11-lib desktop-file-utils gettext-runtime \
20	localbase:ldflags lxqt pkgconfig qt:5 tar:xz	20	localbase:ldflags lxqt pkgconfig qt:5 tar:xz

Lines 13-19 Link Here

(-)sysutils/lxqt-qtplugin/Makefile (-1 / +1 lines)
13	LICENSE= LGPL21+	13	LICENSE= LGPL21+
14		14
15	LIB_DEPENDS= libdbusmenu-qt5.so:devel/libdbusmenu-qt@qt5 \	15	LIB_DEPENDS= libdbusmenu-qt5.so:devel/libdbusmenu-qt@qt5 \
16	libfm.so:x11/libfm \	16	libfm.so:x11/libfm@gtk2 \
17	libmenu-cache.so:x11/menu-cache \	17	libmenu-cache.so:x11/menu-cache \
18	libexif.so:graphics/libexif	18	libexif.so:graphics/libexif
19		19

Lines 13-19 Link Here

(-)x11-fm/pcmanfm-qt/Makefile (-1 / +1 lines)
13	LICENSE= GPLv2	13	LICENSE= GPLv2
14		14
15	LIB_DEPENDS= libmenu-cache.so:x11/menu-cache \	15	LIB_DEPENDS= libmenu-cache.so:x11/menu-cache \
16	libfm.so:x11/libfm \	16	libfm.so:x11/libfm@gtk2 \
17	libexif.so:graphics/libexif	17	libexif.so:graphics/libexif
18		18
19	USES= cmake compiler:c++11-lib desktop-file-utils \	19	USES= cmake compiler:c++11-lib desktop-file-utils \




# $FreeBSD$

PORTNAME=	pcmanfm
PORTVERSION=	1.3.1
CATEGORIES=	x11-fm
MASTER_SITES=	SF/${PORTNAME}/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/PCManFM/



LICENSE=	GPLv2

LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
		libfontconfig.so:x11-fonts/fontconfig \
		libfreetype.so:print/freetype2

FLAVORS=	gtk2 gtk3
FLAVOR?=	${FLAVORS:[1]}

gtk3_PKGNAMESUFFIX=	-gtk3

gtk2_LIB_DEPENDS=	libfm-gtk.so:x11/libfm@gtk2
gtk3_LIB_DEPENDS=	libfm-gtk3.so:x11/libfm@gtk3

gtk2_CONFLICTS_INSTALL=	pcmanfm-gtk3
gtk3_CONFLICTS_INSTALL=	pcmanfm

USES=		desktop-file-utils gmake gnome gettext libtool localbase \
		pkgconfig tar:xz
USE_GNOME=	cairo gdkpixbuf2 intltool
USE_XORG=	x11
GNU_CONFIGURE=	yes
USE_GNOME=	glib20 gtk20 cairo pango gdkpixbuf2 intltool intlhack
USE_XORG=	x11

.if ${FLAVOR:Mgtk2}
USE_GNOME+=	gtk20
CONFIGURE_ARGS=	--with-gtk=2
.elif ${FLAVOR:Mgtk3}
USE_GNOME+=	gtk30
CONFIGURE_ARGS=	--with-gtk=3
.endif

OPTIONS_DEFINE=	NLS
OPTIONS_SUB=	yes

NLS_USES=	gettext-tools:build
NLS_CONFIGURE_ENABLE=	nls
NLS_USES_OFF=	gettext-tools

post-extract:
	@${MV} ${WRKSRC}/data/pcmanfm.conf \
		${WRKSRC}/data/pcmanfm.conf.sample

post-patch:

Lines 1-3 Link Here

(-)x11-fm/pcmanfm/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1482343112	1	TIMESTAMP = 1545853766
2	SHA256 (pcmanfm-1.2.5.tar.xz) = 0c86cac028b705ff314c7464d814c2cf7ff604c17491c20aa204b1ef1a80ad67	2	SHA256 (pcmanfm-1.3.1.tar.xz) = 6804043b3ee3a703edde41c724946174b505fe958703eadbd7e0876ece836855
3	SIZE (pcmanfm-1.2.5.tar.xz) = 417808	3	SIZE (pcmanfm-1.3.1.tar.xz) = 423380

Lines 3-7 Link Here

(-)x11/libfm-extra/pkg-plist (-1 / +1 lines)
3	include/libfm/fm-xml-file.h	3	include/libfm/fm-xml-file.h
4	lib/libfm-extra.so	4	lib/libfm-extra.so
5	lib/libfm-extra.so.4	5	lib/libfm-extra.so.4
6	lib/libfm-extra.so.4.0.5	6	lib/libfm-extra.so.4.1.2
7	libdata/pkgconfig/libfm-extra.pc	7	libdata/pkgconfig/libfm-extra.pc

Lines 12-18 Link Here

(-)x11/libfm-qt/Makefile (-1 / +1 lines)
12		12
13	LICENSE= LGPL21+	13	LICENSE= LGPL21+
14		14
15	LIB_DEPENDS= libfm.so:x11/libfm \	15	LIB_DEPENDS= libfm.so:x11/libfm@gtk2 \
16	libmenu-cache.so:x11/menu-cache \	16	libmenu-cache.so:x11/menu-cache \
17	libexif.so:graphics/libexif	17	libexif.so:graphics/libexif
18		18




# $FreeBSD$

PORTNAME=	libfm
DISTVERSION=	1.3.1
CATEGORIES=	x11
MASTER_SITES=	SF/pcmanfm/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/LibFM/


		libfontconfig.so:x11-fonts/fontconfig \
		libfreetype.so:print/freetype2 \
		libfm-extra.so:x11/libfm-extra

FLAVORS=	gtk2 gtk3
FLAVOR?=	${FLAVORS:[1]}

gtk3_PKGNAMESUFFIX=	-gtk3

gtk2_CONFLICTS_INSTALL=	libfm-gtk3
gtk3_CONFLICTS_INSTALL=	libfm
.endif

SLAVEDIRS=	${CATEGORIES}/${PORTNAME}-extra

USES=		gettext-tools gmake gnome libtool localbase \
		pkgconfig tar:xz
USE_GNOME=	intltool
USE_LDCONFIG=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--sysconfdir=${LOCALBASE}/etc --disable-static
INSTALL_TARGET=	install-strip

.if ! defined(EXTRA_ONLY)
.  if ${FLAVOR:Mgtk2}
USES+=		desktop-file-utils shared-mime-info
USE_GNOME+=	gtk20 cairo gdkpixbuf2
CONFIGURE_ARGS+=	--with-gtk=2
PLIST_SUB=	GTKVERSION=gtk
.  elif ${FLAVOR:Mgtk3}
USES+=		desktop-file-utils shared-mime-info
USE_GNOME+=	gtk30 cairo gdkpixbuf2
CONFIGURE_ARGS+=	--with-gtk=3
PLIST_SUB=	GTKVERSION=gtk3
.  endif
.else
USE_GNOME+=	glib20
CONFIGURE_ARGS+=	--with-extra-only
.endif

INSTALL_TARGET=	install-strip

OPTIONS_DEFINE=	NLS
OPTIONS_SUB=	yes

NLS_USES=	gettext-runtime:build
NLS_CONFIGURE_ENABLE=	nls

post-extract:
.if ! defined(EXTRA_ONLY)
	@${MV} ${WRKSRC}/data/libfm.conf \
		${WRKSRC}/data/libfm.conf.sample
.endif


		${WRKSRC}/configure

	${REINPLACE_CMD} -e '/^pkgincludedir/s|-@FMLIBVER@||; \
		/@LN_S@ @PACKAGE@-@FMLIBVER@/d' ${WRKSRC}/src/Makefile.in
		${WRKSRC}/src/Makefile.in

.if ! defined(EXTRA_ONLY)
	${REINPLACE_CMD} -e 's|DATA = libfm-extra.pc|DATA =|' \
		${WRKSRC}/Makefile.in


Lines 1-3 Link Here

(-)x11/libfm/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1481474043	1	TIMESTAMP = 1545853830
2	SHA256 (libfm-1.2.5.tar.xz) = c706bb1020cf5f2d6f5a9226f692ce1985947134dcf2bde64278bd0420779b5a	2	SHA256 (libfm-1.3.1.tar.xz) = 96b1244bde41ca0eef0332cfb5c67bb16725dfd102128f3e6f74fadc13a1cfe4
3	SIZE (libfm-1.2.5.tar.xz) = 912740	3	SIZE (libfm-1.3.1.tar.xz) = 940632




bin/libfm-pref-apps
bin/lxshortcut
@sample etc/xdg/libfm/libfm.conf.sample
include/libfm/fm-action.h
include/libfm/fm-actions.h
include/libfm/fm-app-chooser-combo-box.h
include/libfm/fm-app-chooser-dlg.h

include/libfm/fm-thumbnailer.h
include/libfm/fm-utils.h
include/libfm/fm.h
lib/libfm-%%GTKVERSION%%.so
lib/libfm-%%GTKVERSION%%.so.4
lib/libfm-%%GTKVERSION%%.so.4.1.2
lib/libfm.so
lib/libfm.so.4
lib/libfm.so.4.1.2
lib/libfm/modules/gtk-fileprop-x-desktop.so
lib/libfm/modules/gtk-fileprop-x-shortcut.so
lib/libfm/modules/gtk-menu-actions.so

lib/libfm/modules/gtk-menu-trash.so
lib/libfm/modules/vfs-menu.so
lib/libfm/modules/vfs-search.so
libdata/pkgconfig/libfm-%%GTKVERSION%%.pc
libdata/pkgconfig/libfm.pc
man/man1/libfm-pref-apps.1.gz
man/man1/lxshortcut.1.gz

Lines 13-19 Link Here

(-)x11/lxhotkey/Makefile (-1 / +1 lines)
13	LICENSE_FILE= ${WRKSRC}/COPYING	13	LICENSE_FILE= ${WRKSRC}/COPYING
14		14
15	LIB_DEPENDS= libfm-extra.so:x11/libfm-extra \	15	LIB_DEPENDS= libfm-extra.so:x11/libfm-extra \
16	libfm.so:x11/libfm \	16	libfm.so:x11/libfm@gtk2 \
17	libfontconfig.so:x11-fonts/fontconfig \	17	libfontconfig.so:x11-fonts/fontconfig \
18	libfreetype.so:print/freetype2 \	18	libfreetype.so:print/freetype2 \
19	libunistring.so:devel/libunistring	19	libunistring.so:devel/libunistring

Lines 15-21 Link Here

(-)x11/lxpanel/Makefile (-1 / +1 lines)
15		15
16	LIB_DEPENDS= libmenu-cache.so:x11/menu-cache \	16	LIB_DEPENDS= libmenu-cache.so:x11/menu-cache \
17	libkeybinder.so:x11/keybinder \	17	libkeybinder.so:x11/keybinder \
18	libfm-gtk.so:x11/libfm \	18	libfm-gtk.so:x11/libfm@gtk2 \
19	libfontconfig.so:x11-fonts/fontconfig \	19	libfontconfig.so:x11-fonts/fontconfig \
20	libfreetype.so:print/freetype2	20	libfreetype.so:print/freetype2
21	RUN_DEPENDS= ${LOCALBASE}/etc/xdg/menus/lxde-applications.menu:x11/lxmenu-data	21	RUN_DEPENDS= ${LOCALBASE}/etc/xdg/menus/lxde-applications.menu:x11/lxmenu-data

Return to bug 229944

Lines 2-8 Link Here

(-)x11-fm/pcmanfm/Makefile (-10 / +27 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= pcmanfm	4	PORTNAME= pcmanfm
5	PORTVERSION= 1.2.5	5	PORTVERSION= 1.3.1
6	CATEGORIES= x11-fm	6	CATEGORIES= x11-fm
7	MASTER_SITES= SF/${PORTNAME}/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/PCManFM/	7	MASTER_SITES= SF/${PORTNAME}/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/PCManFM/
8		8
Lines 11-35 Link Here
11		11
12	LICENSE= GPLv2	12	LICENSE= GPLv2
13		13
14	LIB_DEPENDS= libfm-gtk.so:x11/libfm \	14	LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
15	libfontconfig.so:x11-fonts/fontconfig \
16	libfreetype.so:print/freetype2	15	libfreetype.so:print/freetype2
17		16
18	USES= desktop-file-utils gettext gmake libtool localbase pkgconfig \	17	FLAVORS= gtk2 gtk3
19	tar:xz	18	FLAVOR?= ${FLAVORS:[1]}
		19
		20	gtk3_PKGNAMESUFFIX= -gtk3
		21
		22	gtk2_LIB_DEPENDS= libfm-gtk.so:x11/libfm@gtk2
		23	gtk3_LIB_DEPENDS= libfm-gtk3.so:x11/libfm@gtk3
		24
		25	gtk2_CONFLICTS_INSTALL= pcmanfm-gtk3
		26	gtk3_CONFLICTS_INSTALL= pcmanfm
		27
		28	USES= desktop-file-utils gmake gnome gettext libtool localbase \
		29	pkgconfig tar:xz
		30	USE_GNOME= cairo gdkpixbuf2 intltool
		31	USE_XORG= x11
20	GNU_CONFIGURE= yes	32	GNU_CONFIGURE= yes
21	USE_GNOME= glib20 gtk20 cairo pango gdkpixbuf2 intltool intlhack
22	USE_XORG= x11
23		33
24	CONFIGURE_ARGS=--with-gtk=2	34	.if ${FLAVOR:Mgtk2}
		35	USE_GNOME+= gtk20
		36	CONFIGURE_ARGS= --with-gtk=2
		37	.elif ${FLAVOR:Mgtk3}
		38	USE_GNOME+= gtk30
		39	CONFIGURE_ARGS= --with-gtk=3
		40	.endif
25		41
26	OPTIONS_DEFINE= NLS	42	OPTIONS_DEFINE= NLS
27	OPTIONS_SUB= yes	43	OPTIONS_SUB= yes
		44
		45	NLS_USES= gettext-tools:build
28	NLS_CONFIGURE_ENABLE= nls	46	NLS_CONFIGURE_ENABLE= nls
29	NLS_USES_OFF= gettext-tools
30		47
31	post-extract:	48	post-extract:
32	${MV} ${WRKSRC}/data/pcmanfm.conf \	49	@${MV} ${WRKSRC}/data/pcmanfm.conf \
33	${WRKSRC}/data/pcmanfm.conf.sample	50	${WRKSRC}/data/pcmanfm.conf.sample
34		51
35	post-patch:	52	post-patch:

Lines 2-8 Link Here

(-)x11/libfm/Makefile (-13 / +30 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libfm	4	PORTNAME= libfm
5	PORTVERSION= 1.2.5	5	DISTVERSION= 1.3.1
6	CATEGORIES= x11	6	CATEGORIES= x11
7	MASTER_SITES= SF/pcmanfm/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/LibFM/	7	MASTER_SITES= SF/pcmanfm/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/LibFM/
8		8
Lines 19-53 Link Here
19	libfontconfig.so:x11-fonts/fontconfig \	19	libfontconfig.so:x11-fonts/fontconfig \
20	libfreetype.so:print/freetype2 \	20	libfreetype.so:print/freetype2 \
21	libfm-extra.so:x11/libfm-extra	21	libfm-extra.so:x11/libfm-extra
		22
		23	FLAVORS= gtk2 gtk3
		24	FLAVOR?= ${FLAVORS:[1]}
		25
		26	gtk3_PKGNAMESUFFIX= -gtk3
		27
		28	gtk2_CONFLICTS_INSTALL= libfm-gtk3
		29	gtk3_CONFLICTS_INSTALL= libfm
22	.endif	30	.endif
23		31
24	SLAVEDIRS= ${CATEGORIES}/${PORTNAME}-extra	32	SLAVEDIRS= ${CATEGORIES}/${PORTNAME}-extra
25		33
26	USES= gettext-tools gmake libtool localbase pathfix pkgconfig tar:xz	34	USES= gettext-tools gmake gnome libtool localbase \
27	USE_GNOME= glib20 intltool	35	pkgconfig tar:xz
		36	USE_GNOME= intltool
28	USE_LDCONFIG= yes	37	USE_LDCONFIG= yes
29	GNU_CONFIGURE= yes	38	GNU_CONFIGURE= yes
30	CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc --disable-static	39	CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc --disable-static
31	INSTALL_TARGET= install-strip
32		40
33	.if ! defined(EXTRA_ONLY)	41	.if ! defined(EXTRA_ONLY)
		42	. if ${FLAVOR:Mgtk2}
34	USES+= desktop-file-utils shared-mime-info	43	USES+= desktop-file-utils shared-mime-info
35	USE_GNOME+= gtk20 cairo gdkpixbuf2	44	USE_GNOME+= gtk20 cairo gdkpixbuf2
36	CONFIGURE_ARGS+=--with-gtk=2	45	CONFIGURE_ARGS+= --with-gtk=2
		46	PLIST_SUB= GTKVERSION=gtk
		47	. elif ${FLAVOR:Mgtk3}
		48	USES+= desktop-file-utils shared-mime-info
		49	USE_GNOME+= gtk30 cairo gdkpixbuf2
		50	CONFIGURE_ARGS+= --with-gtk=3
		51	PLIST_SUB= GTKVERSION=gtk3
		52	. endif
37	.else	53	.else
38	USE_GNOME+= intltool intlhack	54	USE_GNOME+= glib20
39	CONFIGURE_ARGS+=--with-extra-only	55	CONFIGURE_ARGS+= --with-extra-only
40	.endif	56	.endif
41		57
		58	INSTALL_TARGET= install-strip
		59
42	OPTIONS_DEFINE= NLS	60	OPTIONS_DEFINE= NLS
43	OPTIONS_SUB= yes	61	OPTIONS_SUB= yes
44		62
45	NLS_USES= gettext-runtime	63	NLS_USES= gettext-runtime:build
46	NLS_CONFIGURE_ENABLE= nls	64	NLS_CONFIGURE_ENABLE= nls
47		65
48	post-extract:	66	post-extract:
49	.if !defined(EXTRA_ONLY)	67	.if ! defined(EXTRA_ONLY)
50	${MV} ${WRKSRC}/data/libfm.conf \	68	@${MV} ${WRKSRC}/data/libfm.conf \
51	${WRKSRC}/data/libfm.conf.sample	69	${WRKSRC}/data/libfm.conf.sample
52	.endif	70	.endif
53		71
Lines 56-65 Link Here
56	${WRKSRC}/configure	74	${WRKSRC}/configure
57		75
58	${REINPLACE_CMD} -e '/^pkgincludedir/s\|-@FMLIBVER@\|\|; \	76	${REINPLACE_CMD} -e '/^pkgincludedir/s\|-@FMLIBVER@\|\|; \
59	/@LN_S@ @PACKAGE@-@FMLIBVER@/d' \	77	/@LN_S@ @PACKAGE@-@FMLIBVER@/d' ${WRKSRC}/src/Makefile.in
60	${WRKSRC}/src/Makefile.in
61		78
62	.if !defined(EXTRA_ONLY)	79	.if ! defined(EXTRA_ONLY)
63	${REINPLACE_CMD} -e 's\|DATA = libfm-extra.pc\|DATA =\|' \	80	${REINPLACE_CMD} -e 's\|DATA = libfm-extra.pc\|DATA =\|' \
64	${WRKSRC}/Makefile.in	81	${WRKSRC}/Makefile.in
65		82

Lines 1-6 Link Here

(-)x11/libfm/pkg-plist (-5 / +6 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-action.h
4	include/libfm/fm-actions.h	5	include/libfm/fm-actions.h
5	include/libfm/fm-app-chooser-combo-box.h	6	include/libfm/fm-app-chooser-combo-box.h
6	include/libfm/fm-app-chooser-dlg.h	7	include/libfm/fm-app-chooser-dlg.h
Lines 67-78 Link Here
67	include/libfm/fm-thumbnailer.h	68	include/libfm/fm-thumbnailer.h
68	include/libfm/fm-utils.h	69	include/libfm/fm-utils.h
69	include/libfm/fm.h	70	include/libfm/fm.h
70	lib/libfm-gtk.so	71	lib/libfm-%%GTKVERSION%%.so
71	lib/libfm-gtk.so.4	72	lib/libfm-%%GTKVERSION%%.so.4
72	lib/libfm-gtk.so.4.0.5	73	lib/libfm-%%GTKVERSION%%.so.4.1.2
73	lib/libfm.so	74	lib/libfm.so
74	lib/libfm.so.4	75	lib/libfm.so.4
75	lib/libfm.so.4.0.5	76	lib/libfm.so.4.1.2
76	lib/libfm/modules/gtk-fileprop-x-desktop.so	77	lib/libfm/modules/gtk-fileprop-x-desktop.so
77	lib/libfm/modules/gtk-fileprop-x-shortcut.so	78	lib/libfm/modules/gtk-fileprop-x-shortcut.so
78	lib/libfm/modules/gtk-menu-actions.so	79	lib/libfm/modules/gtk-menu-actions.so
Lines 79-85 Link Here
79	lib/libfm/modules/gtk-menu-trash.so	80	lib/libfm/modules/gtk-menu-trash.so
80	lib/libfm/modules/vfs-menu.so	81	lib/libfm/modules/vfs-menu.so
81	lib/libfm/modules/vfs-search.so	82	lib/libfm/modules/vfs-search.so
82	libdata/pkgconfig/libfm-gtk.pc	83	libdata/pkgconfig/libfm-%%GTKVERSION%%.pc
83	libdata/pkgconfig/libfm.pc	84	libdata/pkgconfig/libfm.pc
84	man/man1/libfm-pref-apps.1.gz	85	man/man1/libfm-pref-apps.1.gz
85	man/man1/lxshortcut.1.gz	86	man/man1/lxshortcut.1.gz