Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/x11/xterm/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/x11/xterm/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.36
retrieving revision 1.41
diff -u -p -r1.36 -r1.41
--- pkgsrc/x11/xterm/Makefile	2007/09/17 06:36:21	1.36
+++ pkgsrc/x11/xterm/Makefile	2008/04/21 17:10:40	1.41
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2007/09/17 06:36:21 bjs Exp $
+# $NetBSD: Makefile,v 1.41 2008/04/21 17:10:40 bjs Exp $
 
-DISTNAME=	xterm-229
+DISTNAME=	xterm-235
 CATEGORIES=	x11
 MASTER_SITES=	ftp://invisible-island.net/xterm/
 EXTRACT_SUFX=	.tgz
@@ -11,46 +11,36 @@ COMMENT=	Latest terminal emulator for th
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-GNU_CONFIGURE=	yes
-USE_DIRS+=	xdg-1.4
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
+GNU_CONFIGURE=		yes
+USE_DIRS+=		xdg-1.4
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
+
+CONFIGURE_ARGS+=	--enable-88-color
+CONFIGURE_ARGS+=	--enable-256-color
+CONFIGURE_ARGS+=	--enable-luit
+CONFIGURE_ARGS+=	--enable-paste64
+CONFIGURE_ARGS+=	--enable-mini-luit
+CONFIGURE_ARGS+=	--enable-readline-mouse
+CONFIGURE_ARGS+=	--enable-toolbar	# Resource disabled by default
+
+CONFIGURE_ARGS.standard=# empty
+CONFIGURE_ARGS.3d=	--with-Xaw3d
+CONFIGURE_ARGS.xpm=	--with-Xaw3d
+CONFIGURE_ARGS.neXtaw=	--with-neXtaw
+CONFIGURE_ARGS+=	${${CONFIGURE_ARGS.${XAW_TYPE}}:L}
 
 .include "../../mk/bsd.prefs.mk"
 
 .if ${X11_TYPE} == "modular"
-CONFIGURE_ARGS+= --disable-imake --enable-narrowproto
+CONFIGURE_ARGS+=	--disable-imake
+CONFIGURE_ARGS+=	--enable-narrowproto
 .endif
 
 .if exists(/usr/include/wchar.h)
-CONFIGURE_ARGS+= --enable-wide-chars
-.endif
-
-.include "options.mk"
-
-.if ${OPSYS} == "DragonFly"
-CONFIGURE_ARGS+= --with-setuid
-.endif
-
-.if ${OPSYS} == "SunOS"
-INSTALL_FILE=	${WRKDIR}/INSTALL
-DEINSTALL_FILE=	${INSTALL_FILE}
-
-pre-build:
-	${MKDIR} ${INSTALL_FILE:H}
-	${SED} -e 's#@MV@#${MV}#g' \
-	  -e 's#@LOCALBASE@#${LOCALBASE}#g' \
-	  -e 's#@PREFIX@#${PREFIX}#g' \
-	  ${PKGDIR}/INSTALL.openwin >${INSTALL_FILE}
-
-pre-install:
-	${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
-
-post-install:
-	${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
+CONFIGURE_ARGS+=	--enable-wide-chars
 .endif
 
 .include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 ###
 ### For detection of XKB bell extension.
@@ -58,4 +48,15 @@ post-install:
 BUILDLINK_DEPMETHOD.libxkbfile?=	build
 .include "../../x11/libxkbfile/buildlink3.mk"
 
+post-install:
+	 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/applications && \
+	 ${INSTALL_DATA} ${WRKSRC}/xterm.desktop \
+		${DESTDIR}${PREFIX}/share/applications && \
+	 ${INSTALL_DATA} ${WRKSRC}/uxterm.desktop \
+		${DESTDIR}${PREFIX}/share/applications
+
+.include "options.mk"
+
+.include "../../mk/termcap.buildlink3.mk"
+.include "../../mk/xaw.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"