aboutsummaryrefslogtreecommitdiff
path: root/x11-toolkits/gtk20
diff options
context:
space:
mode:
authorAlexey Dokuchaev <danfe@FreeBSD.org>2014-02-09 20:10:02 +0000
committerAlexey Dokuchaev <danfe@FreeBSD.org>2014-02-09 20:10:02 +0000
commit3147edde9ef5f9081b87580785c41d13740a025f (patch)
tree04459e637613113b1d162e69efec00a7d8399ba7 /x11-toolkits/gtk20
parent6c6c15821da6e6021f524c12df89c5db69b9bdad (diff)
downloadports-3147edde9ef5f9081b87580785c41d13740a025f.tar.gz
ports-3147edde9ef5f9081b87580785c41d13740a025f.zip
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)
Notes
Notes: svn path=/head/; revision=343538
Diffstat (limited to 'x11-toolkits/gtk20')
-rw-r--r--x11-toolkits/gtk20/Makefile25
-rw-r--r--x11-toolkits/gtk20/pkg-plist4
2 files changed, 11 insertions, 18 deletions
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 97075e709298..9a3bc264b0ff 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -27,11 +27,11 @@ RUN_DEPENDS+= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \
${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
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index 606281f3fb6a..b46cb0b1c3f1 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -288,8 +288,8 @@ lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-viqr.la
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