From 0a92e00836773af6f6797d229609813121c6546d Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Wed, 2 Mar 2011 13:31:16 +0000
Subject: [PATCH] update to 1.339 and fix desktop file; ok laurent@ lots of
 prodding marco@

---
 www/xxxterm/Makefile | 40 +++++++++++++++++-----------------------
 www/xxxterm/distinfo | 10 +++++-----
 2 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/www/xxxterm/Makefile b/www/xxxterm/Makefile
index 73d50f055d9..ae286a28aac 100755
--- a/www/xxxterm/Makefile
+++ b/www/xxxterm/Makefile
@@ -1,9 +1,7 @@
-# $OpenBSD: Makefile,v 1.12 2011/01/09 21:28:37 marco Exp $
+# $OpenBSD: Makefile,v 1.13 2011/03/02 13:31:16 sthen Exp $
 
 COMMENT =		vi-like minimalists web browser
-
-DISTNAME =		xxxterm-1.226
-
+DISTNAME =		xxxterm-1.339
 CATEGORIES =		www
 
 HOMEPAGE =		http://opensource.conformal.com/wiki/XXXTerm
@@ -16,28 +14,24 @@ PERMIT_PACKAGE_FTP =	Yes
 PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP =	Yes
 
-MODULES =		devel/gettext
+MODULES += devel/gettext
 
-WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
-WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig
-WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
-WANTLIB += gmodule-2.0 gnutls gobject-2.0 gthread-2.0 gtk-x11-2.0
-WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png
-WANTLIB += pthread pthread-stubs soup-2.4 util xcb xcb-render
-WANTLIB += GL Xxf86vm drm xcb-shm xml2 z
-WANTLIB += webkit-1.0
-
-LIB_DEPENDS =		www/webkit
-
-RUN_DEPENDS =		devel/desktop-file-utils
+WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xi
+WANTLIB += Xinerama Xrandr Xrender Xxf86vm atk-1.0 c cairo drm expat
+WANTLIB += fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0
+WANTLIB += glib-2.0 gmodule-2.0 gnutls gobject-2.0 gthread-2.0
+WANTLIB += gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0
+WANTLIB += pixman-1 png pthread pthread-stubs soup-2.4 util webkit-1.0
+WANTLIB += xcb xcb-render xcb-shm xml2 z
 
 MASTER_SITES =		http://opensource.conformal.com/snapshots/xxxterm/
 
+LIB_DEPENDS =		www/webkit
+RUN_DEPENDS =		devel/desktop-file-utils
+
 EXTRACT_SUFX =		.tgz
 
-
-
-NO_REGRESS=		Yes
+NO_REGRESS =		Yes
 
 EXAMPLEDIR =		${PREFIX}/share/examples/xxxterm
 
@@ -50,8 +44,8 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/xxxterm/
 	${INSTALL_DATA} ${WRKSRC}/xxxtermicon*.png ${PREFIX}/share/xxxterm/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/applications/
-	@${SUBST_CMD} -c ${WRKSRC}/xxxterm.desktop ${PREFIX}/share/applications/xxxterm.desktop
-	${INSTALL_DATA} ${WRKSRC}/xxxterm.desktop ${PREFIX}/share/applications/
-	${CHOWN} ${SHAREOWN}:${SHAREGRP} $(PREFIX)/share/applications/xxxterm.desktop
+	${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} \
+		-c ${WRKSRC}/xxxterm.desktop \
+		${PREFIX}/share/applications/xxxterm.desktop
 
 .include <bsd.port.mk>
diff --git a/www/xxxterm/distinfo b/www/xxxterm/distinfo
index fbf3a5e25ad..dcfd128cf0a 100644
--- a/www/xxxterm/distinfo
+++ b/www/xxxterm/distinfo
@@ -1,5 +1,5 @@
-MD5 (xxxterm-1.226.tgz) = rGSq8lv/qqHUy/MKhgiX7w==
-RMD160 (xxxterm-1.226.tgz) = Zztf0SpiaxshUyeRoG+OtjO7goU=
-SHA1 (xxxterm-1.226.tgz) = uQcTZk1gmFEQwOMKxPFSFmNh1rY=
-SHA256 (xxxterm-1.226.tgz) = 94AI2MFunhjDk/lBW+3de8GkkcYh+Y5L+soab2jge7A=
-SIZE (xxxterm-1.226.tgz) = 124171
+MD5 (xxxterm-1.339.tgz) = mzDMQaByNUeAaRXezGVf/w==
+RMD160 (xxxterm-1.339.tgz) = XekUi1Da+Uk0DZ6yhvD/5UBKMN0=
+SHA1 (xxxterm-1.339.tgz) = c42NQvYUHp4j4g5ZdrD/QCd1YTk=
+SHA256 (xxxterm-1.339.tgz) = 5g19KF/sOhdl3bJ7mmGweJMViZs5UDJw4jjjz5axWjE=
+SIZE (xxxterm-1.339.tgz) = 141695