diff options
author | garbled <garbled@pkgsrc.org> | 1998-10-22 05:42:37 +0000 |
---|---|---|
committer | garbled <garbled@pkgsrc.org> | 1998-10-22 05:42:37 +0000 |
commit | b2d377877f77b9bd79ce06e5deb27e35c4904646 (patch) | |
tree | a44ebccef26ce65373c253af624b051c60067dbd /sysutils | |
parent | d8432ad4229ac96fedff948c6ef6a1210c59c233 (diff) | |
download | pkgsrc-b2d377877f77b9bd79ce06e5deb27e35c4904646.tar.gz |
Update this pkg to 1.6.2.a. This fixes the pkg to run on alpha. Thanks
to Brian Grayson for fixing it.
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/xosview/Makefile | 6 | ||||
-rw-r--r-- | sysutils/xosview/files/md5 | 4 | ||||
-rw-r--r-- | sysutils/xosview/patches/patch-aa | 16 | ||||
-rw-r--r-- | sysutils/xosview/patches/patch-ab | 26 | ||||
-rw-r--r-- | sysutils/xosview/patches/patch-ac | 12 |
5 files changed, 4 insertions, 60 deletions
diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile index e0ba595f07b..81615e36363 100644 --- a/sysutils/xosview/Makefile +++ b/sysutils/xosview/Makefile @@ -1,13 +1,11 @@ -# $NetBSD: Makefile,v 1.16 1998/09/24 23:15:42 garbled Exp $ +# $NetBSD: Makefile,v 1.17 1998/10/22 05:42:37 garbled Exp $ # -DISTNAME= xosview-1.6.0 +DISTNAME= xosview-1.6.2.a CATEGORIES= sysutils MASTER_SITES= http://www.ece.utexas.edu/~bgrayson/xosview/ \ http://lore.ece.utexas.edu/~bgrayson/xosview/ -NOT_FOR_ARCHS= alpha # 1.6.2a fixes this, no need to get upset. - MAINTAINER= bgrayson@ece.utexas.edu HOMEPAGE= http://lore.ece.utexas.edu/~bgrayson/xosview.html diff --git a/sysutils/xosview/files/md5 b/sysutils/xosview/files/md5 index 52663041b83..d2779c45bdc 100644 --- a/sysutils/xosview/files/md5 +++ b/sysutils/xosview/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.5 1998/08/11 12:20:59 agc Exp $ +$NetBSD: md5,v 1.6 1998/10/22 05:42:37 garbled Exp $ -MD5 (xosview-1.6.0.tar.gz) = 08e1380466ecb1ef336f13aedbc4cb3e +MD5 (xosview-1.6.2.a.tar.gz) = bf021401b5dbf3971ff8a4ea6c90ee11 diff --git a/sysutils/xosview/patches/patch-aa b/sysutils/xosview/patches/patch-aa deleted file mode 100644 index e22532cb8d6..00000000000 --- a/sysutils/xosview/patches/patch-aa +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-aa,v 1.6 1998/08/07 11:14:10 agc Exp $ - ---- configure.orig Sat May 16 22:35:12 1998 -+++ configure Thu May 21 17:07:50 1998 -@@ -1340,9 +1340,9 @@ - ## contents are still nonnull. - # First, grab the UVM string out of /etc/mk.conf (and silently - # ignore if /etc/mk.conf doesn't exist.) -- uvmstring=`grep UVM /etc/mk.conf 2>/dev/null` -+ uvmstring=`grep ^UVM /etc/mk.conf 2>/dev/null` - # Now, replace any whitespace around the =. -- uvmstring=`echo $uvmstring | sed -e 's/ *= */=/'` -+ uvmstring=`echo $uvmstring | sed -e 's/ *= */=/;s/ *\?=/=/'` - # Now, remove any trailing whitespace, and strip comments. - uvmstring=`echo $uvmstring | sed -e 's/ *$//;s/#.*$//'` - # At this point, we should have either the empty string or diff --git a/sysutils/xosview/patches/patch-ab b/sysutils/xosview/patches/patch-ab deleted file mode 100644 index f3627c0588e..00000000000 --- a/sysutils/xosview/patches/patch-ab +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-ab,v 1.5 1998/08/07 11:14:11 agc Exp $ - ---- Xrm.cc.orig Fri May 29 04:34:30 1998 -+++ Xrm.cc Fri May 29 04:39:30 1998 -@@ -156,7 +156,7 @@ - if (xappdir != NULL) - { - char xappfile[1024]; -- sprintf (xappfile, "%s/%s", xappdir, className()); -+ snprintf (xappfile, 1024, "%s/%s", xappdir, className()); - // this did not work for XAPPLRESDIR - //if (!access (xappfile, X_OK | R_OK)) - if (!access (xappfile, R_OK)) -@@ -185,8 +185,10 @@ - // Now, check for a user resource file, and merge it in if there is one... - if ( getenv( "HOME" ) != NULL ){ - char userrfilename[1024]; -- strcpy(userrfilename, getenv("HOME")); -- strcat(userrfilename, "/.Xdefaults"); -+#define XDEFAULTS "/.Xdefaults" -+ strncpy(userrfilename, getenv("HOME"), 1024-strlen(XDEFAULTS)); -+ strcat(userrfilename, XDEFAULTS); -+#undef XDEFAULTS - // User file overrides system (_db). - XrmCombineFileDatabase (userrfilename, &_db, 1); - } diff --git a/sysutils/xosview/patches/patch-ac b/sysutils/xosview/patches/patch-ac deleted file mode 100644 index 966267c35ad..00000000000 --- a/sysutils/xosview/patches/patch-ac +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ac,v 1.3 1998/09/15 17:38:08 garbled Exp $ ---- config/Makefile.top.in.orig Mon Sep 14 23:27:27 1998 -+++ config/Makefile.top.in Mon Sep 14 23:27:41 1998 -@@ -41,7 +41,7 @@ - @top_srcdir@/@host_os@/libmeter.a: meterlib - - xosview: $(OBJS) @top_srcdir@/@host_os@/libmeter.a -- $(CXX) $(LFLAGS) -o xosview $(OBJS) $(LIBS) -+ $(CXX) $(LDFLAGS) $(LFLAGS) -o xosview $(OBJS) $(LIBS) - - ## If for some reason (such as permissions) you wish to change where - ## xosview is installed, modify X11BASEDIR here to point to your |