[Midnightbsd-cvs] mports [16119] trunk/x11/xterm: xterm 303

[laffer1 at midnightbsd.org]

Revision: 16119
          http://svnweb.midnightbsd.org/mports/?rev=16119
Author:   laffer1
Date:     2014-04-06 17:26:49 -0400 (Sun, 06 Apr 2014)
Log Message:
-----------
xterm 303

Modified Paths:
--------------
    trunk/x11/xterm/Makefile
    trunk/x11/xterm/distinfo
    trunk/x11/xterm/pkg-plist

Modified: trunk/x11/xterm/Makefile
===================================================================
--- trunk/x11/xterm/Makefile	2014-04-06 21:24:07 UTC (rev 16118)
+++ trunk/x11/xterm/Makefile	2014-04-06 21:26:49 UTC (rev 16119)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	xterm
-PORTVERSION=	302
+PORTVERSION=	303
 CATEGORIES=	x11
 MASTER_SITES=	ftp://invisible-island.net/xterm/:src1 \
 		CRITICAL:src1 CRITICAL:src2
@@ -17,7 +17,6 @@
 CONFLICTS=	x11iraf-[0-9]*
 
 USE_XORG=	xaw xft
-WANT_GNOME=	desktopfileutils
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
@@ -27,7 +26,7 @@
 
 ICONVERSION=	1
 
-OPTIONS_DEFINE=	WCHAR LUIT DECTERM PCRE GNOME DABBREV 256COLOR SIXEL
+OPTIONS_DEFINE=	WCHAR LUIT DECTERM PCRE DABBREV 256COLOR SIXEL GNOME
 
 DABBREV_DESC=	Enable support for dabbrev-expand
 DECTERM_DESC=	Enable DECterm Locator support
@@ -38,56 +37,27 @@
 
 OPTIONS_DEFAULT=WCHAR LUIT 256COLOR
 
+256COLOR_CONFIGURE_ENABLE=	256-color
+LUIT_BUILD_DEPENDS=		luit:${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
+
 .include <bsd.mport.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
-
-.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
-
-MAN1=		resize.1 koi8rxterm.1 uxterm.1 xterm.1
-
-.include <bsd.port.pre.mk>
-
 .if ${OSVERSION} < 4015
-LIB_DEPENDS+=	utempter:${PORTSDIR}/sysutils/libutempter
+LIB_DEPENDS+=	libutempter.so:${PORTSDIR}/sysutils/libutempter
 .endif
 
 post-extract:
-	@${CP} ${WRKDIR}/bsd-xterm-icons-1/*.png ${WRKDIR}/bsd-xterm-icons-1/*.xpm \
-		${WRKSRC}/icons/
+	@${CP} ${WRKDIR}/bsd-xterm-icons-1/*.png \
+		${WRKDIR}/bsd-xterm-icons-1/*.xpm \
+			${WRKSRC}/icons/
 
 post-install:
 .for f in koi8rxterm resize uxterm xterm
@@ -96,4 +66,4 @@
 	@${MKDIR} ${PREFIX}/share/applications/
 	@${INSTALL_DATA} ${WRKSRC}/xterm.desktop ${PREFIX}/share/applications/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: trunk/x11/xterm/distinfo
===================================================================
--- trunk/x11/xterm/distinfo	2014-04-06 21:24:07 UTC (rev 16118)
+++ trunk/x11/xterm/distinfo	2014-04-06 21:26:49 UTC (rev 16119)
@@ -1,4 +1,4 @@
-SHA256 (xterm-302.tgz) = cc135afb68e7d37df943a71351f612b56a4b383ea0b9d5b2a5413a21b3098244
-SIZE (xterm-302.tgz) = 1128391
+SHA256 (xterm-303.tgz) = 8af29987bda9b77205ebf6233aaa5c347e5f2407310b62ac9ba92a658257f058
+SIZE (xterm-303.tgz) = 1129416
 SHA256 (bsd-xterm-icons-1.tgz) = fcf51dce0e23e9911a16ed7f2ce835bb6ff2ada65f023c29fdd8abda2795bf7c
 SIZE (bsd-xterm-icons-1.tgz) = 22718

Modified: trunk/x11/xterm/pkg-plist
===================================================================
--- trunk/x11/xterm/pkg-plist	2014-04-06 21:24:07 UTC (rev 16118)
+++ trunk/x11/xterm/pkg-plist	2014-04-06 21:26:49 UTC (rev 16119)
@@ -8,6 +8,10 @@
 lib/X11/app-defaults/UXTerm-color
 lib/X11/app-defaults/XTerm
 lib/X11/app-defaults/XTerm-color
+man/man1/resize.1.gz
+man/man1/koi8rxterm.1.gz
+man/man1/uxterm.1.gz
+man/man1/xterm.1.gz
 share/applications/xterm.desktop
 share/pixmaps/filled-xterm_32x32.xpm
 share/pixmaps/filled-xterm_48x48.xpm
@@ -18,5 +22,3 @@
 share/pixmaps/xterm_32x32.xpm
 share/pixmaps/xterm_48x48.xpm
 @dirrmtry share/applications
-%%GNOME%%@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-%%GNOME%%@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true