Convert to use buildlink.mk files and mark as USE_BUILDLINK_ONLY. If not

on Linux, force use of specific fstropen code.  Also fix check for AIX in
the source code.

8 files changed, 87 insertions, 81 deletions

diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile
index 4f76702527d..1fb5b3cb7cc 100644
--- a/graphics/geomview/Makefile
+++ b/graphics/geomview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/06/11 06:34:35 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2001/07/04 03:08:57 jlam Exp $
 
 DISTNAME=		geomview-1.8.1
 CATEGORIES=		graphics math
@@ -10,21 +10,23 @@ COMMENT=		Interactive geometry viewing program
 
 CONFLICTS=		ImageMagick-*	# both have a program named 'animate'
 
+USE_BUILDLINK_ONLY=	yes
 GNU_CONFIGURE=		yes
 USE_X11=		yes
-USE_MOTIF=		yes
-USE_MESA=		yes
-
-MESABASE_DEFAULT=	${X11BASE}
-EVAL_PREFIX+=		MESABASE=Mesa
 
 CONFIGURE_ARGS+=	--without-xforms
-CONFIGURE_ARGS+=	--with-opengl=${MESABASE}
-CONFIGURE_ARGS+=	--with-motif=${MOTIFBASE}
-CPPFLAGS+=		-Dunix -Dalloca=__builtin_alloca
+CONFIGURE_ARGS+=	--with-opengl=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-motif=${BUILDLINK_DIR}
+CPPFLAGS+=		-Dunix -Dalloca=__builtin_alloca -I${X11BASE}/include
 
 INFO_FILES=		geomview
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} != "Linux"
+CONFIGURE_ARGS+=	--enable-fstropen-1
+.endif
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/geomview
 	${INSTALL_DATA} ${WRKSRC}/doc/geomview.pdf			\
@@ -39,4 +41,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/html/pix/*			\
 	${PREFIX}/share/doc/html/geomview/pix
 
+.include "../../graphics/Mesa/buildlink.mk"
+.include "../../x11/lesstif/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/geomview/distinfo b/graphics/geomview/distinfo
index 78d30ec72f0..a99ff994ce3 100644
--- a/graphics/geomview/distinfo
+++ b/graphics/geomview/distinfo
@@ -1,10 +1,14 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 09:54:13 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/07/04 03:08:57 jlam Exp $
 
 SHA1 (geomview-1.8.1.tar.gz) = 026a22ecba471f7d55c407de4fc409213d166477
 Size (geomview-1.8.1.tar.gz) = 2766832 bytes
-SHA1 (patch-aa) = a9ee95f1ee26a4533a3f34a05a5b5314eaddc4f3
+SHA1 (patch-aa) = 46f609f1fcb2f9a58348f9fa8033a4b7c8954461
 SHA1 (patch-ab) = 706b10ccfb3ba02baa48b461123707cdd9cbfdff
-SHA1 (patch-ac) = dfc755b29ad0bb37311ad6d46022f2afcc56ccd9
+SHA1 (patch-ac) = 55d2297e8a31203fc5f21b2800f4a2948ee07f9c
 SHA1 (patch-ad) = 9db6fb9ffae5939f80bfcae8aa5da389437d627c
 SHA1 (patch-ae) = f9b721883520a701ae66ab28f4e4b7e6e307fea7
 SHA1 (patch-af) = a9eab9b45dfaed20d08472b56d1b1fb880081a0e
+SHA1 (patch-ag) = 427d9d114d581b0bcbfbba9ca1122bd384aa79a6
+SHA1 (patch-ah) = 458e2e764acf83309104c74fcfbf3dfba8251d29
+SHA1 (patch-ai) = 44b8fe3c228d5761cc1578c0418c358101ec3adc
+SHA1 (patch-aj) = 8c04229693165b471228c8bcb0b092afcdd6d890
diff --git a/graphics/geomview/patches/patch-aa b/graphics/geomview/patches/patch-aa
index 8a0cf974efb..60c3a90d3ce 100644
--- a/graphics/geomview/patches/patch-aa
+++ b/graphics/geomview/patches/patch-aa
@@ -1,75 +1,12 @@
-$NetBSD: patch-aa,v 1.2 2001/03/29 00:02:18 jtb Exp $
+$NetBSD: patch-aa,v 1.3 2001/07/04 03:08:58 jlam Exp $
 
---- configure.orig	Mon Mar 26 05:23:02 2001
+--- configure.orig	Mon Mar 26 00:23:02 2001
 +++ configure
-@@ -2028,7 +2028,7 @@
- 
-   # It would also be nice to do this for all -L options, not just this one.
-   if test -n "$x_libraries"; then
--    X_LIBS="$X_LIBS -L$x_libraries"
-+    X_LIBS="$X_LIBS -Wl,-R$x_libraries -L$x_libraries"
-     # For Solaris; some versions of Sun CC require a space after -R and
-     # others require no space.  Words are not sufficient . . . .
-     case "`(uname -sr) 2>/dev/null`" in
-@@ -2563,7 +2563,7 @@
- 
-   # Check for libraries that X11R6 Xt/Xaw programs need.
-   ac_save_LDFLAGS="$LDFLAGS"
--  test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
-+  test -n "$x_libraries" && LDFLAGS="$LDFLAGS -Wl,-R$x_libraries -L$x_libraries"
-   # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
-   # check for ICE first), but we must link in the order -lSM -lICE or
-   # we get undefined symbols.  So assume we have SM if we have ICE.
-@@ -2643,7 +2643,7 @@
- for geom_z in $geom_dirs ; do
-   geom_z=`eval echo $geom_z`
-   geom_l_option=
--  test -n "$geom_z" && geom_l_option="-L$geom_z"
-+  test -n "$geom_z" && geom_l_option="-Wl,-R$geom_z -L$geom_z"
-   LIBS="$geom_l_option $geom_lib $geom_otherlibs"
-   echo "configure:2649: checking for $geom_func with $geom_l_option" >&5
-   cat > conftest.$ac_ext <<EOF
-@@ -2781,7 +2781,7 @@
- for geom_z in $geom_dirs ; do
-   geom_z=`eval echo $geom_z`
-   geom_l_option=
--  test -n "$geom_z" && geom_l_option="-L$geom_z"
-+  test -n "$geom_z" && geom_l_option="-Wl,-R$geom_z -L$geom_z"
-   LIBS="$geom_l_option $geom_lib $geom_otherlibs"
-   echo "configure:2787: checking for $geom_func with $geom_l_option" >&5
-   cat > conftest.$ac_ext <<EOF
-@@ -2910,7 +2910,7 @@
- for geom_z in $geom_dirs ; do
-   geom_z=`eval echo $geom_z`
-   geom_l_option=
--  test -n "$geom_z" && geom_l_option="-L$geom_z"
-+  test -n "$geom_z" && geom_l_option="-Wl,-R$geom_z -L$geom_z"
-   LIBS="$geom_l_option $geom_lib $geom_otherlibs"
-   echo "configure:2916: checking for $geom_func with $geom_l_option" >&5
-   cat > conftest.$ac_ext <<EOF
-@@ -2964,7 +2964,7 @@
- for geom_z in $geom_dirs ; do
-   geom_z=`eval echo $geom_z`
-   geom_l_option=
--  test -n "$geom_z" && geom_l_option="-L$geom_z"
-+  test -n "$geom_z" && geom_l_option="-Wl,-R$geom_z -L$geom_z"
-   LIBS="$geom_l_option $geom_lib $geom_otherlibs"
-   echo "configure:2970: checking for $geom_func with $geom_l_option" >&5
-   cat > conftest.$ac_ext <<EOF
-@@ -3106,7 +3106,7 @@
- for geom_z in $geom_dirs ; do
-   geom_z=`eval echo $geom_z`
-   geom_l_option=
--  test -n "$geom_z" && geom_l_option="-L$geom_z"
-+  test -n "$geom_z" && geom_l_option="-Wl,-R$geom_z -L$geom_z"
-   LIBS="$geom_l_option $geom_lib $geom_otherlibs"
-   echo "configure:3112: checking for $geom_func with $geom_l_option" >&5
-   cat > conftest.$ac_ext <<EOF
 @@ -3462,6 +3462,7 @@
  cat > conftest.$ac_ext <<EOF
  #line 3464 "configure"
  #include "confdefs.h"
-+#include <stdio.h>
++#include <sys/types.h>
   #include <sys/socket.h> 
  int main() {
   int s = socket(AF_UNIX, SOCK_STREAM, 0); 
diff --git a/graphics/geomview/patches/patch-ac b/graphics/geomview/patches/patch-ac
index 969e3629826..b8df1213bd2 100644
--- a/graphics/geomview/patches/patch-ac
+++ b/graphics/geomview/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/02/09 03:27:02 jtb Exp $
+$NetBSD: patch-ac,v 1.2 2001/07/04 03:08:58 jlam Exp $
 
---- src/lib/oogl/util/futil.c.orig	Fri Feb  9 01:08:25 2001
+--- src/lib/oogl/util/futil.c.orig	Thu Feb 22 23:41:31 2001
 +++ src/lib/oogl/util/futil.c
-@@ -177,7 +177,7 @@
+@@ -173,7 +173,7 @@
  #define _cnt __cnt
  #endif 
  
@@ -11,3 +11,12 @@ $NetBSD: patch-ac,v 1.1.1.1 2001/02/09 03:27:02 jtb Exp $
  #define _base _bf._base
  #define _ptr _p
  #define _cnt _r
+@@ -869,7 +869,7 @@
+ 
+ #else   /* Roughly vanilla stdio */
+ 
+-#if defined(AIX) || defined(__osf__) || defined(__hpux) || defined(__FreeBSD__)
++#if defined(AIX) || defined(__osf__) || defined(__hpux) || defined(__FreeBSD__) || defined(__NetBSD__)
+ 
+ #define USE_FSTROPEN_1 1
+ 
diff --git a/graphics/geomview/patches/patch-ag b/graphics/geomview/patches/patch-ag
new file mode 100644
index 00000000000..187908b69e7
--- /dev/null
+++ b/graphics/geomview/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2001/07/04 03:08:58 jlam Exp $
+
+--- src/lib/oogl/util/mallocp.c.orig	Fri Sep  1 18:38:16 2000
++++ src/lib/oogl/util/mallocp.c
+@@ -38,7 +38,7 @@
+  */
+ void *OOG_CurSM		= NULL;
+ 
+-#if defined(sgi) || AIX
++#if defined(sgi) || (defined(AIX) && AIX)
+ void *(*OOG_NewP)(size_t)		= malloc;
+ void  (*OOGLFree)(void *)		= free;
+ void *(*OOG_RenewP)(void *, size_t)	= realloc;
diff --git a/graphics/geomview/patches/patch-ah b/graphics/geomview/patches/patch-ah
new file mode 100644
index 00000000000..9d34d5e1ed2
--- /dev/null
+++ b/graphics/geomview/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2001/07/04 03:08:58 jlam Exp $
+
+--- src/lib/oogl/util/ooglutil.h.orig	Fri Sep  1 18:38:16 2000
++++ src/lib/oogl/util/ooglutil.h
+@@ -57,7 +57,7 @@
+ /*
+  * Memory allocation
+  */
+-#if defined(sgi) || AIX
++#if defined(sgi) || (defined(AIX) && AIX)
+ extern void *(*OOG_NewP)(size_t);
+ extern void *(*OOG_RenewP)(void *, size_t);
+ #else
diff --git a/graphics/geomview/patches/patch-ai b/graphics/geomview/patches/patch-ai
new file mode 100644
index 00000000000..f940f5126d2
--- /dev/null
+++ b/graphics/geomview/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2001/07/04 03:08:58 jlam Exp $
+
+--- acconfig.h.orig	Tue Feb 27 14:43:20 2001
++++ acconfig.h
+@@ -8,7 +8,7 @@
+ /* Does -lXmu exist on this system? */
+ #define HAVE_XMU 0
+ 
+-#define AIX 0
++#undef AIX
+ 
+ #undef sgi
+ 
diff --git a/graphics/geomview/patches/patch-aj b/graphics/geomview/patches/patch-aj
new file mode 100644
index 00000000000..ac44842d815
--- /dev/null
+++ b/graphics/geomview/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2001/07/04 03:08:58 jlam Exp $
+
+--- config.h.in.orig	Thu Mar  1 13:10:38 2001
++++ config.h.in
+@@ -53,7 +53,7 @@
+ /* Does -lXmu exist on this system? */
+ #define HAVE_XMU 0
+ 
+-#define AIX 0
++#undef AIX
+ 
+ #undef sgi
+