Date: Mon, 28 Feb 2000 10:54:51 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/17051: Update port: devel/xwpe to 1.0.22a Message-ID: <200002281854.KAA41957@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 17051
>Category: ports
>Synopsis: Update port: devel/xwpe to 1.0.22a
>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: Mon Feb 28 11:00:07 PST 2000
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 3.4-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 1.0.22a
- Add WWW: line into pkg/DESCR
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/devel/xwpe/Makefile devel/xwpe/Makefile
--- /usr/ports/devel/xwpe/Makefile Sun Feb 13 20:21:45 2000
+++ devel/xwpe/Makefile Mon Feb 28 06:38:13 2000
@@ -1,17 +1,17 @@
# ex:ts=8
# Ports collection makefile for: xwpe
-# Version required: 1.5.18a
+# Version required: 1.5.22a
# Date created: Fri Jan 24, 1997
# Whom: David O'Brien (obrien@FreeBSD.org)
#
# $FreeBSD: ports/devel/xwpe/Makefile,v 1.12 2000/02/13 03:24:52 obrien Exp $
#
-DISTNAME= xwpe-1.5.19a
+DISTNAME= xwpe-1.5.22a
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SUNSITE} \
- http://www.rpi.edu/~payned/xwpe/ \
- ftp://identicalsoftware.com/pub/linux/xwpe/
+ http://www.identicalsoftware.com/xwpe/ \
+ ftp://ftp.identicalsoftware.com/pub/linux/xwpe/
MASTER_SITE_SUBDIR= apps/editors/X
MAINTAINER= obrien@FreeBSD.org
@@ -22,6 +22,8 @@
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_GMAKE= yes
ALL_TARGET=
MAN1= xwpe.1
@@ -29,7 +31,7 @@
xwpe.1 wpe.1 \
xwpe.1 we.1
-post-install:
- @strip ${PREFIX}/bin/xwpe
+post-patch:
+ @${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/*.c
.include <bsd.port.mk>
diff -urN /usr/ports/devel/xwpe/files/md5 devel/xwpe/files/md5
--- /usr/ports/devel/xwpe/files/md5 Wed Sep 22 19:12:57 1999
+++ devel/xwpe/files/md5 Sat Feb 26 05:27:20 2000
@@ -1 +1 @@
-MD5 (xwpe-1.5.19a.tar.gz) = 957cc44494a84ef57e5033de908cc8a4
+MD5 (xwpe-1.5.22a.tar.gz) = 6f89fe3da57ac67fdff6297f078630b6
diff -urN /usr/ports/devel/xwpe/patches/patch-02 devel/xwpe/patches/patch-02
--- /usr/ports/devel/xwpe/patches/patch-02 Sun Feb 28 20:19:13 1999
+++ devel/xwpe/patches/patch-02 Mon Feb 28 06:43:29 2000
@@ -1,20 +1,64 @@
---- Makefile.in.orig Thu Feb 18 05:50:52 1999
-+++ Makefile.in Sat Feb 27 23:12:18 1999
-@@ -9,13 +9,15 @@
- #Destination Directory
- prefix=@prefix@
- DESTDIR= $(prefix)/bin
--LIBDIR= $(prefix)/lib
-+LIBDIR= $(prefix)/share
- XWPELIBDIR= $(LIBDIR)/xwpe
- MANDIR= $(prefix)/man
-+#INFODIR= $(prefix)/info
+--- Makefile.in.orig Mon Dec 27 08:11:38 1999
++++ Makefile.in Sat Feb 26 05:32:22 2000
+@@ -16,8 +16,10 @@
LIBS=@LIBS@
XLIBS=@X_LIBS@ @X_PRE_LIBS@ @X_EXTRA_LIBS@
--DEFS=@DEFS@ -DLIBRARY_DIR=\"$(XWPELIBDIR)\"
+-DEFS=@DEFS@ -DLIBRARY_DIR=\"$(XWPELIBDIR)\" -DSELECTION
+-INSTALL= cp
+DEFS=@DEFS@ -DLIBRARY_DIR=\"$(XWPELIBDIR)\" -DX_INC=\"@X_INC@\"
-+#DEFS=@DEFS@ -DLIBRARY_DIR=\"$(XWPELIBDIR)\" -DINFO_DIR=\"$(INFODIR)\" -DX_INC=\"@X_INC@\"
- INSTALL= cp
++INSTALL= @INSTALL@
++INSTALL_PROGRAM= @INSTALL_PROGRAM@
++INSTALL_DATA= @INSTALL_DATA@
LN_S= @LN_S@
+
+ # In case configure fails a description of many of the compilation options
+@@ -118,38 +120,29 @@
+ if test ! -d $(DESTDIR); then mkdir -p $(DESTDIR); fi
+ if test ! -d $(XWPELIBDIR); then mkdir -p $(XWPELIBDIR); fi
+ rm -f $(DESTDIR)/wpe $(DESTDIR)/xwpe $(DESTDIR)/we $(DESTDIR)/xwe
+- $(INSTALL) xwpe $(DESTDIR)/we
+- chmod ugo+x $(DESTDIR)/we
++ $(INSTALL_PROGRAM) xwpe $(DESTDIR)/we
+ (cd $(DESTDIR) && $(LN_S) we xwe)
+ (cd $(DESTDIR) && $(LN_S) we xwpe)
+ (cd $(DESTDIR) && $(LN_S) we wpe)
+ rm -f $(XWPELIBDIR)/help.xwpe
+ if test ! -f $(XWPELIBDIR)/syntax_def; then \
+- $(INSTALL) syntax_def $(XWPELIBDIR)/syntax_def; \
+- chmod ugo=r $(XWPELIBDIR)/syntax_def; fi
++ $(INSTALL_DATA) syntax_def $(XWPELIBDIR)/syntax_def; fi
+ if test ! -d $(MANDIR)/man1; then mkdir -p $(MANDIR)/man1; fi
+ rm -f $(MANDIR)/man1/xwpe.1 $(MANDIR)/man1/xwe.1
+ rm -f $(MANDIR)/man1/wpe.1 $(MANDIR)/man1/we.1
+- $(INSTALL) xwe.1 wpe.1 we.1 $(MANDIR)/man1
+- chmod ugo=r $(MANDIR)/man1/xwe.1
+- chmod ugo=r $(MANDIR)/man1/wpe.1 $(MANDIR)/man1/we.1
++ $(INSTALL_DATA) xwe.1 wpe.1 we.1 $(MANDIR)/man1
+ if test -f libxwpe-x11.so; then \
+- $(INSTALL) libxwpe-x11.so $(XWPELIBDIR)/libxwpe-x11.so; fi
++ $(INSTALL_DATA) libxwpe-x11.so $(XWPELIBDIR)/libxwpe-x11.so; fi
+ if test -f libxwpe-term.so; then \
+- $(INSTALL) libxwpe-term.so $(XWPELIBDIR)/libxwpe-term.so; fi
++ $(INSTALL_DATA) libxwpe-term.so $(XWPELIBDIR)/libxwpe-term.so; fi
+
+ install: install_fst
+- $(INSTALL) help.xwpe_eng $(XWPELIBDIR)/help.xwpe
+- chmod ugo=r $(XWPELIBDIR)/help.xwpe
+- $(INSTALL) help.key_eng $(XWPELIBDIR)/help.key
+- chmod ugo=r $(XWPELIBDIR)/help.key
+- $(INSTALL) xwpe.1_eng $(MANDIR)/man1/xwpe.1
+- chmod ugo=r $(MANDIR)/man1/xwpe.1
++ $(INSTALL_DATA) help.xwpe_eng $(XWPELIBDIR)/help.xwpe
++ $(INSTALL_DATA) help.key_eng $(XWPELIBDIR)/help.key
++ $(INSTALL_DATA) xwpe.1_eng $(MANDIR)/man1/xwpe.1
+
+ # German install uses old documention as no updated version is available
+ install_german: install_fst
+- $(INSTALL) old/we.help_gr $(XWPELIBDIR)/help.xwpe
+- chmod ugo=r $(XWPELIBDIR)/help.xwpe
+- $(INSTALL) old/xwpe.1_gr $(MANDIR)/man1/xwpe.1
+- chmod ugo=r $(MANDIR)/man1/xwpe.1
++ $(INSTALL_DATA) old/we.help_gr $(XWPELIBDIR)/help.xwpe
++ $(INSTALL_DATA) old/xwpe.1_gr $(MANDIR)/man1/xwpe.1
diff -urN /usr/ports/devel/xwpe/patches/patch-05 devel/xwpe/patches/patch-05
--- /usr/ports/devel/xwpe/patches/patch-05 Tue Nov 10 20:20:42 1998
+++ devel/xwpe/patches/patch-05 Sat Feb 26 07:53:38 2000
@@ -1,6 +1,6 @@
---- we_prog.c.orig Sat Sep 5 06:57:18 1998
-+++ we_prog.c Sun Nov 8 01:53:20 1998
-@@ -15,6 +15,9 @@
+--- we_prog.c.orig Mon Dec 27 08:11:38 1999
++++ we_prog.c Sat Feb 26 07:48:25 2000
+@@ -16,6 +16,9 @@
#include <sys/stat.h>
#include <sys/wait.h>
#include <signal.h>
@@ -10,16 +10,16 @@
int e_run_sh(FENSTER *f);
int e_make_library(char *library, char *ofile, FENSTER *f);
-@@ -943,7 +946,11 @@
- e_prog.exedir = WpeStringMake(".");
- if (e_prog.sys_include) FREE(e_prog.sys_include);
- e_prog.sys_include =
-- WpeStringMake("/usr/include:/usr/local/include:/usr/include/X11");
-+ WpeStringMake("/usr/include:/usr/local/include"
+@@ -924,7 +927,11 @@
+ e_prog.exedir = WpeStrdup(".");
+ if (e_prog.sys_include) FREE(e_prog.sys_include);
+ e_prog.sys_include =
+- WpeStrdup("/usr/include:/usr/local/include:/usr/include/X11");
++ WpeStrdup("/usr/include:%%LOCALBASE%%/include"
+#if !defined(NO_XWINDOWS)
+ ":"X_INC
+#endif
-+ );
- if(e_prog.comp == NULL)
- e_prog.comp = MALLOC(e_prog.num * sizeof(struct e_s_prog *));
- else
++ );
+ if (e_prog.comp == NULL)
+ e_prog.comp = MALLOC(e_prog.num * sizeof(struct e_s_prog *));
+ else
diff -urN /usr/ports/devel/xwpe/patches/patch-08 devel/xwpe/patches/patch-08
--- /usr/ports/devel/xwpe/patches/patch-08 Tue Nov 10 20:20:42 1998
+++ devel/xwpe/patches/patch-08 Mon Feb 28 06:38:40 2000
@@ -1,10 +1,13 @@
---- configure.orig Mon Nov 9 14:58:06 1998
-+++ configure Mon Nov 9 14:57:44 1998
-@@ -2459,6 +2459,7 @@
+--- 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 -urN /usr/ports/devel/xwpe/patches/patch-09 devel/xwpe/patches/patch-09
--- /usr/ports/devel/xwpe/patches/patch-09 Sun Jun 13 07:34:01 1999
+++ devel/xwpe/patches/patch-09 Sat Feb 26 07:55:14 2000
@@ -1,6 +1,6 @@
---- we_fl_unix.c.orig Fri May 7 22:34:29 1999
-+++ we_fl_unix.c Fri May 7 22:38:00 1999
-@@ -14,6 +14,10 @@
+--- we_fl_unix.c.orig Mon Dec 27 08:11:38 1999
++++ we_fl_unix.c Sat Feb 26 05:55:53 2000
+@@ -13,6 +13,10 @@
#include <sys/stat.h>
#include <errno.h>
@@ -11,14 +11,14 @@
struct dirfile *e_make_win_list(FENSTER * f);
extern char *e_tmp_dir;
extern int (*e_u_system) (char *exe);
-@@ -3549,7 +3553,13 @@
+@@ -3546,7 +3550,13 @@
if(getenv("MANPATH"))
strcpy(manpath, getenv("MANPATH"));
if(manpath[0] == '\0')
- strcpy(manpath, "/usr/man:/usr/local/man");
+ strcpy(manpath,
+#if (defined(BSD) && (BSD >= 199306)) || (defined(sun) && defined(__svr4__))
-+ "/usr/share/man:/usr/local/man");
++ "/usr/share/man:%%LOCALBASE%%/man");
+#else
+ "/usr/man:/usr/local/man");
+#endif
diff -urN /usr/ports/devel/xwpe/pkg/DESCR devel/xwpe/pkg/DESCR
--- /usr/ports/devel/xwpe/pkg/DESCR Mon Jan 3 20:15:09 2000
+++ devel/xwpe/pkg/DESCR Sat Feb 26 06:31:57 2000
@@ -15,4 +15,6 @@
and helpfiles. The German language version will be installed if
"GERMAN_LANG" is set during ``make install'' of the port.
+WWW: http://www.identicalsoftware.com/xwpe/
+
-- David (obrien@FreeBSD.org)
>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?200002281854.KAA41957>