Attachment #210930 for bug #243490




# $FreeBSD$

PORTNAME=	bamf
PORTVERSION=	0.5.4
PORTREVISION=	2
CATEGORIES=	sysutils
MASTER_SITES=	https://launchpadlibrarian.net/280921055/ \
	https://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}/+download/

	${PYTHON_PKGNAMEPREFIX}libxml2>=2.8.0:textproc/py-libxml2@${PY_FLAVOR} \
	${PYTHON_PKGNAMEPREFIX}libxslt>=1.1.28:textproc/py-libxslt@${PY_FLAVOR}
LIB_DEPENDS=	libgtop-2.0.so:devel/libgtop \
	libdbus-glib-1.so:devel/dbus-glib \
	libstartup-notification-1.so:x11/startup-notification

USES=		gettext-runtime gmake gnome libtool pathfix pkgconfig \
		python:2.7,build xorg
GNU_CONFIGURE=	yes
USE_GNOME=	gtk30 glib20 introspection:build libwnck3 cairo gdkpixbuf2
USE_XORG=	x11


CONFIGURE_ARGS+=--disable-headless-tests \
	--disable-gtktest \
	--disable-gcov \
	--disable-gtk-doc-html \
	--without-html-dir \
	--enable-export-actions-menu=no \
	--enable-introspection=yes

post-patch:
	${FIND} ${WRKSRC} -type f -name 'Makefile.in' \

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1472504601	1	TIMESTAMP = 1579354448
2	SHA256 (bamf-0.5.3.tar.gz) = 340d7b5a463afcd33135ae73a7e4cf6a93a4daaf6f72b70abc09dc66d18a3b14	2	SHA256 (bamf-0.5.4.tar.gz) = 5bb87a5bf46ab1fc9a229a851c0ee4f610d943716a7c83d318f6a8f50d76beb3
3	SIZE (bamf-0.5.3.tar.gz) = 633666	3	SIZE (bamf-0.5.4.tar.gz) = 638756

Lines 1-11 Link Here

(-)files/patch-configure (-4 / +4 lines)
1	--- configure.orig 2016-08-25 15:18:48 UTC	1	--- configure.orig 2018-11-07 22:39:51 UTC
2	+++ configure	2	+++ configure
3	@@ -15233,7 +15233,7 @@ rm -f core conftest.err conftest.$ac_obj	3	@@ -15374,7 +15374,7 @@ rm -f core conftest.err conftest.$ac_objext \
4	rm -f conf.gtktest	4	rm -f conf.gtktest
5		5
6		6
7	-CFLAGS="$CFLAGS -Wall -Werror -Wempty-body -Wformat-security -Winit-self -Warray-bounds -Wimplicit-function-declaration -lm"	7	-CFLAGS="$CFLAGS -Wall -Werror -Wno-error=deprecated-declarations -Wempty-body -Wformat-security -Winit-self -Warray-bounds -Wimplicit-function-declaration -lm"
8	+CFLAGS="$CFLAGS -Wall -Wformat-security -Winit-self -Wimplicit-function-declaration"	8	+CFLAGS="$CFLAGS -Wall -Winit-self -Warray-bounds -Wimplicit-function-declaration"
9		9
10		10
11		11




--- 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 \
-	$(SED) "s/bamf_dbus/_bamf_dbus/g" -i \
+	$(SED) -i "" "s/bamf_dbus/_bamf_dbus/g" \
 	$@ $(shell basename $@ .c).h
 
 .NOTPARALLEL:
@@ -735,7 +735,7 @@ bamf-gdbus-view-generated.c: org.ayatana
 	--interface-prefix org.ayatana.bamf \
 	$<; \
 	# Adding '_' prefix to generated private functions \
-	$(SED) "s/bamf_dbus_item/_bamf_dbus_item/g" -i \
+	$(SED) -i "" "s/bamf_dbus_item/_bamf_dbus_item/g" \
 	$@ $(shell basename $@ .c).h
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.




--- lib/libbamf-private/Makefile.in.orig	2018-11-07 22:39:52 UTC
+++ lib/libbamf-private/Makefile.in
@@ -736,7 +736,7 @@ bamf-gdbus-generated.c: org.ayatana.bamf.xml
 	--interface-prefix org.ayatana.bamf \
 	$<; \
 	# Adding '_' prefix to generated private functions \
-	$(SED) "s/bamf_dbus/_bamf_dbus/g" -i \
+	$(SED) -i '' -e "s/bamf_dbus/_bamf_dbus/g" \
 	$@ $(shell basename $@ .c).h
 
 .NOTPARALLEL:
@@ -748,7 +748,7 @@ bamf-gdbus-view-generated.c: org.ayatana.bamf.view.xml
 	--interface-prefix org.ayatana.bamf \
 	$<; \
 	# Adding '_' prefix to generated private functions \
-	$(SED) "s/bamf_dbus_item/_bamf_dbus_item/g" -i \
+	$(SED) -i '' -e "s/bamf_dbus_item/_bamf_dbus_item/g" \
 	$@ $(shell basename $@ .c).h
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

Return to bug 243490

Lines 2-9 Link Here

(-)Makefile (-5 / +6 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= bamf	4	PORTNAME= bamf
5	PORTVERSION= 0.5.3	5	PORTVERSION= 0.5.4
6	PORTREVISION= 2
7	CATEGORIES= sysutils	6	CATEGORIES= sysutils
8	MASTER_SITES= https://launchpadlibrarian.net/280921055/ \	7	MASTER_SITES= https://launchpadlibrarian.net/280921055/ \
9	https://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}/+download/	8	https://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}/+download/
Lines 18-28 Link Here
18	${PYTHON_PKGNAMEPREFIX}libxml2>=2.8.0:textproc/py-libxml2@${PY_FLAVOR} \	17	${PYTHON_PKGNAMEPREFIX}libxml2>=2.8.0:textproc/py-libxml2@${PY_FLAVOR} \
19	${PYTHON_PKGNAMEPREFIX}libxslt>=1.1.28:textproc/py-libxslt@${PY_FLAVOR}	18	${PYTHON_PKGNAMEPREFIX}libxslt>=1.1.28:textproc/py-libxslt@${PY_FLAVOR}
20	LIB_DEPENDS= libgtop-2.0.so:devel/libgtop \	19	LIB_DEPENDS= libgtop-2.0.so:devel/libgtop \
21	libdbus-glib-1.so:devel/dbus-glib \
22	libstartup-notification-1.so:x11/startup-notification	20	libstartup-notification-1.so:x11/startup-notification
23		21
24	USES= gettext-runtime gmake gnome libtool pathfix pkgconfig \	22	USES= gettext-runtime gmake gnome libtool pathfix pkgconfig \
25	python:2.7 xorg	23	python:2.7,build xorg
26	GNU_CONFIGURE= yes	24	GNU_CONFIGURE= yes
27	USE_GNOME= gtk30 glib20 introspection:build libwnck3 cairo gdkpixbuf2	25	USE_GNOME= gtk30 glib20 introspection:build libwnck3 cairo gdkpixbuf2
28	USE_XORG= x11	26	USE_XORG= x11
Lines 30-37 Link Here
30		28
31	CONFIGURE_ARGS+=--disable-headless-tests \	29	CONFIGURE_ARGS+=--disable-headless-tests \
32	--disable-gtktest \	30	--disable-gtktest \
		31	--disable-gcov \
33	--disable-gtk-doc-html \	32	--disable-gtk-doc-html \
34	--without-html-dir	33	--without-html-dir \
		34	--enable-export-actions-menu=no \
		35	--enable-introspection=yes
35		36
36	post-patch:	37	post-patch:
37	${FIND} ${WRKSRC} -type f -name 'Makefile.in' \	38	${FIND} ${WRKSRC} -type f -name 'Makefile.in' \

Lines 1-20 Link Here

(-)files/patch-lib__libbamf-private__Makefile.in (-20 lines)
1	--- lib/libbamf-private/Makefile.in.orig 2016-08-25 15:18:48 UTC
2	+++ lib/libbamf-private/Makefile.in
3	@@ -723,7 +723,7 @@ bamf-gdbus-generated.c: org.ayatana.bamf
4	--interface-prefix org.ayatana.bamf \
5	$<; \
6	# Adding '_' prefix to generated private functions \
7	- $(SED) "s/bamf_dbus/_bamf_dbus/g" -i \
8	+ $(SED) -i "" "s/bamf_dbus/_bamf_dbus/g" \
9	$@ $(shell basename $@ .c).h
10
11	.NOTPARALLEL:
12	@@ -735,7 +735,7 @@ bamf-gdbus-view-generated.c: org.ayatana
13	--interface-prefix org.ayatana.bamf \
14	$<; \
15	# Adding '_' prefix to generated private functions \
16	- $(SED) "s/bamf_dbus_item/_bamf_dbus_item/g" -i \
17	+ $(SED) -i "" "s/bamf_dbus_item/_bamf_dbus_item/g" \
18	$@ $(shell basename $@ .c).h
19
20	# Tell versions [3.59,3.63) of GNU make to not export all variables.

Line 0 Link Here

(-)files/patch-lib_libbamf-private_Makefile.in (+20 lines)
	1	--- lib/libbamf-private/Makefile.in.orig 2018-11-07 22:39:52 UTC
	2	+++ lib/libbamf-private/Makefile.in
	3	@@ -736,7 +736,7 @@ bamf-gdbus-generated.c: org.ayatana.bamf.xml
	4	--interface-prefix org.ayatana.bamf \
	5	$<; \
	6	# Adding '_' prefix to generated private functions \
	7	- $(SED) "s/bamf_dbus/_bamf_dbus/g" -i \
	8	+ $(SED) -i '' -e "s/bamf_dbus/_bamf_dbus/g" \
	9	$@ $(shell basename $@ .c).h
	10
	11	.NOTPARALLEL:
	12	@@ -748,7 +748,7 @@ bamf-gdbus-view-generated.c: org.ayatana.bamf.view.xml
	13	--interface-prefix org.ayatana.bamf \
	14	$<; \
	15	# Adding '_' prefix to generated private functions \
	16	- $(SED) "s/bamf_dbus_item/_bamf_dbus_item/g" -i \
	17	+ $(SED) -i '' -e "s/bamf_dbus_item/_bamf_dbus_item/g" \
	18	$@ $(shell basename $@ .c).h
	19
	20	# Tell versions [3.59,3.63) of GNU make to not export all variables.