[Midnightbsd-cvs] mports [17580] trunk/x11-toolkits/gtk20: move things around

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Sep 27 12:47:31 EDT 2014 

Revision: 17580
          http://svnweb.midnightbsd.org/mports/?rev=17580
Author:   laffer1
Date:     2014-09-27 12:47:30 -0400 (Sat, 27 Sep 2014)
Log Message:
-----------
move things around

Modified Paths:
--------------
    trunk/x11-toolkits/gtk20/Makefile

Added Paths:
-----------
    trunk/x11-toolkits/gtk20/files/patch-docs_Makefile.in
    trunk/x11-toolkits/gtk20/files/patch-docs_reference_Makefile.in
    trunk/x11-toolkits/gtk20/files/patch-gdk_Makefile.in

Removed Paths:
-------------
    trunk/x11-toolkits/gtk20/files/patch-ah
    trunk/x11-toolkits/gtk20/files/patch-ai
    trunk/x11-toolkits/gtk20/files/patch-ak

Modified: trunk/x11-toolkits/gtk20/Makefile
===================================================================
--- trunk/x11-toolkits/gtk20/Makefile	2014-09-27 16:39:14 UTC (rev 17579)
+++ trunk/x11-toolkits/gtk20/Makefile	2014-09-27 16:47:30 UTC (rev 17580)
@@ -14,9 +14,10 @@
 
 LICENSE=	lgpl
 
+USES=		tar:xz
+
 .if !defined(REFERENCE_PORT)
 
-BUILD_DEPENDS+=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 RUN_DEPENDS+=	${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \
 		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
 
@@ -23,9 +24,8 @@
 USE_PERL5_BUILD=yes
 USE_PYTHON=	2.5-2.7
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool
-USE_GNOME=	atk pango gdkpixbuf2 ltverhack gtk-update-icon-cache
-USES=		gettext gmake pathfix pkgconfig tar:xz
+USE_GNOME=	atk pango gdkpixbuf2 gtk-update-icon-cache introspection:build
+USES+=		gettext gmake libtool:keepla pathfix pkgconfig
 USE_XORG=	xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
 		xcomposite xau xdmcp xproto
 CONFIGURE_ARGS=	--with-xinput=yes
@@ -36,23 +36,13 @@
 OPTIONS_DEFINE=	CUPS DEBUG
 OPTIONS_DEFAULT=CUPS
 
-.include <bsd.mport.options.mk>
+CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client
+CUPS_CONFIGURE_ON=	--enable-cups=auto
+CUPS_CONFIGURE_OFF=	--disable-cups
+DEBUG_CONFIGURE_ON=	--enable-debug=yes
 
-.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}
-CONFIGURE_ARGS+=--enable-debug=yes
-.endif
-
 post-patch:
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${GREP} -l lgmodule | \
+	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${GREP} -l lgmodule | \
 		${XARGS} ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g'
 	@${REINPLACE_CMD} -e 's|[{]libdir[}]/locale|{datadir}/locale|g' \
 		${WRKSRC}/configure

Deleted: trunk/x11-toolkits/gtk20/files/patch-ah
===================================================================
--- trunk/x11-toolkits/gtk20/files/patch-ah	2014-09-27 16:39:14 UTC (rev 17579)
+++ trunk/x11-toolkits/gtk20/files/patch-ah	2014-09-27 16:47:30 UTC (rev 17580)
@@ -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@

Deleted: trunk/x11-toolkits/gtk20/files/patch-ai
===================================================================
--- trunk/x11-toolkits/gtk20/files/patch-ai	2014-09-27 16:39:14 UTC (rev 17579)
+++ trunk/x11-toolkits/gtk20/files/patch-ai	2014-09-27 16:47:30 UTC (rev 17580)
@@ -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
- 

Deleted: trunk/x11-toolkits/gtk20/files/patch-ak
===================================================================
--- trunk/x11-toolkits/gtk20/files/patch-ak	2014-09-27 16:39:14 UTC (rev 17579)
+++ trunk/x11-toolkits/gtk20/files/patch-ak	2014-09-27 16:47:30 UTC (rev 17580)
@@ -1,11 +0,0 @@
---- gdk/Makefile.in.orig	Thu Feb 14 12:38:26 2002
-+++ gdk/Makefile.in	Thu Feb 14 12:45:37 2002
-@@ -315,7 +315,7 @@
- #
- # Rule to install gdkconfig.h header file
- #
--configexecincludedir = $(libdir)/gtk-2.0/include
-+configexecincludedir = $(prefix)/include/gtk-2.0
- 
- #note: not gdkconfig.h
- BUILT_SOURCES = stamp-gc-h @REBUILD@ gdkenumtypes.c gdkenumtypes.h

Copied: trunk/x11-toolkits/gtk20/files/patch-docs_Makefile.in (from rev 17568, trunk/x11-toolkits/gtk20/files/patch-ah)
===================================================================
--- trunk/x11-toolkits/gtk20/files/patch-docs_Makefile.in	                        (rev 0)
+++ trunk/x11-toolkits/gtk20/files/patch-docs_Makefile.in	2014-09-27 16:47:30 UTC (rev 17580)
@@ -0,0 +1,11 @@
+--- 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@

Copied: trunk/x11-toolkits/gtk20/files/patch-docs_reference_Makefile.in (from rev 17568, trunk/x11-toolkits/gtk20/files/patch-ai)
===================================================================
--- trunk/x11-toolkits/gtk20/files/patch-docs_reference_Makefile.in	                        (rev 0)
+++ trunk/x11-toolkits/gtk20/files/patch-docs_reference_Makefile.in	2014-09-27 16:47:30 UTC (rev 17580)
@@ -0,0 +1,11 @@
+--- 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
+ 

Copied: trunk/x11-toolkits/gtk20/files/patch-gdk_Makefile.in (from rev 17568, trunk/x11-toolkits/gtk20/files/patch-ak)
===================================================================
--- trunk/x11-toolkits/gtk20/files/patch-gdk_Makefile.in	                        (rev 0)
+++ trunk/x11-toolkits/gtk20/files/patch-gdk_Makefile.in	2014-09-27 16:47:30 UTC (rev 17580)
@@ -0,0 +1,11 @@
+--- gdk/Makefile.in.orig	Thu Feb 14 12:38:26 2002
++++ gdk/Makefile.in	Thu Feb 14 12:45:37 2002
+@@ -315,7 +315,7 @@
+ #
+ # Rule to install gdkconfig.h header file
+ #
+-configexecincludedir = $(libdir)/gtk-2.0/include
++configexecincludedir = $(prefix)/include/gtk-2.0
+ 
+ #note: not gdkconfig.h
+ BUILT_SOURCES = stamp-gc-h @REBUILD@ gdkenumtypes.c gdkenumtypes.h

More information about the Midnightbsd-cvs mailing list