- Update to 1.5.30a

- Adopt maintainship
- USE_XLIB --> USE_XORG

Approved by:	miwi (mentor)

5 files changed, 21 insertions, 30 deletions

diff --git a/devel/xwpe/Makefile b/devel/xwpe/Makefile
index 8f1be7479ce0..7ea2f1a8eefe 100644
--- a/devel/xwpe/Makefile
+++ b/devel/xwpe/Makefile
@@ -7,19 +7,18 @@
 #
 
 PORTNAME=	xwpe
-PORTVERSION=	1.5.29a
-PORTREVISION=	2
+PORTVERSION=	1.5.30a
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SUNSITE} \
 		http://www.identicalsoftware.com/xwpe/ \
 		ftp://ftp.identicalsoftware.com/pub/linux/xwpe/
 MASTER_SITE_SUBDIR=	apps/editors/X
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	A Borland-like IDE programming environment
 
-USE_XLIB=	yes
 USE_GMAKE=	yes
+USE_XORG=	sm ice x11
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=
 CONFIGURE_ARGS=	--libdir=${PREFIX}/share
@@ -35,5 +34,9 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g ; \
 		 s|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/${file}
 .endfor
+	${REINPLACE_CMD} -e 's|$$(INSTALL_PROGRAM)|${INSTALL_PROGRAM}|g' \
+	    ${WRKSRC}/Makefile.in
+	${REINPLACE_CMD} -e 's|$$(INSTALL_DATA)|${INSTALL_DATA}|g' \
+	    ${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/devel/xwpe/distinfo b/devel/xwpe/distinfo
index 0babe4e7ae4d..194d1297c8d5 100644
--- a/devel/xwpe/distinfo
+++ b/devel/xwpe/distinfo
@@ -1,3 +1,3 @@
-MD5 (xwpe-1.5.29a.tar.gz) = fa529db0a3f1cc5ac35ff0cc7bb3f588
-SHA256 (xwpe-1.5.29a.tar.gz) = e6cca0a2abe975f502b195b6aff6ea28131e73f8f61a90cb6b81233da7e4f23f
-SIZE (xwpe-1.5.29a.tar.gz) = 307545
+MD5 (xwpe-1.5.30a.tar.gz) = 11ad41d636f9ff07820ee0869a177a5c
+SHA256 (xwpe-1.5.30a.tar.gz) = fce37a5dd3afd7102a73d187eda8b9d1ab88bf5db649f385b8cd13e72e0c7961
+SIZE (xwpe-1.5.30a.tar.gz) = 325043
diff --git a/devel/xwpe/files/patch-08 b/devel/xwpe/files/patch-08
deleted file mode 100644
index 935e1a6b0de8..000000000000
--- a/devel/xwpe/files/patch-08
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.orig	Mon Dec 27 08:11:38 1999
-+++ configure	Sat Feb 26 07:49:41 2000
-@@ -2604,6 +2604,10 @@
- s%@X_PRE_LIBS@%$X_PRE_LIBS%g
- s%@X_LIBS@%$X_LIBS%g
- s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
-+s%@X_INC@%$x_includes%g
-+s%@INSTALL@%$INSTALL%g
-+s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-+s%@INSTALL_DATA@%$INSTALL_DATA%g
- 
- CEOF
- EOF
diff --git a/devel/xwpe/files/patch-we_debug.c b/devel/xwpe/files/patch-we_debug.c
deleted file mode 100644
index a14fd92b9e94..000000000000
--- a/devel/xwpe/files/patch-we_debug.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- we_debug.c.orig	Sun Aug 15 19:14:55 2004
-+++ we_debug.c	Sun Aug 15 19:16:13 2004
-@@ -52,7 +52,6 @@
- extern char *att_no;
- extern char *e_tmp_dir;
- 
--char *tparm();
- char *tgoto();
- #ifdef DEFTPUTS
- int tputs();
diff --git a/devel/xwpe/files/patch-we_xterm.c b/devel/xwpe/files/patch-we_xterm.c
new file mode 100644
index 000000000000..f83bca20585d
--- /dev/null
+++ b/devel/xwpe/files/patch-we_xterm.c
@@ -0,0 +1,11 @@
+--- we_xterm.c.orig	2008-03-19 17:50:00.000000000 +0100
++++ we_xterm.c	2008-03-19 17:52:02.000000000 +0100
+@@ -95,7 +95,7 @@
+  e_u_ini_size = e_ini_size;
+  e_u_setlastpic = e_setlastpic;
+  WpeMouseChangeShape = (void (*)(WpeMouseShape))WpeNullFunction;
+- WpeMouseRestoreShape = (void (*)(WpeMouseShape))WpeNullFunction;
++ WpeMouseRestoreShape = WpeNullFunction;
+ /* WpeMouseChangeShape = WpeXMouseChangeShape;
+  WpeMouseRestoreShape = WpeXMouseRestoreShape;*/
+  WpeDisplayEnd = WpeNullFunction;