Page MenuHomeFreeBSD
Files F144939774

D16387.id49197.diff
No OneTemporary
Actions

D16387.id49197.diff
View Options

Index: graphics/lximage-qt/Makefile
===================================================================
--- graphics/lximage-qt/Makefile
+++ graphics/lximage-qt/Makefile
@@ -13,16 +13,21 @@
LICENSE= GPLv2
LIB_DEPENDS= libexif.so:graphics/libexif \
- libmenu-cache.so:x11/menu-cache \
- libfm.so:x11/libfm
+ libmenu-cache.so:x11/menu-cache \
+ libfm.so:x11/libfm@gtk2
-USES= cmake:outsource compiler:c++11-lib desktop-file-utils gettext-runtime \
- localbase:ldflags lxqt pkgconfig qt:5 tar:xz
+USES= cmake:outsource compiler:c++11-lib desktop-file-utils \
+ gettext-runtime localbase:ldflags lxqt pkgconfig qt:5 \
+ tar:xz
USE_GNOME= glib20
USE_QT= buildtools_build qmake_build core dbus gui linguisttools \
- network printsupport svg widgets x11extras
+ network printsupport svg widgets x11extras
USE_LXQT= buildtools libfmqt
USE_XORG= ice sm x11 xcb xext xfixes
-INSTALLS_ICONS= yes
+
+PLIST_FILES= bin/lximage-qt \
+ share/applications/lximage-qt-screenshot.desktop \
+ share/applications/lximage-qt.desktop \
+ share/icons/hicolor/48x48/apps/lximage-qt.png
.include <bsd.port.mk>
Index: graphics/lximage-qt/pkg-plist
===================================================================
--- graphics/lximage-qt/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/lximage-qt
-share/applications/lximage-qt-screenshot.desktop
-share/applications/lximage-qt.desktop
-share/icons/hicolor/48x48/apps/lximage-qt.png
Index: sysutils/lxqt-qtplugin/Makefile
===================================================================
--- sysutils/lxqt-qtplugin/Makefile
+++ sysutils/lxqt-qtplugin/Makefile
@@ -13,16 +13,17 @@
LICENSE= LGPL21+
LIB_DEPENDS= libdbusmenu-qt5.so:devel/libdbusmenu-qt@qt5 \
- libfm.so:x11/libfm \
+ libfm.so:x11/libfm@gtk2 \
libmenu-cache.so:x11/menu-cache \
libexif.so:graphics/libexif
-USES= cmake:outsource compiler:c++11-lib kde:5 lxqt pkgconfig tar:xz qt:5 gettext-runtime
+USES= cmake:outsource compiler:c++11-lib kde:5 lxqt \
+ pkgconfig tar:xz qt:5 gettext-runtime
-USE_XORG=xcb
-USE_GNOME=glib20
-USE_QT= buildtools_build qmake_build core dbus gui svg widgets \
- x11extras xml
+USE_XORG= xcb
+USE_GNOME= glib20
+USE_QT= buildtools_build qmake_build core dbus gui svg \
+ widgets x11extras xml
USE_KDE= windowsystem
USE_LXQT= buildtools qtxdg libfmqt
USE_LDCONFIG= yes
Index: x11-fm/pcmanfm-qt/Makefile
===================================================================
--- x11-fm/pcmanfm-qt/Makefile
+++ x11-fm/pcmanfm-qt/Makefile
@@ -13,11 +13,12 @@
LICENSE= GPLv2
LIB_DEPENDS= libmenu-cache.so:x11/menu-cache \
- libfm.so:x11/libfm \
+ libfm.so:x11/libfm@gtk2 \
libexif.so:graphics/libexif
USES= cmake:outsource compiler:c++11-lib desktop-file-utils \
- gettext-runtime localbase:ldflags lxqt pkgconfig kde:5 qt:5 tar:xz
+ gettext-runtime localbase:ldflags lxqt pkgconfig kde:5 \
+ qt:5 tar:xz
USE_QT= buildtools_build qmake_build core dbus gui linguisttools \
widgets x11extras
USE_KDE= oxygen-icons5
Index: x11-fm/pcmanfm/Makefile
===================================================================
--- x11-fm/pcmanfm/Makefile
+++ x11-fm/pcmanfm/Makefile
@@ -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
-GNU_CONFIGURE= yes
-USE_GNOME= glib20 gtk20 cairo pango gdkpixbuf2 intltool intlhack
+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
-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
+++ x11-fm/pcmanfm/distinfo
@@ -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
Index: x11/libfm-extra/pkg-plist
===================================================================
--- x11/libfm-extra/pkg-plist
+++ x11/libfm-extra/pkg-plist
@@ -3,5 +3,5 @@
include/libfm/fm-xml-file.h
lib/libfm-extra.so
lib/libfm-extra.so.4
-lib/libfm-extra.so.4.0.5
+lib/libfm-extra.so.4.1.1
libdata/pkgconfig/libfm-extra.pc
Index: x11/libfm-qt/Makefile
===================================================================
--- x11/libfm-qt/Makefile
+++ x11/libfm-qt/Makefile
@@ -12,17 +12,18 @@
LICENSE= LGPL21+
-LIB_DEPENDS= libfm.so:x11/libfm \
- libmenu-cache.so:x11/menu-cache \
- libexif.so:graphics/libexif
-
-USES= cmake:outsource compiler:c++11-lib gettext-runtime lxqt pkgconfig \
- qt:5 shared-mime-info tar:xz
-USE_QT= buildtools_build qmake_build core gui linguisttools widgets \
- x11extras
+LIB_DEPENDS= libfm.so:x11/libfm@gtk2 \
+ libmenu-cache.so:x11/menu-cache \
+ libexif.so:graphics/libexif
+
+USES= cmake:outsource compiler:c++11-lib gettext-runtime \
+ lxqt pkgconfig qt:5 shared-mime-info tar:xz
+USE_QT= buildtools_build qmake_build core gui linguisttools \
+ widgets x11extras
USE_GNOME= glib20
USE_XORG= xcb
USE_LXQT= buildtools
+LD_CONFIG= yes
post-install:
${RM} -Rf ${STAGEDIR}${PREFIX}/include/${PORTNAME}/tests/
Index: x11/libfm/Makefile
===================================================================
--- x11/libfm/Makefile
+++ x11/libfm/Makefile
@@ -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
+INSTALL_TARGET= install-strip
+
OPTIONS_DEFINE= NLS
OPTIONS_SUB= yes
-NLS_USES= gettext-runtime
+NLS_USES= gettext-runtime:build
NLS_CONFIGURE_ENABLE= nls
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
+++ x11/libfm/distinfo
@@ -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
+++ x11/libfm/pkg-plist
@@ -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,19 +68,19 @@
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
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/lxhotkey/Makefile
===================================================================
--- x11/lxhotkey/Makefile
+++ x11/lxhotkey/Makefile
@@ -13,16 +13,15 @@
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libfm-extra.so:x11/libfm-extra \
- libfm.so:x11/libfm \
- libfontconfig.so:x11-fonts/fontconfig \
- libfreetype.so:print/freetype2 \
- libunistring.so:devel/libunistring
+ libfm.so:x11/libfm@gtk2 \
+ libfontconfig.so:x11-fonts/fontconfig \
+ libfreetype.so:print/freetype2 \
+ libunistring.so:devel/libunistring
-USES= gettext-tools gmake pathfix pkgconfig tar:xz
-GNU_CONFIGURE= yes
+USES= gettext-tools gmake pathfix pkgconfig tar:xz
USE_GNOME= glib20 gtk20 intltool cairo gdkpixbuf2
USE_XORG= x11
-
+GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-gtk=2
post-install:
Index: x11/lxpanel/Makefile
===================================================================
--- x11/lxpanel/Makefile
+++ x11/lxpanel/Makefile
@@ -15,27 +15,28 @@
LIB_DEPENDS= libmenu-cache.so:x11/menu-cache \
libkeybinder.so:x11/keybinder \
- libfm-gtk.so:x11/libfm \
+ libfm-gtk.so:x11/libfm@gtk2 \
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
RUN_DEPENDS= ${LOCALBASE}/etc/xdg/menus/lxde-applications.menu:x11/lxmenu-data
+USES= gmake libtool localbase pathfix pkgconfig tar:xz
USE_GNOME= glib20 gtk20 cairo gdkpixbuf2 libwnck intltool
USE_XORG= x11
-USES= gmake libtool localbase pathfix pkgconfig tar:xz
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \
--with-plugins="${LXPANEL_PLUGINS}"
INSTALL_TARGET= install-strip
+LD_CONFIG= yes
# Panel plugins
LXPANEL_PLUGINS= "-netstat,-netstatus,deskno,-batt,kbled,xkb,-thermal,cpu,cpufreq,monitors,-indicator"
-OPTIONS_SINGLE= SOUND
+OPTIONS_SINGLE= SOUND
OPTIONS_SINGLE_SOUND= ALSA OSS
-OPTIONS_DEFINE= NLS WEATHER
+OPTIONS_DEFINE= NLS WEATHER
OPTIONS_DEFAULT= OSS WEATHER
-OPTIONS_SUB= yes
+OPTIONS_SUB= yes
ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
ALSA_CONFIGURE_ENABLE= alsa
@@ -50,7 +51,6 @@
WEATHER_DESC= Weather plugin
post-patch-NLS-off:
- @${REINPLACE_CMD} -e 's|po man|man|' \
- ${WRKSRC}/Makefile.in
+ @${REINPLACE_CMD} -e 's|po man|man|' ${WRKSRC}/Makefile.in
.include <bsd.port.mk>

File Metadata

Mime Type
text/plain
Expires
Sun, Feb 15, 7:53 AM (16 h, 53 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28732732
Default Alt Text
D16387.id49197.diff (12 KB)

Event Timeline