head	1.3;
access;
symbols
	pkgsrc-2013Q2:1.3.0.8
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2012Q4:1.3.0.6
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2011Q4:1.3.0.4
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q2:1.3.0.2
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2009Q4:1.2.0.2
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2009Q3:1.1.0.8
	pkgsrc-2009Q3-base:1.1
	pkgsrc-2009Q2:1.1.0.6
	pkgsrc-2009Q2-base:1.1
	pkgsrc-2009Q1:1.1.0.4
	pkgsrc-2009Q1-base:1.1
	pkgsrc-2008Q4:1.1.0.2;
locks; strict;
comment	@# @;


1.3
date	2010.03.14.16.40.12;	author wiz;	state dead;
branches;
next	1.2;

1.2
date	2009.11.09.12.46.54;	author joerg;	state Exp;
branches;
next	1.1;

1.1
date	2009.02.08.00.01.35;	author cube;	state Exp;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2009.02.08.00.01.35;	author tron;	state dead;
branches;
next	1.1.2.2;

1.1.2.2
date	2009.02.09.11.34.35;	author tron;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Remove xtide, moved to time.
@
text
@$NetBSD: patch-ad,v 1.2 2009/11/09 12:46:54 joerg Exp $

Kill broken X11 check.

--- configure.orig	2006-03-14 01:54:31.000000000 +0100
+++ configure
@@@@ -2596,20 +2596,8 @@@@ 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
-  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"
-    break
-  else
-    if test -r "$dir/lib64/libXaw.so" -o -r "$dir/lib64/libXaw.a" -o -r "$dir/lib64/libXaw.dll.a"; then
-      xroot="$dir"
-      xlibdir="$dir/lib64"
-      break
-    fi
-  fi
-done
+xroot="$X11BASE"
+xlibdir="$xroot/lib"
 echo "$as_me:$LINENO: result: $xroot" >&5
 echo "${ECHO_T}$xroot" >&6
 if test "$xroot" = "NOT FOUND"; then
@


1.2
log
@Kill broken check for finding X11, just wire down our values.
@
text
@d1 1
a1 1
$NetBSD$
@


1.1
log
@Add a patch to configure so that xtide can compile correctly with a X11
distribution in /usr/X11R7.  Bump PKGREVISION.
@
text
@d3 1
a3 1
Try /usr/X11R7 as a possible location for a X11 distribution too.
d5 1
a5 1
--- configure.orig	2006-03-14 00:54:31.000000000 +0000
d7 2
a8 1
@@@@ -2597,7 +2597,7 @@@@ fi
d11 1
a11 1
 xroot="NOT FOUND"
d13 17
a29 4
+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"
@


1.1.2.1
log
@file patch-ad was added on branch pkgsrc-2008Q4 on 2009-02-09 11:34:35 +0000
@
text
@d1 15
@


1.1.2.2
log
@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.
@
text
@a0 15
$NetBSD: patch-ad,v 1.1 2009/02/08 00:01:35 cube 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"
@