svn commit: r340044 - head/x11/xterm
Emanuel Haupt
ehaupt at FreeBSD.org
Fri Jan 17 14:25:55 UTC 2014
Author: ehaupt
Date: Fri Jan 17 14:25:54 2014
New Revision: 340044
URL: http://svnweb.freebsd.org/changeset/ports/340044
QAT: https://qat.redports.org/buildarchive/r340044/
Log:
Use new dependency macros based on options.
Submitted by: bapt
Modified:
head/x11/xterm/Makefile
Modified: head/x11/xterm/Makefile
==============================================================================
--- head/x11/xterm/Makefile Fri Jan 17 14:11:32 2014 (r340043)
+++ head/x11/xterm/Makefile Fri Jan 17 14:25:54 2014 (r340044)
@@ -37,46 +37,18 @@ WCHAR_DESC= Enable wide-character suppor
OPTIONS_DEFAULT=WCHAR LUIT 256COLOR
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:M256COLOR}
-CONFIGURE_ARGS+= --enable-256-color
-.endif
-
-.if ${PORT_OPTIONS:MLUIT}
-CONFIGURE_ARGS+= --enable-luit
-BUILD_DEPENDS= luit:${PORTSDIR}/x11/luit
-.endif
-
-.if ${PORT_OPTIONS:MWCHAR}
-CONFIGURE_ARGS+= --enable-wide-chars
-.endif
-
-.if ${PORT_OPTIONS:MDECTERM}
-CONFIGURE_ARGS+= --enable-dec-locator
-.endif
+256COLOR_CONFIGURE_ENABLE= 256-color
+LUIT_BUILD_DEPENDS= libluit.so:${PORTSDIR}/x11/luit
+LUIT_CONFIGURE_ENABLE= luit
+WCHAR_CONFIGURE_ENABLE= wide-chars
+DECTERM_CONFIGURE_ENABLE= dec-locator
+PCRE_CONFIGURE_WITH= pcre
+PCRE_LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre
+DABBREV_CONFIGURE_ENABLE= dabbrev
+SIXEL_CONFIGURE_ENABLE= sixel-graphics
+GNOME_USES= desktop-file-utils
-.if ${PORT_OPTIONS:MPCRE}
-CONFIGURE_ARGS+= --with-pcre
-LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre
-.endif
-
-.if ${PORT_OPTIONS:MDABBREV}
-CONFIGURE_ARGS+= --enable-dabbrev
-.endif
-
-.if ${PORT_OPTIONS:MSIXEL}
-CONFIGURE_ARGS+= --enable-sixel-graphics
-.endif
-
-.if ${PORT_OPTIONS:MGNOME}
-USE_GNOME= desktopfileutils
-PLIST_SUB+= GNOME=""
-.else
-PLIST_SUB+= GNOME="@comment "
-.endif
-
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
.if ${OSVERSION} < 900004
LIB_DEPENDS+= utempter:${PORTSDIR}/sysutils/libutempter
@@ -91,12 +63,9 @@ post-install:
@${CHMOD} ${BINMODE} ${STAGEDIR}${PREFIX}/bin/${f}
.endfor
@${INSTALL_DATA} ${WRKSRC}/xterm.desktop ${STAGEDIR}${PREFIX}/share/applications/
-.if ${PORT_OPTIONS:MGNOME}
- @-update-desktop-database
-.endif
.if ${PORT_OPTIONS:MWCHAR}
@${CAT} ${PKGMESSAGE}
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
More information about the svn-ports-all
mailing list