diff options
author | martti <martti@pkgsrc.org> | 2006-12-12 06:48:56 +0000 |
---|---|---|
committer | martti <martti@pkgsrc.org> | 2006-12-12 06:48:56 +0000 |
commit | ce475c27104ceaea6cbd7658d5eedcfc2769799f (patch) | |
tree | d69aed2ffcd77d44b8625e7108eae7489c83ca97 | |
parent | 71e6a7aeea82c0929d09e45acca80c234548bc1a (diff) | |
download | pkgsrc-ce475c27104ceaea6cbd7658d5eedcfc2769799f.tar.gz |
Updated xpmroot to 2.4.19 (to match the current fvwm2 version). There are
no changes in the xpmroot code...
Some pkglint -Wall fixes.
-rw-r--r-- | x11/xpmroot/Makefile | 14 | ||||
-rw-r--r-- | x11/xpmroot/distinfo | 10 | ||||
-rw-r--r-- | x11/xpmroot/patches/patch-aa | 8 |
3 files changed, 16 insertions, 16 deletions
diff --git a/x11/xpmroot/Makefile b/x11/xpmroot/Makefile index 6e5ad9a0612..d458ee023c5 100644 --- a/x11/xpmroot/Makefile +++ b/x11/xpmroot/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.50 2006/04/25 07:49:10 martti Exp $ +# $NetBSD: Makefile,v 1.51 2006/12/12 06:48:56 martti Exp $ # DISTNAME= fvwm-${PKG_VERSION} PKGNAME= xpmroot-${PKG_VERSION} -PKGREVISION= 1 +#PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/ \ ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/ @@ -12,7 +12,7 @@ MAINTAINER= martti@NetBSD.org HOMEPAGE= http://www.fvwm.org/generated/manpages/xpmroot.html COMMENT= Sets the root window to an Xpm pixmap -PKG_VERSION= 2.4.19 +PKG_VERSION= 2.4.20 USE_X11BASE= YES GNU_CONFIGURE= YES @@ -22,10 +22,10 @@ CONFIGURE_ARGS+= --without-extras --disable-dmalloc --without-gnome INSTALLATION_DIRS= bin ${PKGMANDIR:Q}/man1 do-build: - @(cd ${WRKSRC:Q}/libs && \ - ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} all) - @(cd ${WRKSRC:Q}/utils && \ - ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} xpmroot) + (cd ${WRKSRC:Q}/libs && \ + env ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} all) + (cd ${WRKSRC:Q}/utils && \ + env ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} xpmroot) do-install: ${INSTALL_PROGRAM} ${WRKSRC:Q}/utils/xpmroot ${PREFIX:Q}/bin diff --git a/x11/xpmroot/distinfo b/x11/xpmroot/distinfo index 395d2f68679..66791cc6fd3 100644 --- a/x11/xpmroot/distinfo +++ b/x11/xpmroot/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.25 2006/06/30 13:03:27 tron Exp $ +$NetBSD: distinfo,v 1.26 2006/12/12 06:48:56 martti Exp $ -SHA1 (fvwm-2.4.19.tar.gz) = 6d881473560d6ded360fc47a7cfb1b3d5d30824f -RMD160 (fvwm-2.4.19.tar.gz) = cc6e3ceebccd50ba0404079771faa6babc041ca0 -Size (fvwm-2.4.19.tar.gz) = 1826833 bytes -SHA1 (patch-aa) = 5fe6ed5b63ec933623e26409c4e71f01a63bb3c7 +SHA1 (fvwm-2.4.20.tar.gz) = 2130a16590462cbbf15f255a46abe8b8a6cb4401 +RMD160 (fvwm-2.4.20.tar.gz) = c71f8cce0b7d7258aeef94d889c1a0346c2ae21b +Size (fvwm-2.4.20.tar.gz) = 1844688 bytes +SHA1 (patch-aa) = 06800ec36cd683a393a085c6533ab4fd6f61528f diff --git a/x11/xpmroot/patches/patch-aa b/x11/xpmroot/patches/patch-aa index a4f630147a9..575fe45bdf2 100644 --- a/x11/xpmroot/patches/patch-aa +++ b/x11/xpmroot/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.7 2006/06/30 13:03:27 tron Exp $ +$NetBSD: patch-aa,v 1.8 2006/12/12 06:48:56 martti Exp $ ---- config.h.in.orig 2005-12-04 01:33:41.000000000 +0000 -+++ config.h.in -@@ -427,6 +427,8 @@ +--- config.h.in.orig 2006-12-09 11:54:06.000000000 +0000 ++++ config.h.in 2006-12-12 08:44:04.000000000 +0000 +@@ -432,6 +432,8 @@ #else # ifdef _AIX #pragma alloca |