Adjust for NetBSD

12 files changed, 115 insertions, 147 deletions

diff --git a/x11/fox/Makefile b/x11/fox/Makefile
index 63e75946bdb..c9ab4c5b573 100644
--- a/x11/fox/Makefile
+++ b/x11/fox/Makefile
@@ -1,56 +1,39 @@
-# New ports collection makefile for:	fox
-# Date created:		23 Feb 2000
-# Whom:			Will Andrews <andrews@technologist.com>
-#
-# $FreeBSD: ports/x11-toolkits/fox/Makefile,v 1.15 2001/02/24 06:37:04 knu Exp $
-#
-
-PORTNAME=	fox
-PORTVERSION=	0.99.157
-CATEGORIES=	x11-toolkits
+# $NetBSD: Makefile,v 1.2 2001/02/24 16:56:54 sakamoto Exp $
+# FreeBSD Id: ports/x11-toolkits/fox/Makefile,v 1.14 2001/02/23 19:00:05 knu Exp
+
+DISTNAME=	fox-0.99.157
+CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.cfdrc.com/pub/FOX/ \
 		ftp://SunSITE.Informatik.RWTH-Aachen.DE/pub/Linux/fox/
 
-MAINTAINER?=	knu@FreeBSD.org
+MAINTAINER=	sakamoto@netbsd.org
+HOMEPAGE=	http://www.cfdrc.com/FOX/fox.html
+COMMENT=	Fast and extensive C++ GUI toolkit
 
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		png.4:${PORTSDIR}/graphics/png
+DEPENDS=	jpeg-*:../../graphics/jpeg \
+		png-*:../../graphics/png
 
-.if defined(WITH_XUNICODE)
-PKGNAMESUFFIX=	-xunicode
+.if !defined(USE_XUNICODE) || ${USE_XUNICODE} == "YES"
 
-PATCH_SITES=	http://www.ab.wakwak.com/~tino/jatk/fox/
-PATCHFILES=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}.diff
-PATCH_DIST_STRIP=	-p1
+MASTER_SITES+=	http://www.ab.wakwak.com/~tino/jatk/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} xunicode-0.3.1${EXTRACT_SUFX}
 
-#EXTRA_PATCHES=	${PATCHDIR}/xunicode.patch-*
+PATCH_SITES=	http://www.ab.wakwak.com/~tino/jatk/fox/
+PATCHFILES=	${DISTNAME:C/-/-xunicode-/}.diff
+PATCH_DIST_STRIP=-p1
 
-BUILD_DEPENDS=	${X11BASE}/lib/libxunicode.a:${PORTSDIR}/converters/xunicode
+CPPFLAGS+=	-I..
+X_CFLAGS=	-DUSE_XUNICODE
+CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" X_CFLAGS="${X_CFLAGS}"
 
-CONFIGURE_ENV=	X_CFLAGS=-DUSE_XUNICODE
 .endif
 
-USE_MESA=	yes
-INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS+=--with-opengl=mesa --with-x
-.if defined(NO_SHM)
-CONFIGURE_ARGS+=--with-shm=no
-.else
-CONFIGURE_ARGS+=--with-shm=yes
-.endif
-.if defined(DEBUG)
-CONFIGURE_ARGS+=--enable-debug
-.else
-CONFIGURE_ARGS+=--enable-release
-.endif
-.if defined(WANT_PROFILE)
-CONFIGURE_ARGS+=--with-profiling=gprof
-.endif
-USE_LIBTOOL=	yes
-SHLIB_MAJ=	1
-SHLIB_MIN=	0
-MAKE_ENV+=	LT_CURRENT="${SHLIB_MAJ}" LT_REVISION="${SHLIB_MIN}"
-PLIST_SUB+=	LIBVER="${SHLIB_MAJ}"
-MAN1=		reswrap.1
-
-.include <bsd.port.mk>
+USE_X11BASE=	# defined
+USE_MESA=	# defined
+USE_LIBTOOL=	# defined
+LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig
+
+GNU_CONFIGURE=	# defined
+CONFIGURE_ARGS+=--with-opengl=mesa --with-x --with-shm=yes --enable-release
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/fox/distinfo b/x11/fox/files/md5
index 38e7860e5e7..ce67d82bb77 100644
--- a/x11/fox/distinfo
+++ b/x11/fox/files/md5
@@ -1,2 +1,5 @@
+$NetBSD: md5,v 1.1 2001/02/24 16:56:55 sakamoto Exp $
+
 MD5 (fox-0.99.157.tar.gz) = 7f717dc23fb8f03904e9cc3a7e141ad7
+MD5 (xunicode-0.3.1.tar.gz) = 4149f569fcab08a3b51de7171fded4d9
 MD5 (fox-xunicode-0.99.157.diff) = 40332576f9a24434ae7201fb1531bb11
diff --git a/x11/fox/files/patch-aa b/x11/fox/files/patch-aa
deleted file mode 100644
index 1332b8b8e02..00000000000
--- a/x11/fox/files/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/Makefile.in.orig	Fri Oct  6 16:07:43 2000
-+++ src/Makefile.in	Mon Oct  9 08:18:53 2000
-@@ -74,9 +74,9 @@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LT_AGE = @LT_AGE@
--LT_CURRENT = @LT_CURRENT@
-+LT_CURRENT ?= @LT_CURRENT@
- LT_RELEASE = @LT_RELEASE@
--LT_REVISION = @LT_REVISION@
-+LT_REVISION ?= @LT_REVISION@
- MAKEINFO = @MAKEINFO@
- OBJDUMP = @OBJDUMP@
- PACKAGE = @PACKAGE@
-@@ -91,7 +91,7 @@
- 
- libFOX_la_LIBADD = $(X_LIBS) $(X_BASE_LIBS) $(X_EXTRA_LIBS) $(GL_LIBS)
- 
--libFOX_la_LDFLAGS =          -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)    	-release $(LT_RELEASE)
-+libFOX_la_LDFLAGS =          -version-info $(LT_CURRENT):$(LT_REVISION)
- 
- 
- CURSORS =          crosshair.xbm                   crosshair_mask.xbm              dndcopy.xbm                     dndcopy_mask.xbm                dndlink.xbm                     dndlink_mask.xbm                dndmove.xbm                     dndmove_mask.xbm                dontdrop.xbm                    dontdrop_mask.xbm               drag.xbm                        drag_mask.xbm                   gray.xbm                        hsplit.xbm                      hsplit_mask.xbm                 move.xbm                        move_mask.xbm                   resize.xbm                      resize_mask.xbm                 resizeleft.xbm                  resizeleft_mask.xbm             resizetop.xbm                   resizetop_mask.xbm              resizetopleft.xbm               resizetopleft_mask.xbm          resizetopright.xbm              resizetopright_mask.xbm         rotate.xbm                      rotate_mask.xbm                 swatch.xbm                      swatch_mask.xbm                 vsplit.xbm                      vsplit_mask.xbm                 xsplit.xbm                      xsplit_mask.xbm                 ne.xbm                          ne_mask.xbm                     se.xbm                          se_mask.xbm                     sw.xbm                          sw_mask.xbm                     nw.xbm                          nw_mask.xbm                     translate.xbm                   translate_mask.xbm              zoom.xbm                        zoom_mask.xbm
diff --git a/x11/fox/files/patch-ac b/x11/fox/files/patch-ac
deleted file mode 100644
index e670d025bdc..00000000000
--- a/x11/fox/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/Makefile.in	Tue Feb 22 14:46:40 2000
-+++ doc/Makefile.in.new	Wed Mar  1 06:11:30 2000
-@@ -86,7 +86,7 @@
- VERSION = @VERSION@
- X_BASE_LIBS = @X_BASE_LIBS@
- 
--htmldir = $(prefix)/@PACKAGE@/html
-+htmldir = $(datadir)/@PACKAGE@/html
- 
- # Source code documentation tool
- PERCEPS = perceps
diff --git a/x11/fox/files/patch-ad b/x11/fox/files/patch-ad
deleted file mode 100644
index e87350549e2..00000000000
--- a/x11/fox/files/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure	Mon Mar  6 13:25:50 2000
-+++ configure.new	Mon Mar  6 13:33:37 2000
-@@ -3561,7 +3561,10 @@
- if test "x$enable_release" = "xyes" ; then
- CXXFLAGS="${CXXFLAGS} -O2 -DNDEBUG"
- if test "${GXX}" = "yes" ; then
--CXXFLAGS="${CXXFLAGS} -Wuninitialized -ffast-math -finline-functions -fomit-frame-pointer -fexpensive-optimizations"
-+CXXFLAGS="${CXXFLAGS} -Wuninitialized -ffast-math -finline-functions -fexpensive-optimizations"
-+if test "${with_profiling}" = ""; then
-+CXXFLAGS="${CXXFLAGS} -fomit-frame-pointer"
-+fi
- fi
- fi
- 
diff --git a/x11/fox/files/patch-sum b/x11/fox/files/patch-sum
new file mode 100644
index 00000000000..24d9279f533
--- /dev/null
+++ b/x11/fox/files/patch-sum
@@ -0,0 +1,5 @@
+$NetBSD: patch-sum,v 1.1 2001/02/24 16:56:56 sakamoto Exp $
+
+MD5 (patch-ab) = d53d3099885b9d5afad4705bf488928c
+MD5 (patch-ac) = 2a7ae643261f7ffab5fc951de90243d2
+MD5 (patch-ae) = b1bb9ea94bcbad4c3670d10aa46ce985
diff --git a/x11/fox/files/patch-ab b/x11/fox/patches/patch-ab
index 4c0f67c3d56..44234072580 100644
--- a/x11/fox/files/patch-ab
+++ b/x11/fox/patches/patch-ab
@@ -1,3 +1,5 @@
+$NetBSD: patch-ab,v 1.1 2001/02/24 16:56:56 sakamoto Exp $
+
 --- Makefile.in.orig	Fri Oct  6 16:07:38 2000
 +++ Makefile.in	Mon Oct  9 08:21:36 2000
 @@ -89,7 +89,7 @@
diff --git a/x11/fox/patches/patch-ac b/x11/fox/patches/patch-ac
new file mode 100644
index 00000000000..0aedb3ac43f
--- /dev/null
+++ b/x11/fox/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2001/02/24 16:56:56 sakamoto Exp $
+
+--- doc/Makefile.in.orig	Tue Feb 13 01:35:22 2001
++++ doc/Makefile.in
+@@ -84,7 +84,7 @@
+ VERSION = @VERSION@
+ X_BASE_LIBS = @X_BASE_LIBS@
+ 
+-htmldir = $(prefix)/@PACKAGE@/html
++htmldir = $(prefix)/share/doc/html/@PACKAGE@
+ 
+ # Source code documentation tool
+ PERCEPS = perceps
diff --git a/x11/fox/patches/patch-ae b/x11/fox/patches/patch-ae
new file mode 100644
index 00000000000..4a474e418a2
--- /dev/null
+++ b/x11/fox/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2001/02/24 16:56:56 sakamoto Exp $
+
+--- configure.orig	Tue Feb 13 01:25:29 2001
++++ configure
+@@ -3607,7 +3607,7 @@
+     GL_TESTS="gltest glviewer"
+     if test "x$MESA" = "xHAVE_MESA" ; then
+       CXXFLAGS="${CXXFLAGS} -DHAVE_MESA"
+-      GL_LIBS="-lMesaGL -lMesaGLU"
++      GL_LIBS="-lGL -lGLU"
+     else
+       GL_LIBS="-lGL -lGLU"
+     fi
diff --git a/x11/fox/pkg-comment b/x11/fox/pkg-comment
deleted file mode 100644
index 408af1eacd9..00000000000
--- a/x11/fox/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Fast and extensive C++ GUI toolkit
diff --git a/x11/fox/pkg-descr b/x11/fox/pkg/DESCR
index 5cae5f20d45..6629f954a97 100644
--- a/x11/fox/pkg-descr
+++ b/x11/fox/pkg/DESCR
@@ -5,7 +5,4 @@ like Java to me). FOX is a very flexible library,
 it has all sorts of functions and options, and is
 supposed to be fairly fast.
 
-WWW: http://www.cfdrc.com/FOX/fox.html
 Author: Jeroen van der Zijp <jvz@cfdrc.com>
-
---Will <andrews@technologist.com>
diff --git a/x11/fox/pkg-plist b/x11/fox/pkg/PLIST
index 9c318a334b0..dc8fe95f016 100644
--- a/x11/fox/pkg-plist
+++ b/x11/fox/pkg/PLIST
@@ -1,3 +1,4 @@
+@comment $NetBSD: PLIST,v 1.1 2001/02/24 16:56:56 sakamoto Exp $
 bin/reswrap
 include/fox/FX4Splitter.h
 include/fox/FXAccelTable.h
@@ -154,54 +155,54 @@ include/fox/fxkeys.h
 include/fox/fxregex.h
 include/fox/fxver.h
 include/fox/xincs.h
-lib/libFOX.a
-lib/libFOX.so
-lib/libFOX.so.%%LIBVER%%
-share/fox/html/app.html
-share/fox/html/bigpenguin.png
-share/fox/html/cfdrc.png
-share/fox/html/cfdrclogo.png
-share/fox/html/datatarget.html
-share/fox/html/dlgedit1.gif
-share/fox/html/dlgedit2.gif
-share/fox/html/draganddrop.html
-share/fox/html/faq.html
-share/fox/html/focus.html
-share/fox/html/fonts.html
-share/fox/html/foreword.html
-share/fox/html/fox.html
-share/fox/html/foxback.png
-share/fox/html/foxlogo.png
-share/fox/html/guiupdate.html
-share/fox/html/icons.html
-share/fox/html/introduction.html
-share/fox/html/layout.html
-share/fox/html/messages.html
-share/fox/html/nasafan.png
-share/fox/html/oldfox.html
-share/fox/html/opengl_logo.png
-share/fox/html/owl-anim.png
-share/fox/html/pathfinder.png
-share/fox/html/pcboard.png
-share/fox/html/platforms.html
-share/fox/html/progress.png
-share/fox/html/registry.html
-share/fox/html/scribble.png
-share/fox/html/serialization.html
-share/fox/html/sgitextedit.png
-share/fox/html/tb-paste.png
-share/fox/html/textedit.png
-share/fox/html/textedit2.png
-share/fox/html/timers.html
-share/fox/html/widgets.html
-share/fox/html/win32-libraries.png
-share/fox/html/win32-linkoutput.png
-share/fox/html/win32-postbuild.png
-share/fox/html/win32-preprocessor.png
-share/fox/html/win32-project.png
-share/fox/html/win32-tooloptions.png
-share/fox/html/win32.html
-share/fox/html/wintextedit.png
 @dirrm include/fox
-@dirrm share/fox/html
-@dirrm share/fox
+lib/libFOX-0.99.so.157.0
+lib/libFOX.a
+lib/libFOX.la
+man/man1/reswrap.1
+share/doc/html/fox/app.html
+share/doc/html/fox/bigpenguin.png
+share/doc/html/fox/cfdrc.png
+share/doc/html/fox/cfdrclogo.png
+share/doc/html/fox/datatarget.html
+share/doc/html/fox/dlgedit1.gif
+share/doc/html/fox/dlgedit2.gif
+share/doc/html/fox/draganddrop.html
+share/doc/html/fox/faq.html
+share/doc/html/fox/focus.html
+share/doc/html/fox/fonts.html
+share/doc/html/fox/foreword.html
+share/doc/html/fox/fox.html
+share/doc/html/fox/foxback.png
+share/doc/html/fox/foxlogo.png
+share/doc/html/fox/guiupdate.html
+share/doc/html/fox/icons.html
+share/doc/html/fox/introduction.html
+share/doc/html/fox/layout.html
+share/doc/html/fox/messages.html
+share/doc/html/fox/nasafan.png
+share/doc/html/fox/oldfox.html
+share/doc/html/fox/opengl_logo.png
+share/doc/html/fox/owl-anim.png
+share/doc/html/fox/pathfinder.png
+share/doc/html/fox/pcboard.png
+share/doc/html/fox/platforms.html
+share/doc/html/fox/progress.png
+share/doc/html/fox/registry.html
+share/doc/html/fox/scribble.png
+share/doc/html/fox/serialization.html
+share/doc/html/fox/sgitextedit.png
+share/doc/html/fox/tb-paste.png
+share/doc/html/fox/textedit.png
+share/doc/html/fox/textedit2.png
+share/doc/html/fox/timers.html
+share/doc/html/fox/widgets.html
+share/doc/html/fox/win32-libraries.png
+share/doc/html/fox/win32-linkoutput.png
+share/doc/html/fox/win32-postbuild.png
+share/doc/html/fox/win32-preprocessor.png
+share/doc/html/fox/win32-project.png
+share/doc/html/fox/win32-tooloptions.png
+share/doc/html/fox/win32.html
+share/doc/html/fox/wintextedit.png
+@dirrm share/doc/html/fox