>Number:         13374
>Category:       pkg
>Synopsis:       update xpmroot to the latest release
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed Jul 04 00:48:02 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     Martti Kuparinen
>Release:        NetBSD 1.5.1
>Organization:
>Environment:
System: NetBSD dhcp39 1.5.1 NetBSD 1.5.1 (KAYAK) #6: Mon Jun 18 10:00:41 CEST 2001 root@dhcp39:/usr/src/sys/arch/i386/compile/KAYAK i386


>Description:

Update the xpmroot package to the latest release. List of changes
is available from http://www.fvwm.org/generated/NEWS.html is one
really wants to know the changes...

After applying the following patches you MUST perform:

    - cvs rm -f patch/patch-*
    - make makepatchsum

>How-To-Repeat:
>Fix:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xpmroot/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- Makefile	2001/06/29 13:58:52	1.16
+++ Makefile	2001/07/04 07:20:34
@@ -1,11 +1,11 @@
 # $NetBSD: Makefile,v 1.16 2001/06/29 13:58:52 zuntum Exp $
 #
 
-DISTNAME=       fvwm-${PKG_VERSION}
+DISTNAME=	fvwm-${PKG_VERSION}
 PKGNAME=	xpmroot-${PKG_VERSION}
-PKG_VERSION=	2.2.5
+PKG_VERSION=	2.4.0
 CATEGORIES=	x11
-MASTER_SITES=   ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/ \
+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/ \
@@ -16,12 +16,20 @@
 COMMENT=	Sets the root window to an Xpm pixmap
 
 USE_BUILDLINK_ONLY=	YES
-USE_X11BASE=	YES
-WRKSRC=		${WRKDIR}/${DISTNAME}/utils
+USE_X11BASE=		YES
+GNU_CONFIGURE=		YES
 
-MAKE_ENV+=	INSTALL_PROGRAM='${INSTALL_PROGRAM}'
-MAKE_ENV+=	INSTALL_MAN='${INSTALL_MAN}'
-MAKE_ENV+=	VERSION=${PKG_VERSION}
+CONFIGURE_ARGS+=	--without-extras --disable-dmalloc --without-gnome
+
+do-build:
+	@(cd ${WRKSRC}/libs && \
+		${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} all)
+	@(cd ${WRKSRC}/utils && \
+		${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} xpmroot)
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/utils/xpmroot   ${PREFIX}/bin
+	${INSTALL_MAN}     ${WRKSRC}/utils/xpmroot.1 ${PREFIX}/man/man1
 
 .include "../../graphics/xpm/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xpmroot/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo	2001/06/29 13:58:52	1.2
+++ distinfo	2001/07/04 07:20:34
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.2 2001/06/29 13:58:52 zuntum Exp $
 
-SHA1 (fvwm-2.2.5.tar.gz) = 2cb0c6dbd1a361987a301956315d9f3b9a68f78b
-Size (fvwm-2.2.5.tar.gz) = 1080046 bytes
-SHA1 (patch-aa) = 0942aa827c56def48c44e71f81f7678db6ff8192
-SHA1 (patch-ab) = bc7424b13dbe85e2fa4949280e4242dba86af4b1
+SHA1 (fvwm-2.4.0.tar.gz) = b7c4c74a7bfad13f0e0a08f0a5d84e45b43fd129
+Size (fvwm-2.4.0.tar.gz) = 1636066 bytes
+SHA1 (patch-aa) = 8535b6b9d4a74bf32700a17ac0bb1d708f29e876
+SHA1 (patch-ab) = da22117bf9cb5b678fb93283a71d1c2e2d13d4c5
>Release-Note:
>Audit-Trail:
>Unformatted: