Update to version 1.02.

PR:		15384
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>

6 files changed, 72 insertions, 15 deletions

diff --git a/x11-wm/piewm/Makefile b/x11-wm/piewm/Makefile
index ea495de8c043..254864d43eb6 100644
--- a/x11-wm/piewm/Makefile
+++ b/x11-wm/piewm/Makefile
@@ -1,16 +1,14 @@
 # New ports collection makefile for:	piewm
-# Version required:	? (there is only one piewm version avyway)
+# Version required:	1.02
 # Date created:		24 November 1994
 # Whom:			asami
 #
 # $FreeBSD$
 #
 
-DISTNAME=	piewm
-PKGNAME=	piewm-1.0
+DISTNAME=	piewm-1.02
 CATEGORIES=	x11-wm
-MASTER_SITES=	ftp://ftp.x.org/R5contrib/
-EXTRACT_SUFX=	.tar.Z
+MASTER_SITES=	ftp://ftp.crynwr.com/piewm/
 
 MAINTAINER=	ports@FreeBSD.org
 
@@ -19,13 +17,4 @@ LIB_DEPENDS=    Xpm.4:${PORTSDIR}/graphics/xpm
 USE_IMAKE=	yes
 MAN1=		piewm.1
 
-# piewm.tar.Z includes and old version of xpm, and also a bunch of .o
-#  files plus an executable
-
-pre-configure:
-	@${RM} -rf ${WRKDIR}/xpm
-
-pre-build:
-	@(cd ${WRKSRC}; ${MAKE} clean)
-
 .include <bsd.port.mk>
diff --git a/x11-wm/piewm/distinfo b/x11-wm/piewm/distinfo
index 7038ade8653b..8b5a7789a0f9 100644
--- a/x11-wm/piewm/distinfo
+++ b/x11-wm/piewm/distinfo
@@ -1 +1 @@
-MD5 (piewm.tar.Z) = 91931fe49708c6181fd193cb8a7efbf4
+MD5 (piewm-1.02.tar.gz) = 9895087fe598318768fa3ea7f7e876e9
diff --git a/x11-wm/piewm/files/patch-ad b/x11-wm/piewm/files/patch-ad
new file mode 100644
index 000000000000..54507c5267b2
--- /dev/null
+++ b/x11-wm/piewm/files/patch-ad
@@ -0,0 +1,44 @@
+--- Imakefile.orig	Tue Jan  6 05:19:46 1998
++++ Imakefile	Thu Dec  9 23:29:58 1999
+@@ -11,7 +11,7 @@
+            TAGS = etags
+ 
+ # change if you want it to look elsewhere for its files.
+-       PIEWMDIR = /usr/local/lib/piewm
++       PIEWMDIR = $(LIBDIR)/piewm
+ 
+ #
+ # Keep uncommented to allow the xloadimage program by Jim Frost to
+@@ -19,16 +19,16 @@
+ # other image formats besides Xpm or Xbm)
+ #                                 Chris P. Ross
+ #                                 <cross@eng.umd.edu>
+-    XLOADIM_DEF = -DXLOADIMAGE=\"/usr/local/bin/xloadimage\"
++    XLOADIM_DEF = -DXLOADIMAGE=\"$(BINDIR)/xloadimage\"
+         MATHLIB = -lm
+-  LOCAL_DEFINES = -DSHAPE 
++  LOCAL_DEFINES = -DBITMAPDIR=\"$(INCROOT)/X11/bitmaps\" -DSHAPE 
+ 
+ /**/#   Ultrix doesn't have a mkstemp in libc...
+ #ifdef UltrixArchitecture
+   ULTRIX_DEFINES = -DNOSTEMP
+ #endif
+ 
+-LOCAL_LIBRARIES = $(XMULIB) $(EXTENSIONLIB) $(XLIB) $(MATHLIB) -lXpm
++LOCAL_LIBRARIES = $(XMULIB) $(XTOOLLIB) $(EXTENSIONLIB) $(XLIB) $(MATHLIB) $(LEXLIB) -lXpm
+        LINTLIBS = $(LINTXMU) $(LINTEXTENSIONLIB) $(LINTXLIB)
+         DEFINES = ExtensionDefines $(LOCAL_DEFINES) $(SIGNAL_DEFINES) $(ULTRIX_DEFINES)
+ 
+@@ -53,9 +53,9 @@
+ ComplexProgramTarget(piewm)
+ NormalProgramTarget(ssetroot,ssetroot.o,,$(LOCAL_LIBRARIES),)
+ 
+-MakeDirectories(install,$(TWMDIR))
+-InstallNonExec(system.twmrc,$(TWMDIR))
+-# InstallNamedProg(ssetroot,xsetroot,$(BINDIR))
++MakeDirectories(install,$(PIEWMDIR))
++InstallNonExec(system.twmrc,$(PIEWMDIR))
++# InstallNamedProg(ssetroot,ssetroot,$(BINDIR))
+ 
+ gram.h gram.c: gram.y
+ 	$(YACC) $(YFLAGS) gram.y
diff --git a/x11-wm/piewm/files/patch-ae b/x11-wm/piewm/files/patch-ae
new file mode 100644
index 000000000000..a9ad7d239096
--- /dev/null
+++ b/x11-wm/piewm/files/patch-ae
@@ -0,0 +1,11 @@
+--- gram.y.orig	Thu Jan  1 15:33:42 1998
++++ gram.y	Thu Dec  9 23:31:00 1999
+@@ -71,7 +71,7 @@
+ extern int do_single_keyword(), do_string_keyword(), do_number_keyword();
+ extern name_list **do_colorlist_keyword();
+ extern int do_color_keyword();
+-extern int yylineno;
++int yylineno;
+ %}
+ 
+ %union
diff --git a/x11-wm/piewm/files/patch-ag b/x11-wm/piewm/files/patch-ag
new file mode 100644
index 000000000000..6319181d3584
--- /dev/null
+++ b/x11-wm/piewm/files/patch-ag
@@ -0,0 +1,11 @@
+--- parse.c.orig	Thu Jun  4 00:41:45 1998
++++ parse.c	Fri Dec 10 00:58:28 1999
+@@ -1376,7 +1376,7 @@
+ 		dup2(fids[1], 1);	/* stdout = pipe to parent */
+ 		/* get_defs("m4", dpy, display_name) */
+ 		tmp_file = m4_defs(dpy, display_name);
+-		execlp("m4", "m4", "-s", tmp_file, "-", NULL); 
++		execlp("m4", "m4", tmp_file, "-", NULL); 
+ 		/* If we get here we are screwed... */
+ 		perror("Can't execlp() m4");
+ 		exit(124);
diff --git a/x11-wm/piewm/pkg-descr b/x11-wm/piewm/pkg-descr
index c66b56e8d354..765471407d67 100644
--- a/x11-wm/piewm/pkg-descr
+++ b/x11-wm/piewm/pkg-descr
@@ -7,5 +7,7 @@ move the mouse into the virtual desktop window, grab a window with the
 middle button, and move the mouse out, and then the window will appear 
 in the current screen.  This feature is exactly the same as tvtwm.
 
+WWW: http://www.crynwr.com/piewm/
+
 - Satoshi
 asami@cs.berkeley.edu