svn commit: r421095 - in head/sysutils/bamf: . files

Olivier Duchateau olivierd at FreeBSD.org
Mon Aug 29 19:59:35 UTC 2016 

Author: olivierd
Date: Mon Aug 29 19:59:33 2016
New Revision: 421095
URL: https://svnweb.freebsd.org/changeset/ports/421095

Log:
  - Update to 0.5.3
  - Sort USES
  - Re-generate patches, using 'make makepatch'
  - Add new patches, in order to remove all references to systemd

Added:
  head/sysutils/bamf/files/patch-data_Makefile.in   (contents, props changed)
  head/sysutils/bamf/files/patch-data_org.ayatana.bamf.service.in   (contents, props changed)
Modified:
  head/sysutils/bamf/Makefile
  head/sysutils/bamf/distinfo
  head/sysutils/bamf/files/patch-configure
  head/sysutils/bamf/files/patch-lib__libbamf-private__Makefile.in

Modified: head/sysutils/bamf/Makefile
==============================================================================
--- head/sysutils/bamf/Makefile	Mon Aug 29 19:55:47 2016	(r421094)
+++ head/sysutils/bamf/Makefile	Mon Aug 29 19:59:33 2016	(r421095)
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	bamf
-PORTVERSION=	0.5.1
+PORTVERSION=	0.5.3
 CATEGORIES=	sysutils
-MASTER_SITES=	https://launchpadlibrarian.net/203290162/ \
+MASTER_SITES=	https://launchpadlibrarian.net/280921055/ \
 	https://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}/+download/
 
 MAINTAINER=	olivierd at FreeBSD.org
@@ -17,12 +17,14 @@ BUILD_DEPENDS=	vapigen:lang/vala \
 	${PYTHON_PKGNAMEPREFIX}libxml2>=2.8.0:textproc/py-libxml2 \
 	${PYTHON_PKGNAMEPREFIX}libxslt>=1.1.28:textproc/py-libxslt
 LIB_DEPENDS=	libgtop-2.0.so:devel/libgtop \
-	libdbus-glib-1.so:devel/dbus-glib
+	libdbus-glib-1.so:devel/dbus-glib \
+	libstartup-notification-1.so:x11/startup-notification
 
-USES=		pkgconfig gmake pathfix libtool python:2
+USES=		gettext-runtime gmake libtool pathfix pkgconfig python:2
 GNU_CONFIGURE=	yes
-USE_GNOME=	gtk30 glib20 introspection:build libwnck3
+USE_GNOME=	gtk30 glib20 introspection:build libwnck3 cairo gdkpixbuf2
 USE_XORG=	x11
+INSTALL_TARGET=	install-strip
 
 CONFIGURE_ARGS+=--disable-headless-tests \
 	--disable-gtktest \

Modified: head/sysutils/bamf/distinfo
==============================================================================
--- head/sysutils/bamf/distinfo	Mon Aug 29 19:55:47 2016	(r421094)
+++ head/sysutils/bamf/distinfo	Mon Aug 29 19:59:33 2016	(r421095)
@@ -1,2 +1,3 @@
-SHA256 (bamf-0.5.1.tar.gz) = fb65e6d0d7330f06626e43b0f3828bdeb5678d69133396e770a8781b9988fd16
-SIZE (bamf-0.5.1.tar.gz) = 575386
+TIMESTAMP = 1472504601
+SHA256 (bamf-0.5.3.tar.gz) = 340d7b5a463afcd33135ae73a7e4cf6a93a4daaf6f72b70abc09dc66d18a3b14
+SIZE (bamf-0.5.3.tar.gz) = 633666

Modified: head/sysutils/bamf/files/patch-configure
==============================================================================
--- head/sysutils/bamf/files/patch-configure	Mon Aug 29 19:55:47 2016	(r421094)
+++ head/sysutils/bamf/files/patch-configure	Mon Aug 29 19:59:33 2016	(r421095)
@@ -1,6 +1,6 @@
---- ./configure.orig	2013-08-30 16:26:19.388840000 +0000
-+++ ./configure	2014-08-02 15:44:13.000000000 +0000
-@@ -14518,7 +14518,7 @@
+--- configure.orig	2016-08-25 15:18:48 UTC
++++ configure
+@@ -15233,7 +15233,7 @@ rm -f core conftest.err conftest.$ac_obj
    rm -f conf.gtktest
  
  

Added: head/sysutils/bamf/files/patch-data_Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/bamf/files/patch-data_Makefile.in	Mon Aug 29 19:59:33 2016	(r421095)
@@ -0,0 +1,198 @@
+--- data/Makefile.in.orig	2016-08-25 15:25:55 UTC
++++ data/Makefile.in
+@@ -131,9 +131,8 @@ am__uninstall_files_from_dir = { \
+          $(am__cd) "$$dir" && rm -f $$files; }; \
+   }
+ am__installdirs = "$(DESTDIR)$(bamfdaemondbusrunnerdir)" \
+-	"$(DESTDIR)$(servicedir)" "$(DESTDIR)$(systemddir)" \
+-	"$(DESTDIR)$(upstartdir)"
+-SCRIPTS = $(bamfdaemondbusrunner_SCRIPTS)
++	"$(DESTDIR)$(servicedir)"
++SCRIPTS = 
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+@@ -153,7 +152,7 @@ am__can_run_installinfo = \
+     n|no|NO) false;; \
+     *) (install-info --version) >/dev/null 2>&1;; \
+   esac
+-DATA = $(service_DATA) $(systemd_DATA) $(upstart_DATA)
++DATA = $(service_DATA)
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ am__DIST_COMMON = $(srcdir)/Makefile.in
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+@@ -327,21 +326,9 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ servicedir = @datarootdir@/dbus-1/services
+ service_DATA = org.ayatana.bamf.service
+-upstartdir = @datarootdir@/upstart/sessions
+-upstart_DATA = bamfdaemon.conf
+-systemddir = /usr/lib/systemd/user
+-systemd_DATA = bamfdaemon.service
+-bamfdaemondbusrunnerdir = $(pkglibexecdir)
+-bamfdaemondbusrunner_SCRIPTS = bamfdaemon-dbus-runner
+-EXTRA_DIST = org.ayatana.bamf.service.in \
+-             bamfdaemon.conf.in \
+-             bamfdaemon.service.in \
+-             bamfdaemon-dbus-runner.in
++EXTRA_DIST = org.ayatana.bamf.service.in
+ 
+-CLEANFILES = org.ayatana.bamf.service \
+-             bamfdaemon.conf \
+-             bamfdaemon.service \
+-             bamfdaemon-dbus-runner
++CLEANFILES = org.ayatana.bamf.service
+ 
+ all: all-am
+ 
+@@ -375,41 +362,6 @@ $(top_srcdir)/configure: @MAINTAINER_MOD
+ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ $(am__aclocal_m4_deps):
+-install-bamfdaemondbusrunnerSCRIPTS: $(bamfdaemondbusrunner_SCRIPTS)
+-	@$(NORMAL_INSTALL)
+-	@list='$(bamfdaemondbusrunner_SCRIPTS)'; test -n "$(bamfdaemondbusrunnerdir)" || list=; \
+-	if test -n "$$list"; then \
+-	  echo " $(MKDIR_P) '$(DESTDIR)$(bamfdaemondbusrunnerdir)'"; \
+-	  $(MKDIR_P) "$(DESTDIR)$(bamfdaemondbusrunnerdir)" || exit 1; \
+-	fi; \
+-	for p in $$list; do \
+-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+-	done | \
+-	sed -e 'p;s,.*/,,;n' \
+-	    -e 'h;s|.*|.|' \
+-	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
+-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
+-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+-	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
+-	      if (++n[d] == $(am__install_max)) { \
+-		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
+-	    else { print "f", d "/" $$4, $$1 } } \
+-	  END { for (d in files) print "f", d, files[d] }' | \
+-	while read type dir files; do \
+-	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+-	     test -z "$$files" || { \
+-	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bamfdaemondbusrunnerdir)$$dir'"; \
+-	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bamfdaemondbusrunnerdir)$$dir" || exit $$?; \
+-	     } \
+-	; done
+-
+-uninstall-bamfdaemondbusrunnerSCRIPTS:
+-	@$(NORMAL_UNINSTALL)
+-	@list='$(bamfdaemondbusrunner_SCRIPTS)'; test -n "$(bamfdaemondbusrunnerdir)" || exit 0; \
+-	files=`for p in $$list; do echo "$$p"; done | \
+-	       sed -e 's,.*/,,;$(transform)'`; \
+-	dir='$(DESTDIR)$(bamfdaemondbusrunnerdir)'; $(am__uninstall_files_from_dir)
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -437,48 +389,6 @@ uninstall-serviceDATA:
+ 	@list='$(service_DATA)'; test -n "$(servicedir)" || list=; \
+ 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ 	dir='$(DESTDIR)$(servicedir)'; $(am__uninstall_files_from_dir)
+-install-systemdDATA: $(systemd_DATA)
+-	@$(NORMAL_INSTALL)
+-	@list='$(systemd_DATA)'; test -n "$(systemddir)" || list=; \
+-	if test -n "$$list"; then \
+-	  echo " $(MKDIR_P) '$(DESTDIR)$(systemddir)'"; \
+-	  $(MKDIR_P) "$(DESTDIR)$(systemddir)" || 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)$(systemddir)'"; \
+-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(systemddir)" || exit $$?; \
+-	done
+-
+-uninstall-systemdDATA:
+-	@$(NORMAL_UNINSTALL)
+-	@list='$(systemd_DATA)'; test -n "$(systemddir)" || list=; \
+-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+-	dir='$(DESTDIR)$(systemddir)'; $(am__uninstall_files_from_dir)
+-install-upstartDATA: $(upstart_DATA)
+-	@$(NORMAL_INSTALL)
+-	@list='$(upstart_DATA)'; test -n "$(upstartdir)" || list=; \
+-	if test -n "$$list"; then \
+-	  echo " $(MKDIR_P) '$(DESTDIR)$(upstartdir)'"; \
+-	  $(MKDIR_P) "$(DESTDIR)$(upstartdir)" || 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)$(upstartdir)'"; \
+-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(upstartdir)" || exit $$?; \
+-	done
+-
+-uninstall-upstartDATA:
+-	@$(NORMAL_UNINSTALL)
+-	@list='$(upstart_DATA)'; test -n "$(upstartdir)" || list=; \
+-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+-	dir='$(DESTDIR)$(upstartdir)'; $(am__uninstall_files_from_dir)
+ tags TAGS:
+ 
+ ctags CTAGS:
+@@ -520,7 +430,7 @@ check-am: all-am
+ check: check-am
+ all-am: Makefile $(SCRIPTS) $(DATA)
+ installdirs:
+-	for dir in "$(DESTDIR)$(bamfdaemondbusrunnerdir)" "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(systemddir)" "$(DESTDIR)$(upstartdir)"; do \
++	for dir in "$(DESTDIR)$(bamfdaemondbusrunnerdir)" "$(DESTDIR)$(servicedir)"; do \
+ 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+@@ -575,7 +485,7 @@ info: info-am
+ info-am:
+ 
+ install-data-am: install-bamfdaemondbusrunnerSCRIPTS \
+-	install-serviceDATA install-systemdDATA install-upstartDATA
++	install-serviceDATA
+ 
+ install-dvi: install-dvi-am
+ 
+@@ -620,8 +530,7 @@ ps: ps-am
+ ps-am:
+ 
+ uninstall-am: uninstall-bamfdaemondbusrunnerSCRIPTS \
+-	uninstall-serviceDATA uninstall-systemdDATA \
+-	uninstall-upstartDATA
++	uninstall-serviceDATA
+ 
+ .MAKE: install-am install-strip
+ 
+@@ -633,13 +542,12 @@ uninstall-am: uninstall-bamfdaemondbusru
+ 	install-exec install-exec-am install-html install-html-am \
+ 	install-info install-info-am install-man install-pdf \
+ 	install-pdf-am install-ps install-ps-am install-serviceDATA \
+-	install-strip install-systemdDATA install-upstartDATA \
++	install-strip \
+ 	installcheck installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-generic \
+ 	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+ 	uninstall-am uninstall-bamfdaemondbusrunnerSCRIPTS \
+-	uninstall-serviceDATA uninstall-systemdDATA \
+-	uninstall-upstartDATA
++	uninstall-serviceDATA
+ 
+ .PRECIOUS: Makefile
+ 
+@@ -647,15 +555,6 @@ uninstall-am: uninstall-bamfdaemondbusru
+ org.ayatana.bamf.service: org.ayatana.bamf.service.in
+ 	$(AM_V_GEN)sed "s, at PKGLIBEXECDIR@,$(pkglibexecdir)," $< > $@
+ 
+-bamfdaemon.conf: bamfdaemon.conf.in
+-	$(AM_V_GEN)sed "s, at PKGLIBEXECDIR@,$(pkglibexecdir)," $< > $@
+-
+-bamfdaemon.service: bamfdaemon.service.in
+-	$(AM_V_GEN)sed "s, at PKGLIBEXECDIR@,$(pkglibexecdir)," $< > $@
+-
+-bamfdaemon-dbus-runner: bamfdaemon-dbus-runner.in
+-	$(AM_V_GEN)sed "s, at PKGLIBEXECDIR@,$(pkglibexecdir)," $< > $@
+-
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:

Added: head/sysutils/bamf/files/patch-data_org.ayatana.bamf.service.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/bamf/files/patch-data_org.ayatana.bamf.service.in	Mon Aug 29 19:59:33 2016	(r421095)
@@ -0,0 +1,8 @@
+--- data/org.ayatana.bamf.service.in.orig	2016-08-24 12:43:23 UTC
++++ data/org.ayatana.bamf.service.in
+@@ -1,4 +1,3 @@
+ [D-BUS Service]
+ Name=org.ayatana.bamf
+-Exec=@PKGLIBEXECDIR@/bamfdaemon-dbus-runner
+-SystemdService=bamfdaemon.service
++Exec=@PKGLIBEXECDIR@/bamfdaemon

Modified: head/sysutils/bamf/files/patch-lib__libbamf-private__Makefile.in
==============================================================================
--- head/sysutils/bamf/files/patch-lib__libbamf-private__Makefile.in	Mon Aug 29 19:55:47 2016	(r421094)
+++ head/sysutils/bamf/files/patch-lib__libbamf-private__Makefile.in	Mon Aug 29 19:59:33 2016	(r421095)
@@ -1,6 +1,6 @@
---- ./lib/libbamf-private/Makefile.in.orig	2013-08-30 16:26:20.552840000 +0000
-+++ ./lib/libbamf-private/Makefile.in	2014-08-02 15:33:08.000000000 +0000
-@@ -705,7 +705,7 @@
+--- lib/libbamf-private/Makefile.in.orig	2016-08-25 15:18:48 UTC
++++ lib/libbamf-private/Makefile.in
+@@ -723,7 +723,7 @@ bamf-gdbus-generated.c: org.ayatana.bamf
  	--interface-prefix org.ayatana.bamf \
  	$<; \
  	# Adding '_' prefix to generated private functions \
@@ -9,7 +9,7 @@
  	$@ $(shell basename $@ .c).h
  
  .NOTPARALLEL:
-@@ -717,7 +717,7 @@
+@@ -735,7 +735,7 @@ bamf-gdbus-view-generated.c: org.ayatana
  	--interface-prefix org.ayatana.bamf \
  	$<; \
  	# Adding '_' prefix to generated private functions \

More information about the svn-ports-head mailing list