Index: head/x11-wm/plank/Makefile =================================================================== --- head/x11-wm/plank/Makefile (revision 385481) +++ head/x11-wm/plank/Makefile (revision 385482) @@ -1,49 +1,46 @@ # Created by: Olivier Duchateau # $FreeBSD$ PORTNAME= plank -PORTVERSION= 0.9.0 +PORTVERSION= 0.9.1 CATEGORIES= x11-wm -MASTER_SITES= https://launchpadlibrarian.net/202964163/ \ +MASTER_SITES= https://launchpadlibrarian.net/205431962/ \ https://launchpad.net/${PORTNAME}/1.0/${PORTVERSION}/+download/ MAINTAINER= olivierd@FreeBSD.org COMMENT= Elegant, simple, and clean dock LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= vapigen:${PORTSDIR}/lang/vala LIB_DEPENDS= libbamf3.so:${PORTSDIR}/sysutils/bamf \ libgee-0.8.so:${PORTSDIR}/devel/libgee USES= tar:xz pkgconfig gmake pathfix libtool GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib CFLAGS+= -Wno-return-type USE_GNOME= glib20 gtk30 gdkpixbuf2 intlhack libxml2 libwnck3 USE_XORG= x11 xfixes xi INSTALLS_ICONS= yes +INSTALL_TARGET= install-strip OPTIONS_SUB= yes OPTIONS_DEFINE= NLS DBUSMENU DBUSMENU_DESC= DBusMenu protocol CONFIGURE_ARGS= --enable-gee-0.8 \ --disable-benchmark \ --disable-headless-tests \ --disable-apport NLS_USES= gettext NLS_USES_OFF= gettext-tools NLS_CONFIGURE_ENABLE= nls DBUSMENU_LIB_DEPENDS= libdbusmenu-gtk3.so:${PORTSDIR}/devel/libdbusmenu DBUSMENU_CONFIGURE_ENABLE= dbusmenu - -post-patch: - ${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \ - ${WRKSRC}/lib/Widgets/PreferencesWindow.vala .include Index: head/x11-wm/plank/distinfo =================================================================== --- head/x11-wm/plank/distinfo (revision 385481) +++ head/x11-wm/plank/distinfo (revision 385482) @@ -1,2 +1,2 @@ -SHA256 (plank-0.9.0.tar.xz) = 3a878a393a1e274d44ee88e80e879d30132af1cb1e76c4274dde16666a01a0d4 -SIZE (plank-0.9.0.tar.xz) = 898700 +SHA256 (plank-0.9.1.tar.xz) = 884cd57a0fcc78cf82cf01072dedc46c34b6f766871d5f773b68ee498fded9a2 +SIZE (plank-0.9.1.tar.xz) = 904056 Index: head/x11-wm/plank/files/patch-data__Makefile.in =================================================================== --- head/x11-wm/plank/files/patch-data__Makefile.in (revision 385481) +++ head/x11-wm/plank/files/patch-data__Makefile.in (nonexistent) @@ -1,98 +0,0 @@ ---- ./data/Makefile.in.orig 2014-05-20 11:21:55.000000000 +0000 -+++ ./data/Makefile.in 2014-08-02 16:44:50.000000000 +0000 -@@ -148,11 +148,11 @@ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } - man1dir = $(mandir)/man1 --am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(appdatadir)" \ -+am__installdirs = "$(DESTDIR)$(man1dir)" \ - "$(DESTDIR)$(applicationsdir)" - NROFF = nroff - MANS = $(dist_man_MANS) --DATA = $(appdata_DATA) $(applications_DATA) -+DATA = $(applications_DATA) - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive - am__recursive_targets = \ -@@ -391,8 +391,6 @@ - - applicationsdir = $(datadir)/applications - applications_DATA = plank.desktop --appdatadir = $(datadir)/appdata --appdata_DATA = plank.appdata.xml - all: all-recursive - - .SUFFIXES: -@@ -475,27 +473,6 @@ - } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ - -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) --install-appdataDATA: $(appdata_DATA) -- @$(NORMAL_INSTALL) -- @list='$(appdata_DATA)'; test -n "$(appdatadir)" || list=; \ -- if test -n "$$list"; then \ -- echo " $(MKDIR_P) '$(DESTDIR)$(appdatadir)'"; \ -- $(MKDIR_P) "$(DESTDIR)$(appdatadir)" || exit 1; \ -- fi; \ -- for p in $$list; do \ -- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- echo "$$d$$p"; \ -- done | $(am__base_list) | \ -- while read files; do \ -- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(appdatadir)'"; \ -- $(INSTALL_DATA) $$files "$(DESTDIR)$(appdatadir)" || exit $$?; \ -- done -- --uninstall-appdataDATA: -- @$(NORMAL_UNINSTALL) -- @list='$(appdata_DATA)'; test -n "$(appdatadir)" || list=; \ -- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ -- dir='$(DESTDIR)$(appdatadir)'; $(am__uninstall_files_from_dir) - install-applicationsDATA: $(applications_DATA) - @$(NORMAL_INSTALL) - @list='$(applications_DATA)'; test -n "$(applicationsdir)" || list=; \ -@@ -677,7 +654,7 @@ - all-am: Makefile $(MANS) $(DATA) - installdirs: installdirs-recursive - installdirs-am: -- for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(appdatadir)" "$(DESTDIR)$(applicationsdir)"; do \ -+ for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(applicationsdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done - install: install-recursive -@@ -731,7 +708,7 @@ - - info-am: - --install-data-am: install-appdataDATA install-applicationsDATA \ -+install-data-am: install-applicationsDATA \ - install-man - - install-dvi: install-dvi-recursive -@@ -776,7 +753,7 @@ - - ps-am: - --uninstall-am: uninstall-appdataDATA uninstall-applicationsDATA \ -+uninstall-am: uninstall-applicationsDATA \ - uninstall-man - - uninstall-man: uninstall-man1 -@@ -787,7 +764,7 @@ - check-am clean clean-generic clean-libtool cscopelist-am ctags \ - ctags-am distclean distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-appdataDATA \ -+ install install-am \ - install-applicationsDATA install-data install-data-am \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ -@@ -796,7 +773,7 @@ - installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ -- uninstall-am uninstall-appdataDATA uninstall-applicationsDATA \ -+ uninstall-am uninstall-applicationsDATA \ - uninstall-man uninstall-man1 - - Property changes on: head/x11-wm/plank/files/patch-data__Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11-wm/plank/files/patch-config.h.in =================================================================== --- head/x11-wm/plank/files/patch-config.h.in (nonexistent) +++ head/x11-wm/plank/files/patch-config.h.in (revision 385482) @@ -0,0 +1,10 @@ +--- config.h.in.orig 2015-05-02 15:04:04 UTC ++++ config.h.in +@@ -1,5 +1,7 @@ + /* config.h.in. Generated from configure.ac by autoheader. */ + ++#undef INSTALL_PREFIX ++ + /* Define the gettext package to be used */ + #undef GETTEXT_PACKAGE + Property changes on: head/x11-wm/plank/files/patch-config.h.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-wm/plank/files/patch-configure =================================================================== --- head/x11-wm/plank/files/patch-configure (nonexistent) +++ head/x11-wm/plank/files/patch-configure (revision 385482) @@ -0,0 +1,20 @@ +--- configure.orig 2015-05-02 15:04:03 UTC ++++ configure +@@ -797,6 +797,7 @@ PLANK_MICRO_VERSION + PLANK_MINOR_VERSION + PLANK_MAJOR_VERSION + PLANK_MAJOR_MINOR_VERSION ++INSTALL_PREFIX + LT_AGE + LT_REVISION + LT_CURRENT +@@ -2330,6 +2331,9 @@ cat >>confdefs.h <<_ACEOF + #define PACKAGE_URL "$PACKAGE_URL" + _ACEOF + ++cat >>confdefs.h <<_ACEOF ++#define INSTALL_PREFIX "${prefix}" ++_ACEOF + + # Let the site file select an alternate cache file if it wants to. + # Prefer an explicitly selected file to automatically selected ones. Property changes on: head/x11-wm/plank/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-wm/plank/files/patch-lib_Widgets_PreferencesWindow.vala =================================================================== --- head/x11-wm/plank/files/patch-lib_Widgets_PreferencesWindow.vala (revision 385481) +++ head/x11-wm/plank/files/patch-lib_Widgets_PreferencesWindow.vala (revision 385482) @@ -1,15 +1,15 @@ --- lib/Widgets/PreferencesWindow.vala.orig 2015-04-07 07:42:22 UTC +++ lib/Widgets/PreferencesWindow.vala @@ -59,6 +59,12 @@ namespace Plank.Widgets construct { + GLib.Intl.setlocale (LocaleCategory.ALL, ""); -+ string langpack_dir = GLib.Path.build_filename ("%%PREFIX%%", "share", "locale"); -+ GLib.Intl.bindtextdomain ("plank", langpack_dir); -+ GLib.Intl.bind_textdomain_codeset ("plank", "UTF-8"); -+ GLib.Intl.textdomain ("plank"); ++ string langpack_dir = GLib.Path.build_filename (Build.INSTALL_PREFIX, "share", "locale"); ++ GLib.Intl.bindtextdomain (Build.GETTEXT_PACKAGE, langpack_dir); ++ GLib.Intl.bind_textdomain_codeset (Build.GETTEXT_PACKAGE, "UTF-8"); ++ GLib.Intl.textdomain (Build.GETTEXT_PACKAGE); + skip_pager_hint = true; skip_taskbar_hint = true; title = _("Preferences"); Index: head/x11-wm/plank/files/patch-vapi_config.vapi =================================================================== --- head/x11-wm/plank/files/patch-vapi_config.vapi (nonexistent) +++ head/x11-wm/plank/files/patch-vapi_config.vapi (revision 385482) @@ -0,0 +1,11 @@ +--- vapi/config.vapi.orig 2015-04-27 13:44:43 UTC ++++ vapi/config.vapi +@@ -32,6 +32,8 @@ namespace Build + public const string VERSION; + public const string VERSION_INFO; + ++ public const string INSTALL_PREFIX; ++ + public const uint VERSION_MAJOR; + public const uint VERSION_MINOR; + public const uint VERSION_MICRO; Property changes on: head/x11-wm/plank/files/patch-vapi_config.vapi ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-wm/plank/pkg-plist =================================================================== --- head/x11-wm/plank/pkg-plist (revision 385481) +++ head/x11-wm/plank/pkg-plist (revision 385482) @@ -1,71 +1,72 @@ bin/plank include/plank/plank.h lib/libplank.so lib/libplank.so.0 lib/libplank.so.0.0.0 libdata/pkgconfig/plank.pc man/man1/plank.1.gz +share/appdata/plank.appdata.xml share/applications/plank.desktop share/icons/hicolor/128x128/apps/plank.svg share/icons/hicolor/16x16/apps/plank.svg share/icons/hicolor/22x22/apps/plank.svg share/icons/hicolor/24x24/apps/plank.svg share/icons/hicolor/32x32/apps/plank.svg share/icons/hicolor/48x48/apps/plank.svg share/icons/hicolor/64x64/apps/plank.svg %%NLS%%share/locale/am/LC_MESSAGES/plank.mo %%NLS%%share/locale/ar/LC_MESSAGES/plank.mo %%NLS%%share/locale/bg/LC_MESSAGES/plank.mo %%NLS%%share/locale/bs/LC_MESSAGES/plank.mo %%NLS%%share/locale/ca/LC_MESSAGES/plank.mo %%NLS%%share/locale/cs/LC_MESSAGES/plank.mo %%NLS%%share/locale/de/LC_MESSAGES/plank.mo %%NLS%%share/locale/el/LC_MESSAGES/plank.mo %%NLS%%share/locale/en_AU/LC_MESSAGES/plank.mo %%NLS%%share/locale/en_CA/LC_MESSAGES/plank.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/plank.mo %%NLS%%share/locale/eo/LC_MESSAGES/plank.mo %%NLS%%share/locale/es/LC_MESSAGES/plank.mo %%NLS%%share/locale/et/LC_MESSAGES/plank.mo %%NLS%%share/locale/eu/LC_MESSAGES/plank.mo %%NLS%%share/locale/fi/LC_MESSAGES/plank.mo %%NLS%%share/locale/fr/LC_MESSAGES/plank.mo %%NLS%%share/locale/gl/LC_MESSAGES/plank.mo %%NLS%%share/locale/he/LC_MESSAGES/plank.mo %%NLS%%share/locale/hr/LC_MESSAGES/plank.mo %%NLS%%share/locale/hu/LC_MESSAGES/plank.mo %%NLS%%share/locale/id/LC_MESSAGES/plank.mo %%NLS%%share/locale/it/LC_MESSAGES/plank.mo %%NLS%%share/locale/ja/LC_MESSAGES/plank.mo %%NLS%%share/locale/ko/LC_MESSAGES/plank.mo %%NLS%%share/locale/lt/LC_MESSAGES/plank.mo %%NLS%%share/locale/lv/LC_MESSAGES/plank.mo %%NLS%%share/locale/ml/LC_MESSAGES/plank.mo %%NLS%%share/locale/nb/LC_MESSAGES/plank.mo %%NLS%%share/locale/nl/LC_MESSAGES/plank.mo %%NLS%%share/locale/nn/LC_MESSAGES/plank.mo %%NLS%%share/locale/pl/LC_MESSAGES/plank.mo %%NLS%%share/locale/pt/LC_MESSAGES/plank.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/plank.mo %%NLS%%share/locale/ro/LC_MESSAGES/plank.mo %%NLS%%share/locale/ru/LC_MESSAGES/plank.mo %%NLS%%share/locale/sk/LC_MESSAGES/plank.mo %%NLS%%share/locale/sl/LC_MESSAGES/plank.mo %%NLS%%share/locale/sma/LC_MESSAGES/plank.mo %%NLS%%share/locale/sq/LC_MESSAGES/plank.mo %%NLS%%share/locale/sr/LC_MESSAGES/plank.mo %%NLS%%share/locale/sr@latin/LC_MESSAGES/plank.mo %%NLS%%share/locale/sv/LC_MESSAGES/plank.mo %%NLS%%share/locale/ta/LC_MESSAGES/plank.mo %%NLS%%share/locale/te/LC_MESSAGES/plank.mo %%NLS%%share/locale/th/LC_MESSAGES/plank.mo %%NLS%%share/locale/tr/LC_MESSAGES/plank.mo %%NLS%%share/locale/uk/LC_MESSAGES/plank.mo %%NLS%%share/locale/vi/LC_MESSAGES/plank.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/plank.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/plank.mo %%DATADIR%%/themes/Default/dock.theme %%DATADIR%%/themes/Matte/dock.theme %%DATADIR%%/themes/Transparent/dock.theme share/vala/vapi/plank.deps share/vala/vapi/plank.vapi