- update xwpe to 1.5.30a

- specify license version
- re-format DESCR

editors/xwpe/Makefile

@@ -1,20 +1,19 @@
-# $OpenBSD: Makefile,v 1.26 2008/01/04 17:48:34 espie Exp $
+# $OpenBSD: Makefile,v 1.27 2008/12/09 10:46:35 jasper Exp $
 
 COMMENT=	powerful programming editor
 
-DISTNAME=	xwpe-1.5.22a
-PKGNAME=	${DISTNAME}p0
+DISTNAME=	xwpe-1.5.30a
 CATEGORIES=	editors
 
 MASTER_SITES=	${MASTER_SITE_SUNSITE:=apps/editors/X/} \
 		http://www.identicalsoftware.com/xwpe/ 
 
-# License: GPL
+# GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		ICE SM X11 c ncurses
+WANTLIB=		ICE SM X11 c ncurses z
 
 ALL_TARGET=	xwpe
 
@@ -26,7 +25,4 @@ FAKE_FLAGS=	prefix=${WRKINST}${PREFIX} MANDIR=${WRKINST}${PREFIX}/man
 USE_X11=	Yes
 NO_REGRESS=	Yes
 
-post-install:
-	@strip ${PREFIX}/bin/xwpe
-
 .include <bsd.port.mk>

editors/xwpe/distinfo

@@ -1,5 +1,5 @@
-MD5 (xwpe-1.5.22a.tar.gz) = b4n+PaV6xn/f9il/B4Ywtg==
-RMD160 (xwpe-1.5.22a.tar.gz) = TEvu6B9ilFXeID9a0GVv2VZkRCo=
-SHA1 (xwpe-1.5.22a.tar.gz) = Z16/cz6VwJVs+CfvOdPy5Udnn5c=
-SHA256 (xwpe-1.5.22a.tar.gz) = 1NGahNA7lSCWC8Ij3Oz3eZqU7QI3pl+ZD7HeMD6EpLU=
-SIZE (xwpe-1.5.22a.tar.gz) = 306143
+MD5 (xwpe-1.5.30a.tar.gz) = Ea1B1jb5/weCDuCGmhd6XA==
+RMD160 (xwpe-1.5.30a.tar.gz) = +eDBLP6TG3MV32/BOdMdrfEJybk=
+SHA1 (xwpe-1.5.30a.tar.gz) = /fVdyIckXVq9n3NfdHXl1sWiDao=
+SHA256 (xwpe-1.5.30a.tar.gz) = /ON6XdOv1xAqc9GH7ai50auIv122SfOFuM0T5y4MeWE=
+SIZE (xwpe-1.5.30a.tar.gz) = 325043

editors/xwpe/patches/patch-configure

@@ -1,11 +1,11 @@
-$OpenBSD: patch-configure,v 1.1 2007/10/26 20:49:32 ajacoutot Exp $
---- configure.orig	Mon Dec 27 00:11:38 1999
-+++ configure	Fri Oct 26 22:47:34 2007
-@@ -2604,6 +2604,7 @@ s%@X_CFLAGS@%$X_CFLAGS%g
- 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
- 
+$OpenBSD: patch-configure,v 1.2 2008/12/09 10:46:35 jasper Exp $
+--- configure.orig	Tue Dec  9 11:39:03 2008
++++ configure	Tue Dec  9 11:39:05 2008
+@@ -6053,6 +6053,7 @@ s,@X_CFLAGS@,$X_CFLAGS,;t t
+ s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t
+ s,@X_LIBS@,$X_LIBS,;t t
+ s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
++s,@X_INC@,$x_includes,;t t
+ s,@LIBOBJS@,$LIBOBJS,;t t
+ s,@LTLIBOBJS@,$LTLIBOBJS,;t t
  CEOF
- EOF

editors/xwpe/patches/patch-we_fl_unix_c

@@ -1,6 +1,6 @@
-$OpenBSD: patch-we_fl_unix_c,v 1.1 2007/10/26 20:49:32 ajacoutot Exp $
---- we_fl_unix.c.orig	Mon Dec 27 00:11:38 1999
-+++ we_fl_unix.c	Fri Oct 26 22:47:35 2007
+$OpenBSD: patch-we_fl_unix_c,v 1.2 2008/12/09 10:46:35 jasper Exp $
+--- we_fl_unix.c.orig	Tue Dec  9 11:35:46 2008
++++ we_fl_unix.c	Tue Dec  9 11:36:54 2008
 @@ -12,6 +12,9 @@
  #include <sys/types.h>
  #include <sys/stat.h>
@@ -11,18 +11,17 @@ $OpenBSD: patch-we_fl_unix_c,v 1.1 2007/10/26 20:49:32 ajacoutot Exp $
  
  struct dirfile *e_make_win_list(FENSTER * f);
  extern char    *e_tmp_dir;
-@@ -3546,7 +3549,13 @@ struct dirfile *e_make_funct(char *man)
-   if(getenv("MANPATH"))
-     strcpy(manpath, getenv("MANPATH"));
-   if(manpath[0] == '\0')
--    strcpy(manpath, "/usr/man:/usr/local/man");
-+    strcpy(manpath,
+@@ -3532,7 +3535,12 @@ struct dirfile *e_make_funct(char *man)
+  }
+  if ((!manpath) || (manpath[0] == '\0'))
+  {
+-  manpath = strdup("/usr/man:/usr/share/man:/usr/X11R6/man:/usr/local/man");
++  manpath = strdup(
 +#if (defined(BSD) && (BSD >= 199306)) || (defined(sun) && defined(__svr4__))
 +               "/usr/share/man:/usr/local/man");
 +#else
 +               "/usr/man:/usr/local/man");
 +#endif
-+         
-   while(manpath[i])
-   {
-     for(n = 0; (subpath[n] = manpath[i]) && manpath[i] != PTHD; i++, n++);
+  }
+  /* Allocate the maximum possible rather than continually realloc. */
+  sustr = malloc(strlen(manpath) + 10);

editors/xwpe/pkg/DESCR

@@ -1,4 +1,5 @@
-Xwpe is an editor that allows you to write program and compile it without
-exiting that same editor. Xwpe is useful, because of its hudge of editing 
-tools. You can compile, run, link, trace, your program as you want in it. It
-is easy to use and allows you to use many compiling utilities.
+Xwpe is an editor that allows you to write program and compile it
+without exiting that same editor. Xwpe is useful, because of its hudge
+of editing tools. You can compile, run, link, trace, your program as you
+want in it. It is easy to use and allows you to use many compiling
+utilities.

editors/xwpe/pkg/PLIST

@@ -1,5 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.4 2004/09/15 18:01:07 espie Exp $
-bin/we
+@comment $OpenBSD: PLIST,v 1.5 2008/12/09 10:46:35 jasper Exp $
+@bin bin/we
 bin/wpe
 bin/xwe
 bin/xwpe