Sync with fvwm release

5 files changed, 40 insertions, 35 deletions

diff --git a/x11/xpmroot/Makefile b/x11/xpmroot/Makefile
index 5879bc3ec0e..965bf0035f0 100644
--- a/x11/xpmroot/Makefile
+++ b/x11/xpmroot/Makefile
@@ -1,19 +1,24 @@
-# $NetBSD: Makefile,v 1.5 1998/07/04 09:19:10 mycroft Exp $
+# $NetBSD: Makefile,v 1.6 1999/03/01 01:49:33 hubertf Exp $
 #
 
-DISTNAME=	fvwm-2.0.46
-PKGNAME=	xpmroot-1.01
+V=		2.2
+DISTNAME=       fvwm-${V}
+PKGNAME=	xpmroot-${V}
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/sources/2.0.x/ \
+MASTER_SITES=   ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/ \
+                ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/sources/2.0.x/ \
+                ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/fvwm-users-jp/kits/ \
 		ftp://ftp.TokyoNet.AD.JP/pub/X/fvwm/sources/2.0.x/ \
-		ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/
+                ftp://ftp.TokyoNet.AD.JP/pub/X/fvwm/fvwm-users-jp/kits/
 
 MAINTAINER=	tron@netbsd.org
 
 DEPENDS+=	xpm-3.4k:../../graphics/xpm
 
-USE_IMAKE=	yes
-
-WRKSRC=		${WRKDIR}/fvwm-2.0.46/xpmroot
+USE_X11BASE=	YES
+WRKSRC=		${WRKDIR}/fvwm-${V}/utils
+MAKE_ENV+=	INSTALL_PROGRAM='${INSTALL_PROGRAM}'
+MAKE_ENV+=	INSTALL_MAN='${INSTALL_MAN}'
+MAKE_ENV+=	VERSION=${V}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xpmroot/files/md5 b/x11/xpmroot/files/md5
index 1af9d6fe7e6..956a9f728e1 100644
--- a/x11/xpmroot/files/md5
+++ b/x11/xpmroot/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/08/07 13:29:12 agc Exp $
+$NetBSD: md5,v 1.3 1999/03/01 01:49:34 hubertf Exp $
 
-MD5 (fvwm-2.0.46.tar.gz) = da4a7d4c4e81e5de3ecdc02026fa1fa9
+MD5 (fvwm-2.2.tar.gz) = 6f2f57d60895c8c01057be6d0be3b21a
diff --git a/x11/xpmroot/patches/patch-aa b/x11/xpmroot/patches/patch-aa
index c0915917481..7c341ffabea 100644
--- a/x11/xpmroot/patches/patch-aa
+++ b/x11/xpmroot/patches/patch-aa
@@ -1,25 +1,11 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 11:18:28 agc Exp $
+--- xpmroot.c.BAK	Mon Feb 22 04:04:55 1999
++++ xpmroot.c	Mon Feb 22 04:04:58 1999
+@@ -6,8 +6,6 @@
+  * this program or anything related to it.
+  ****************************************************************************/
 
---- Imakefile.orig	Sat Feb 17 05:44:43 1996
-+++ Imakefile	Tue Mar 24 23:14:07 1998
-@@ -1,17 +1,10 @@
- /* 
-- * Imakefile for fvwm 2.0 -- xpmroot
-+ * Imakefile for xpmroot
-  */
- 
--FVWM_SRCDIR = ..
--#include "../Fvwm.tmpl"
+-#include "config.h"
 -
--#if HasXpm
--
- SRCS = xpmroot.c
- OBJS = xpmroot.o
- 
--LOCAL_LIBRARIES = $(FVWM_LIBS) $(XLIB)
--
--FvwmProgramTarget(xpmroot)
--#endif
-+LOCAL_LIBRARIES = -lXpm $(XLIB)
- 
-+ComplexProgramTarget(xpmroot)
+ #include <stdio.h>
+ #include <signal.h>
+ #include <string.h>
diff --git a/x11/xpmroot/patches/patch-ab b/x11/xpmroot/patches/patch-ab
new file mode 100644
index 00000000000..b58b1ebe2a6
--- /dev/null
+++ b/x11/xpmroot/patches/patch-ab
@@ -0,0 +1,14 @@
+--- /dev/null	Mon Feb 22 03:47:57 1999
++++ Makefile	Mon Feb 22 04:18:05 1999
+@@ -0,0 +1,11 @@
++CFLAGS+=	-I${X11BASE}/include -L${X11BASE}/lib -DVERSION=\"${VERSION}\"
++#CFLAGS+=	-ggdb
++CFLAGS+=	-O2
++
++all: xpmroot
++xpmroot: xpmroot.c
++	${CC} ${CFLAGS} xpmroot.c -o xpmroot -lXpm -lX11
++
++install:
++	${INSTALL_PROGRAM} xpmroot	${X11BASE}/bin
++	${INSTALL_MAN} xpmroot.1	${X11BASE}/man/man1
diff --git a/x11/xpmroot/pkg/PLIST b/x11/xpmroot/pkg/PLIST
index c3054d784c0..9d845c50c0b 100644
--- a/x11/xpmroot/pkg/PLIST
+++ b/x11/xpmroot/pkg/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 1998/03/24 22:45:22 tron Exp $
+@comment $NetBSD: PLIST,v 1.2 1999/03/01 01:49:34 hubertf Exp $
 bin/xpmroot
-man/cat1/xpmroot.0
+man/man1/xpmroot.1