Date: Fri, 12 Jul 2002 12:19:55 -0700 (PDT) From: KATO Tsuguru <tkato@prontomail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/40493: Update port: devel/xwpe to 1.5.29a Message-ID: <200207121919.g6CJJtFJ006088@www.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 40493
>Category: ports
>Synopsis: Update port: devel/xwpe to 1.5.29a
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Jul 12 12:20:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.6-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 1.5.29a
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/devel/xwpe/Makefile devel/xwpe/Makefile
--- /usr/ports/devel/xwpe/Makefile Thu May 9 06:37:07 2002
+++ devel/xwpe/Makefile Fri Jul 12 02:40:01 2002
@@ -7,7 +7,7 @@
#
PORTNAME= xwpe
-PORTVERSION= 1.5.22a
+PORTVERSION= 1.5.29a
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SUNSITE} \
http://www.identicalsoftware.com/xwpe/ \
@@ -16,22 +16,23 @@
MAINTAINER= ports@FreeBSD.org
-# LD_LIBRARY_PATH is to deal with a braindead libX11.a search in configure
-# (once again author assumes too many Linux'isms)
-# it is not exptected to be set at runtime.
-MAKE_ENV= LD_LIBRARY_PATH="${X11BASE}/lib"
-GNU_CONFIGURE= yes
-CONFIGURE_ENV= LD_LIBRARY_PATH="${X11BASE}/lib"
-CONFIGURE_ARGS= --libdir=${PREFIX}/share
USE_XLIB= yes
+USE_REINPLACE= yes
USE_GMAKE= yes
-ALL_TARGET=
+GNU_CONFIGURE= yes
+CONFIGURE_ENV=
+CONFIGURE_ARGS= --libdir=${PREFIX}/share
+ALL_TARGET= # none
+
MAN1= xwpe.1
MLINKS= xwpe.1 xwe.1 \
xwpe.1 wpe.1 \
xwpe.1 we.1
-pre-configure:
- @${PERL} -pi.in -e "s:%%LOCALBASE%%:${LOCALBASE}:g" ${WRKSRC}/*.c
+post-patch:
+.for file in we_prog.c we_fl_unix.c
+ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g ; \
+ s|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/${file}
+.endfor
.include <bsd.port.mk>
diff -urN /usr/ports/devel/xwpe/distinfo devel/xwpe/distinfo
--- /usr/ports/devel/xwpe/distinfo Tue Feb 29 18:32:15 2000
+++ devel/xwpe/distinfo Fri Jul 12 02:33:43 2002
@@ -1 +1 @@
-MD5 (xwpe-1.5.22a.tar.gz) = 6f89fe3da57ac67fdff6297f078630b6
+MD5 (xwpe-1.5.29a.tar.gz) = fa529db0a3f1cc5ac35ff0cc7bb3f588
diff -urN /usr/ports/devel/xwpe/files/patch-09 devel/xwpe/files/patch-09
--- /usr/ports/devel/xwpe/files/patch-09 Tue Feb 29 18:32:16 2000
+++ devel/xwpe/files/patch-09 Fri Jul 12 02:38:00 2002
@@ -1,5 +1,5 @@
---- we_fl_unix.c.orig Mon Dec 27 08:11:38 1999
-+++ we_fl_unix.c Sat Feb 26 05:55:53 2000
+--- we_fl_unix.c.orig Wed Jun 5 11:53:50 2002
++++ we_fl_unix.c Fri Jul 12 02:37:37 2002
@@ -13,6 +13,10 @@
#include <sys/stat.h>
#include <errno.h>
@@ -10,19 +10,18 @@
+
struct dirfile *e_make_win_list(FENSTER * f);
extern char *e_tmp_dir;
- extern int (*e_u_system) (char *exe);
-@@ -3546,7 +3550,13 @@
- if(getenv("MANPATH"))
- strcpy(manpath, getenv("MANPATH"));
- if(manpath[0] == '\0')
-- strcpy(manpath, "/usr/man:/usr/local/man");
-+ strcpy(manpath,
+
+@@ -3532,7 +3536,12 @@
+ }
+ 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:%%LOCALBASE%%/man");
++ "/usr/share/man:%%X11BASE%%/man:%%LOCALBASE%%/man");
+#else
-+ "/usr/man:/usr/local/man");
++ "/usr/man:%%X11BASE%%/man:%%LOCALBASE%%/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);
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200207121919.g6CJJtFJ006088>