[PATCH] x11-toolkits/gtk30: Remove simple patches, trim pkg-plist

nemysis nemysis at gmx.ch
Fri Aug 9 23:55:02 UTC 2013 

>Submitter-Id:	current-users
>Originator:	nemysis
>Organization:	
>Confidential:	no 
>Synopsis:	[PATCH] x11-toolkits/gtk30: Remove simple patches, trim pkg-plist
>Severity:	non-critical
>Priority:	low
>Category:	ports 
>Class:		change-request
>Release:	FreeBSD 9.1-RELEASE-p17 amd64
>Environment:
System: FreeBSD FreeBSD_Ports 9.1-RELEASE-p17 FreeBSD 9.1-RELEASE-p17 #0: Sun Jul 28 00:39:53 UTC 2013
>Description:

- Add OPTIONS_SUB
- Use REINPLACE_CMD instead of simple patches
- Trim pkg-plist

Removed file(s):
files/patch-Makefile.in
files/patch-docs_Makefile.in
files/patch-docs_reference_Makefile.in
files/patch-docs_reference_gtk_Makefile.in

Port maintainer (gnome at FreeBSD.org) is cc'd.

Generated and tested manually, tested with port test and with RedPorts, sent with FreeBSD Port Tools 0.99_8 (mode: change, diff: ports)
>How-To-Repeat:

Build log

https://redports.org/buildarchive/20130803234701-59965/

>Fix:

--- gtk-3.8.2.patch begins here ---
diff -ruN /usr/ports/x11-toolkits/gtk30/Makefile ./Makefile
--- /usr/ports/x11-toolkits/gtk30/Makefile	2013-07-31 22:09:12.000000000 +0200
+++ ./Makefile	2013-08-04 00:28:53.000000000 +0200
@@ -19,7 +19,7 @@
 USE_XZ=		yes
 LATEST_LINK=	gtk30
 
-.if !defined(REFERENCE_PORT)
+.if ! defined(REFERENCE_PORT)
 
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/atk-bridge-2.0.pc:${PORTSDIR}/accessibility/at-spi2-atk
 BUILD_DEPENDS+=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
@@ -49,16 +49,15 @@
 OPTIONS_DEFINE=	CUPS COLORD DEBUG
 OPTIONS_DEFAULT=CUPS COLORD
 COLORD_DESC=	Color profile support
+OPTIONS_SUB=	yes
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCUPS}
 LIB_DEPENDS+=	cups:${PORTSDIR}/print/cups-client
 CONFIGURE_ARGS+=--enable-cups=auto
-PLIST_SUB+=	CUPS=""
 .else
 CONFIGURE_ARGS+=--disable-cups
-PLIST_SUB+=	CUPS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MDEBUG}
@@ -75,6 +74,14 @@
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${GREP} -l lgmodule | \
 		${XARGS} ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g'
+	@${REINPLACE_CMD} -e 's|demos tests perf|demos perf|' \
+		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|@MAKEINFO@|@MAKEINFO@ --no-split|' \
+		${WRKSRC}/docs/Makefile.in
+	@${REINPLACE_CMD} -e 's|gdk gtk libgail-util|#gdk gtk libgail-util|' \
+		${WRKSRC}/docs/reference/Makefile.in
+	@${REINPLACE_CMD} -i '' -e '/gtk-update-icon-cache.1/d' \
+		${WRKSRC}/docs/reference/gtk/Makefile.in
 	@${REINPLACE_CMD} -e 's|[{]libdir[}]/locale|{datadir}/locale|g' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|@LN_S@|${LN} -sf|' ${WRKSRC}/gtk/Makefile.in
@@ -82,7 +89,7 @@
 		${WRKSRC}/gtk/Makefile.in
 
 pre-configure:
-.if !exists(${LOCALBASE}/libdata/pkgconfig/cairo-xlib.pc)
+.if ! exists(${LOCALBASE}/libdata/pkgconfig/cairo-xlib.pc)
 	@${ECHO_CMD} "${PKGNAME}: Needs cairo with X11 support enabled."
 	@${FALSE}
 .endif
diff -ruN /usr/ports/x11-toolkits/gtk30/files/patch-Makefile.in ./files/patch-Makefile.in
--- /usr/ports/x11-toolkits/gtk30/files/patch-Makefile.in	2013-06-02 18:55:04.000000000 +0200
+++ ./files/patch-Makefile.in	1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2011-09-15 18:04:34.000000000 +0200
-+++ Makefile.in	2011-09-15 18:05:12.000000000 +0200
-@@ -422,7 +422,7 @@
- 	|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
- 	&& DISPLAY=:$$XID && export DISPLAY
- 
--SRC_SUBDIRS = gdk gtk libgail-util modules demos tests perf examples
-+SRC_SUBDIRS = gdk gtk libgail-util modules demos perf examples
- SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
- ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
- MAINTAINERCLEANFILES = \
diff -ruN /usr/ports/x11-toolkits/gtk30/files/patch-docs_Makefile.in ./files/patch-docs_Makefile.in
--- /usr/ports/x11-toolkits/gtk30/files/patch-docs_Makefile.in	2013-06-02 18:55:04.000000000 +0200
+++ ./files/patch-docs_Makefile.in	1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
---- docs/Makefile.in.orig	2010-12-24 00:14:51.000000000 +0100
-+++ docs/Makefile.in	2010-12-24 00:15:52.000000000 +0100
-@@ -220,7 +220,7 @@
- LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
- LT_VERSION_INFO = @LT_VERSION_INFO@
- MAINT = @MAINT@
--MAKEINFO = @MAKEINFO@
-+MAKEINFO = @MAKEINFO@ --no-split
- MANIFEST_TOOL = @MANIFEST_TOOL@
- MATH_LIB = @MATH_LIB@
- MKDIR_P = @MKDIR_P@
diff -ruN /usr/ports/x11-toolkits/gtk30/files/patch-docs_reference_Makefile.in ./files/patch-docs_reference_Makefile.in
--- /usr/ports/x11-toolkits/gtk30/files/patch-docs_reference_Makefile.in	2013-06-02 18:55:04.000000000 +0200
+++ ./files/patch-docs_reference_Makefile.in	1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
---- docs/reference/Makefile.in.orig	2010-06-27 12:22:03.000000000 +0200
-+++ docs/reference/Makefile.in	2010-06-27 12:22:37.000000000 +0200
-@@ -354,7 +354,7 @@
- 	|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
- 	&& DISPLAY=:$$XID && export DISPLAY
- 
--SUBDIRS = gdk gtk libgail-util
-+SUBDIRS = #gdk gtk libgail-util
- GITIGNOREFILES = */*.1
- all: all-recursive
- 
diff -ruN /usr/ports/x11-toolkits/gtk30/files/patch-docs_reference_gtk_Makefile.in ./files/patch-docs_reference_gtk_Makefile.in
--- /usr/ports/x11-toolkits/gtk30/files/patch-docs_reference_gtk_Makefile.in	2013-07-31 22:09:12.000000000 +0200
+++ ./files/patch-docs_reference_gtk_Makefile.in	1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
---- docs/reference/gtk/Makefile.in.orig	2013-03-28 10:39:58.000000000 +0000
-+++ docs/reference/gtk/Makefile.in	2013-03-28 10:43:09.000000000 +0000
-@@ -852,7 +852,6 @@
- ########################################################################
- man_MANS = \
- 	gtk-query-immodules-3.0.1	\
--	gtk-update-icon-cache.1		\
- 	gtk-launch.1			\
- 	broadwayd.1
- 
diff -ruN /usr/ports/x11-toolkits/gtk30/pkg-plist ./pkg-plist
--- /usr/ports/x11-toolkits/gtk30/pkg-plist	2013-07-31 22:09:12.000000000 +0200
+++ ./pkg-plist	2013-08-04 01:15:05.000000000 +0200
@@ -719,6 +719,7 @@
 @exec /bin/mkdir -p %D/lib/gtk-3.0/modules
 @exec /bin/mkdir -p %D/lib/gtk-3.0/%%GTK3_VERSION%%/engines
 @exec /bin/mkdir -p %D/lib/gtk-3.0/%%GTK3_VERSION%%/loaders
+ at dirrm share/gtk-3.0
 @dirrm lib/gtk-3.0/modules
 @dirrm lib/gtk-3.0/%%GTK3_VERSION%%/printbackends
 @dirrm lib/gtk-3.0/%%GTK3_VERSION%%/loaders
--- gtk-3.8.2.patch ends here ---

More information about the freebsd-gnome mailing list