diff options
| -rw-r--r-- | x11/xpmroot/Makefile | 26 | ||||
| -rw-r--r-- | x11/xpmroot/distinfo | 8 | ||||
| -rw-r--r-- | x11/xpmroot/patches/patch-aa | 13 | ||||
| -rw-r--r-- | x11/xpmroot/patches/patch-ab | 18 |
4 files changed, 20 insertions, 45 deletions
diff --git a/x11/xpmroot/Makefile b/x11/xpmroot/Makefile index e1adc1c1550..d45bfb5549b 100644 --- a/x11/xpmroot/Makefile +++ b/x11/xpmroot/Makefile @@ -1,27 +1,35 @@ -# $NetBSD: Makefile,v 1.16 2001/06/29 13:58:52 zuntum Exp $ +# $NetBSD: Makefile,v 1.17 2001/07/10 17:51:14 nra Exp $ # DISTNAME= fvwm-${PKG_VERSION} PKGNAME= xpmroot-${PKG_VERSION} -PKG_VERSION= 2.2.5 CATEGORIES= x11 -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.TokyoNet.AD.JP/pub/X/fvwm/fvwm-users-jp/kits/ +MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/ \ + ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.fvwm.org/generated/manpages/xpmroot.html COMMENT= Sets the root window to an Xpm pixmap +PKG_VERSION= 2.4.0 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" diff --git a/x11/xpmroot/distinfo b/x11/xpmroot/distinfo index a23cb9ab1af..6c8b83fe79b 100644 --- a/x11/xpmroot/distinfo +++ b/x11/xpmroot/distinfo @@ -1,6 +1,4 @@ -$NetBSD: distinfo,v 1.2 2001/06/29 13:58:52 zuntum Exp $ +$NetBSD: distinfo,v 1.3 2001/07/10 17:51:14 nra 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 diff --git a/x11/xpmroot/patches/patch-aa b/x11/xpmroot/patches/patch-aa deleted file mode 100644 index 497163106bf..00000000000 --- a/x11/xpmroot/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.4 1999/11/01 08:50:50 rh 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. - ****************************************************************************/ - --#include "config.h" -- - #include <stdio.h> - #include <signal.h> - #include <string.h> diff --git a/x11/xpmroot/patches/patch-ab b/x11/xpmroot/patches/patch-ab deleted file mode 100644 index b55ed3af72e..00000000000 --- a/x11/xpmroot/patches/patch-ab +++ /dev/null @@ -1,18 +0,0 @@ ---- /dev/null Fri Jun 29 12:54:37 2001 -+++ Makefile Fri Jun 29 12:55:05 2001 -@@ -0,0 +1,15 @@ -+#CFLAGS+= -ggdb -+CFLAGS+= -O2 -+ -+CPPFLAGS+= -DVERSION=\"${VERSION}\" -+CPPFLAGS+= -I${X11BASE}/include -+ -+LDFLAGS+= -L${X11BASE}/lib -+ -+all: xpmroot -+xpmroot: xpmroot.c -+ ${CC} ${CFLAGS} ${CPPFLAGS} -o xpmroot xpmroot.c ${LDFLAGS} -lXpm -lX11 -+ -+install: -+ ${INSTALL_PROGRAM} xpmroot ${PREFIX}/bin -+ ${INSTALL_MAN} xpmroot.1 ${PREFIX}/man/man1 |