Attachment 195793 Details for Bug 229944 – x11/libfm and x11-fm/pcmanfm: update and flavorize.

[patch] x11/libfm and x11-fm/pcmanfm: update and flavorize.

libfm_pcmanfm_update_flavor.patch (text/plain), 5.93 KB, created by Alexandre C. Guimarães on 2018-08-03 02:46:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexandre C. Guimarães

Created: 2018-08-03 02:46:28 UTC

Size: 5.93 KB

patch

obsolete

>Index: x11/libfm/Makefile
>===================================================================
>--- x11/libfm/Makefile	(revision 476275)
>+++ x11/libfm/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	libfm
>-PORTVERSION=	1.2.5
>+DISTVERSION=	1.3.0.2
> CATEGORIES=	x11
> MASTER_SITES=	SF/pcmanfm/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/LibFM/
> 
>@@ -19,35 +19,53 @@
> 		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 libtool localbase pathfix pkgconfig tar:xz
>-USE_GNOME=	glib20 intltool
>+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
>+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+=	intltool intlhack
>-CONFIGURE_ARGS+=--with-extra-only
>+USE_GNOME+=	glib20
>+CONFIGURE_ARGS+=	--with-extra-only
> .endif
> 
> OPTIONS_DEFINE=	NLS
> OPTIONS_SUB=	yes
> 
>-NLS_USES=	gettext-runtime
>+NLS_USES=	gettext-runtime:build
> NLS_CONFIGURE_ENABLE=	nls
> 
>+INSTALL_TARGET=	install-strip
>+
> post-extract:
>-.if !defined(EXTRA_ONLY)
>-	${MV} ${WRKSRC}/data/libfm.conf \
>+.if ! defined(EXTRA_ONLY)
>+	@${MV} ${WRKSRC}/data/libfm.conf \
> 		${WRKSRC}/data/libfm.conf.sample
> .endif
> 
>@@ -56,10 +74,9 @@
> 		${WRKSRC}/configure
> 
> 	${REINPLACE_CMD} -e '/^pkgincludedir/s|-@FMLIBVER@||; \
>-		/@LN_S@ @PACKAGE@-@FMLIBVER@/d' \
>-		${WRKSRC}/src/Makefile.in
>+		/@LN_S@ @PACKAGE@-@FMLIBVER@/d' ${WRKSRC}/src/Makefile.in
> 
>-.if !defined(EXTRA_ONLY)
>+.if ! defined(EXTRA_ONLY)
> 	${REINPLACE_CMD} -e 's|DATA = libfm-extra.pc|DATA =|' \
> 		${WRKSRC}/Makefile.in
> 
>Index: x11/libfm/distinfo
>===================================================================
>--- x11/libfm/distinfo	(revision 476275)
>+++ x11/libfm/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1481474043
>-SHA256 (libfm-1.2.5.tar.xz) = c706bb1020cf5f2d6f5a9226f692ce1985947134dcf2bde64278bd0420779b5a
>-SIZE (libfm-1.2.5.tar.xz) = 912740
>+TIMESTAMP = 1531957278
>+SHA256 (libfm-1.3.0.2.tar.xz) = 18d06f7996ce1cf8947df6e106bc0338c6ae0c4138c316f2501f6f6f435c7c72
>+SIZE (libfm-1.3.0.2.tar.xz) = 939376
>Index: x11/libfm/pkg-plist
>===================================================================
>--- x11/libfm/pkg-plist	(revision 476275)
>+++ x11/libfm/pkg-plist	(working copy)
>@@ -1,6 +1,7 @@
> 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
>@@ -67,12 +68,12 @@
> 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.5
>+lib/libfm-%%GTKVERSION%%.so
>+lib/libfm-%%GTKVERSION%%.so.4
>+lib/libfm-%%GTKVERSION%%.so.4.1.1
> lib/libfm.so
> lib/libfm.so.4
>-lib/libfm.so.4.0.5
>+lib/libfm.so.4.1.1
> lib/libfm/modules/gtk-fileprop-x-desktop.so
> lib/libfm/modules/gtk-fileprop-x-shortcut.so
> lib/libfm/modules/gtk-menu-actions.so
>@@ -79,7 +80,7 @@
> lib/libfm/modules/gtk-menu-trash.so
> lib/libfm/modules/vfs-menu.so
> lib/libfm/modules/vfs-search.so
>-libdata/pkgconfig/libfm-gtk.pc
>+libdata/pkgconfig/libfm-%%GTKVERSION%%.pc
> libdata/pkgconfig/libfm.pc
> man/man1/libfm-pref-apps.1.gz
> man/man1/lxshortcut.1.gz
>Index: x11-fm/pcmanfm/Makefile
>===================================================================
>--- x11-fm/pcmanfm/Makefile	(revision 476275)
>+++ x11-fm/pcmanfm/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	pcmanfm
>-PORTVERSION=	1.2.5
>+PORTVERSION=	1.3.0
> CATEGORIES=	x11-fm
> MASTER_SITES=	SF/${PORTNAME}/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/PCManFM/
> 
>@@ -11,25 +11,42 @@
> 
> LICENSE=	GPLv2
> 
>-LIB_DEPENDS=	libfm-gtk.so:x11/libfm \
>-		libfontconfig.so:x11-fonts/fontconfig \
>+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
> 		libfreetype.so:print/freetype2
> 
>-USES=		desktop-file-utils gettext gmake libtool localbase pkgconfig \
>-		tar:xz
>+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
> 
>-CONFIGURE_ARGS=--with-gtk=2
>+.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 \
>+	@${MV} ${WRKSRC}/data/pcmanfm.conf \
> 		${WRKSRC}/data/pcmanfm.conf.sample
> 
> post-patch:
>Index: x11-fm/pcmanfm/distinfo
>===================================================================
>--- x11-fm/pcmanfm/distinfo	(revision 476275)
>+++ x11-fm/pcmanfm/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1482343112
>-SHA256 (pcmanfm-1.2.5.tar.xz) = 0c86cac028b705ff314c7464d814c2cf7ff604c17491c20aa204b1ef1a80ad67
>-SIZE (pcmanfm-1.2.5.tar.xz) = 417808
>+TIMESTAMP = 1531956880
>+SHA256 (pcmanfm-1.3.0.tar.xz) = 5a693e9bf3f3294f0ee7264c1c1a600a88ee27d1572e7dd5c4b0e84aa7778ffb
>+SIZE (pcmanfm-1.3.0.tar.xz) = 422836

Actions: View | Diff

Attachments on bug 229944: 195793 | 200850