diff options
| author | tron <tron> | 2009-02-09 11:34:35 +0000 |
|---|---|---|
| committer | tron <tron> | 2009-02-09 11:34:35 +0000 |
| commit | 37bf7abc684a2954a6e4dd1539e13e084184ac68 (patch) | |
| tree | 9d903ff22af361d3530c4867bc6221c8a3d16374 | |
| parent | b5ef8360a8300951a7b236b542441fd5ca80b6ae (diff) | |
| download | pkgsrc-37bf7abc684a2954a6e4dd1539e13e084184ac68.tar.gz | |
Pullup ticket #2692 - requested by cube
xtide: bug fix
Revisions pulled up:
- misc/xtide/Makefile 1.23
- misc/xtide/distinfo 1.8
- misc/xtide/patches/patch-ad 1.1
---
Module Name: pkgsrc
Committed By: cube
Date: Sun Feb 8 00:01:35 UTC 2009
Modified Files:
pkgsrc/misc/xtide: Makefile distinfo
Added Files:
pkgsrc/misc/xtide/patches: patch-ad
Log Message:
Add a patch to configure so that xtide can compile correctly with a X11
distribution in /usr/X11R7. Bump PKGREVISION.
| -rw-r--r-- | misc/xtide/Makefile | 4 | ||||
| -rw-r--r-- | misc/xtide/distinfo | 3 | ||||
| -rw-r--r-- | misc/xtide/patches/patch-ad | 15 |
3 files changed, 19 insertions, 3 deletions
diff --git a/misc/xtide/Makefile b/misc/xtide/Makefile index 9480ca850c3..45742d59786 100644 --- a/misc/xtide/Makefile +++ b/misc/xtide/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.22 2008/11/10 17:21:37 wiz Exp $ +# $NetBSD: Makefile,v 1.22.2.1 2009/02/09 11:34:35 tron Exp $ DISTNAME= xtide-2.8.3 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= misc x11 MASTER_SITES= ftp://ftp.flaterco.com/xtide/ DISTFILES= ${DISTNAME}.tar.bz2 ${HARMONICS_FILE}.bz2 diff --git a/misc/xtide/distinfo b/misc/xtide/distinfo index 2558f5c241d..84f033cced8 100644 --- a/misc/xtide/distinfo +++ b/misc/xtide/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2006/11/05 21:51:21 rillig Exp $ +$NetBSD: distinfo,v 1.7.22.1 2009/02/09 11:34:35 tron Exp $ SHA1 (harmonics-dwf-20060708.tcd.bz2) = 1f54ed856b064e485f7e386eb4a71965e83abfa4 RMD160 (harmonics-dwf-20060708.tcd.bz2) = 754255ac5f2e36cf2dce587e7f9f7bd0561226d9 @@ -9,3 +9,4 @@ Size (xtide-2.8.3.tar.bz2) = 463382 bytes SHA1 (patch-aa) = 8b9059e2870f6b8149e72ca33c452e75650f8230 SHA1 (patch-ab) = 889c68bce0bd78cfc1b5f7410364e8c39182cfec SHA1 (patch-ac) = 07a0099f0d58b8774ae456470142314dabe38c1b +SHA1 (patch-ad) = e267a7d2ab4a753935386dbbd955ebbb984dcd56 diff --git a/misc/xtide/patches/patch-ad b/misc/xtide/patches/patch-ad new file mode 100644 index 00000000000..9a41bcb8d7a --- /dev/null +++ b/misc/xtide/patches/patch-ad @@ -0,0 +1,15 @@ +$NetBSD: patch-ad,v 1.1.2.2 2009/02/09 11:34:35 tron Exp $ + +Try /usr/X11R7 as a possible location for a X11 distribution too. + +--- configure.orig 2006-03-14 00:54:31.000000000 +0000 ++++ configure +@@ -2597,7 +2597,7 @@ fi + echo "$as_me:$LINENO: checking location of X11" >&5 + echo $ECHO_N "checking location of X11... $ECHO_C" >&6 + xroot="NOT FOUND" +-for dir in "/usr/X11R6" "/usr/openwin" "/usr/contrib/X11R6" "/usr"; do ++for dir in "/usr/X11R7" "/usr/X11R6" "/usr/openwin" "/usr/contrib/X11R6" "/usr"; do + if test -r "$dir/lib/libXaw.so" -o -r "$dir/lib/libXaw.a" -o -r "$dir/lib/libXaw.dll.a"; then + xroot="$dir" + xlibdir="$dir/lib" |