svn commit: r343538 - head/x11-toolkits/gtk20

[Alexey Dokuchaev]

Author: danfe
Date: Sun Feb  9 20:10:02 2014
New Revision: 343538
URL: http://svnweb.freebsd.org/changeset/ports/343538
QAT: https://qat.redports.org/buildarchive/r343538/

Log:
  Modernize and cleanup the port a bit:
  - Sort the USES and USE_* knobs; utilize these nifty OPTIONS helpers
  - Drop superfluous quotes, so the line fits in 80-char screen
  
  Approved by:	silence from gnome@ (since Jan 21th)

Modified:
  head/x11-toolkits/gtk20/Makefile
  head/x11-toolkits/gtk20/pkg-plist

Modified: head/x11-toolkits/gtk20/Makefile
==============================================================================
--- head/x11-toolkits/gtk20/Makefile	Sun Feb  9 18:55:35 2014	(r343537)
+++ head/x11-toolkits/gtk20/Makefile	Sun Feb  9 20:10:02 2014	(r343538)
@@ -27,11 +27,11 @@ RUN_DEPENDS+=	${LOCALBASE}/share/mime/ma
 		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
 		python:${PORTSDIR}/lang/python
 
-USE_LDCONFIG=	yes
+USES=		gettext gmake pathfix perl5 pkgconfig
 GNU_CONFIGURE=	yes
 USE_GNOME=	atk pango gdkpixbuf2 introspection:build ltverhack \
 		gtk-update-icon-cache
-USES=		gettext gmake pathfix pkgconfig perl5
+USE_LDCONFIG=	yes
 USE_PERL5=	build
 USE_XORG=	xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
 		xcomposite
@@ -41,24 +41,17 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	CUPS DEBUG
 OPTIONS_DEFAULT=CUPS
+OPTIONS_SUB=	yes
 
-.include <bsd.port.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+=	libcups.so:${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
+.include <bsd.port.options.mk>
 
 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

Modified: head/x11-toolkits/gtk20/pkg-plist
==============================================================================
--- head/x11-toolkits/gtk20/pkg-plist	Sun Feb  9 18:55:35 2014	(r343537)
+++ head/x11-toolkits/gtk20/pkg-plist	Sun Feb  9 20:10:02 2014	(r343538)
@@ -288,8 +288,8 @@ lib/gtk-2.0/%%GTK2_VERSION%%/immodules/i
 lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-viqr.so
 lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-xim.la
 lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-xim.so
-%%CUPS:%%lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-cups.la
-%%CUPS:%%lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-cups.so
+%%CUPS%%lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-cups.la
+%%CUPS%%lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-cups.so
 lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-file.la
 lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-file.so
 lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-lpr.la