summaryrefslogtreecommitdiff
path: root/x11/xpmroot
diff options
context:
space:
mode:
authorrh <rh@pkgsrc.org>1999-11-01 08:44:24 +0000
committerrh <rh@pkgsrc.org>1999-11-01 08:44:24 +0000
commit1d2dd7b71dc11c553bd492bb06c60e1777acd09f (patch)
tree2149feccab3d7afae0fb88c9a258a189dfaa6322 /x11/xpmroot
parent60b923d0c6af084a7657d5472c674ede3def9fac (diff)
downloadpkgsrc-1d2dd7b71dc11c553bd492bb06c60e1777acd09f.tar.gz
Update xpmroot to 2.2.2. This package should now correctly link under ELF
systems. There are no changes to the xpmroot program itself, really, but since fvwm2 is now at version 2.2.2, there is no reason to fetch and keep two distinct versions of the fwvm2 distfile.
Diffstat (limited to 'x11/xpmroot')
-rw-r--r--x11/xpmroot/Makefile5
-rw-r--r--x11/xpmroot/files/md54
-rw-r--r--x11/xpmroot/files/patch-sum4
-rw-r--r--x11/xpmroot/patches/patch-ab12
4 files changed, 14 insertions, 11 deletions
diff --git a/x11/xpmroot/Makefile b/x11/xpmroot/Makefile
index 3417a1cf485..e82514991be 100644
--- a/x11/xpmroot/Makefile
+++ b/x11/xpmroot/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 1999/10/07 17:42:01 tron Exp $
+# $NetBSD: Makefile,v 1.8 1999/11/01 08:44:24 rh Exp $
#
-V= 2.2
+V= 2.2.2
DISTNAME= fvwm-${V}
PKGNAME= xpmroot-${V}
CATEGORIES= x11
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/ \
ftp://ftp.TokyoNet.AD.JP/pub/X/fvwm/fvwm-users-jp/kits/
MAINTAINER= packages@netbsd.org
+HOMEPAGE= http://www.fvwm.org/xpmroot.html
DEPENDS+= xpm-3.4k:../../graphics/xpm
diff --git a/x11/xpmroot/files/md5 b/x11/xpmroot/files/md5
index 956a9f728e1..5a3e9c30984 100644
--- a/x11/xpmroot/files/md5
+++ b/x11/xpmroot/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1999/03/01 01:49:34 hubertf Exp $
+$NetBSD: md5,v 1.4 1999/11/01 08:44:25 rh Exp $
-MD5 (fvwm-2.2.tar.gz) = 6f2f57d60895c8c01057be6d0be3b21a
+MD5 (fvwm-2.2.2.tar.gz) = 684c5100084c5958ca2cb74780e615d9
diff --git a/x11/xpmroot/files/patch-sum b/x11/xpmroot/files/patch-sum
index acdebb15b03..4428749e1ba 100644
--- a/x11/xpmroot/files/patch-sum
+++ b/x11/xpmroot/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:23:37 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/11/01 08:44:25 rh Exp $
MD5 (patch-aa) = 590a26af25d09d6cfcd69d3d3da3b0b7
-MD5 (patch-ab) = 56128732feefa22fc3b52e82e83386ff
+MD5 (patch-ab) = 7c8028c2c6908dc1936dc1b249e2337c
diff --git a/x11/xpmroot/patches/patch-ab b/x11/xpmroot/patches/patch-ab
index b58b1ebe2a6..903371011d7 100644
--- a/x11/xpmroot/patches/patch-ab
+++ b/x11/xpmroot/patches/patch-ab
@@ -1,5 +1,7 @@
---- /dev/null Mon Feb 22 03:47:57 1999
-+++ Makefile Mon Feb 22 04:18:05 1999
+$NetBSD: patch-ab,v 1.2 1999/11/01 08:44:26 rh Exp $
+
+--- /dev/null Mon Nov 1 09:23:05 1999
++++ Makefile Mon Nov 1 09:34:50 1999
@@ -0,0 +1,11 @@
+CFLAGS+= -I${X11BASE}/include -L${X11BASE}/lib -DVERSION=\"${VERSION}\"
+#CFLAGS+= -ggdb
@@ -7,8 +9,8 @@
+
+all: xpmroot
+xpmroot: xpmroot.c
-+ ${CC} ${CFLAGS} xpmroot.c -o xpmroot -lXpm -lX11
++ ${CC} ${CFLAGS} xpmroot.c -o xpmroot ${LDFLAGS} -lXpm -lX11
+
+install:
-+ ${INSTALL_PROGRAM} xpmroot ${X11BASE}/bin
-+ ${INSTALL_MAN} xpmroot.1 ${X11BASE}/man/man1
++ ${INSTALL_PROGRAM} xpmroot ${PREFIX}/bin
++ ${INSTALL_MAN} xpmroot.1 ${PREFIX}/man/man1