- use native getopt{,_long}

- use qt-mt and thus updated tmake
- bump pkgversion

from MAINTAINER

textproc/xxdiff/Makefile

@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.13 2002/10/16 13:23:41 naddy Exp $
+# $OpenBSD: Makefile,v 1.14 2003/02/02 16:37:56 sturm Exp $
 
 COMMENT=	"graphical file comparator and merge tool"
 
 DISTNAME=	xxdiff-2.9.1
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	textproc x11
 MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=xxdiff/}
 
@@ -17,8 +18,9 @@ PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
 
 BUILD_DEPENDS=	:bison-*:devel/bison \
-		:tmake->=1.8p1:devel/tmake
+		:tmake->=1.10:devel/tmake
 MODULES=	qt3
+MODQT_MT=	Yes
 
 WRKDIST=	${WRKDIR}/${DISTNAME}/src
 
@@ -29,8 +31,13 @@ PORTHOME=	${WRKDIST}
 
 NO_REGRESS=	Yes
 
+post-extract:
+	@rm ${WRKSRC}/getopt.h
+	@rm ${WRKSRC}/getopt.c
+	@rm ${WRKSRC}/getopt1.c
+
 do-configure:
-	@cd ${WRKSRC} && tmake -t xxdiff.t xxdiff.pro > ${WRKSRC}/Makefile
+	@cd ${WRKSRC} && ${LOCALBASE}/bin/tmake -t xxdiff.t xxdiff.pro > ${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xxdiff ${PREFIX}/bin/xxdiff

textproc/xxdiff/patches/patch-getopt_h

@@ -1,11 +0,0 @@
---- getopt.h.orig	Mon Sep 30 10:43:24 2002
-+++ getopt.h	Mon Sep 30 10:47:40 2002
-@@ -127,7 +127,7 @@ struct option
-    `getopt'.  */
- 
- #if defined __STDC__ && __STDC__
--# ifdef __GNU_LIBRARY__
-+# if defined __GNU_LIBRARY__ || __OpenBSD__
- /* Many other libraries have conflicting prototypes for getopt, with
-    differences in the consts, in stdlib.h.  To avoid compilation
-    errors, only prototype getopt for the GNU C library.  */

textproc/xxdiff/patches/patch-xxdiff_pro

@@ -0,0 +1,20 @@
+$OpenBSD: patch-xxdiff_pro,v 1.1 2003/02/02 16:37:56 sturm Exp $
+--- xxdiff.pro.orig	Fri Jan 31 10:53:37 2003
++++ xxdiff.pro	Fri Jan 31 10:54:04 2003
+@@ -174,7 +174,6 @@ HEADERS = \
+ 	lineNumbers.h \
+ 	util.h \
+ 	markers.h \
+-	getopt.h \
+ 	diffutils.h \
+ 	diffutils_hack.h \
+ 	doc.qml \
+@@ -211,8 +210,6 @@ SOURCES = \
+ 	accelUtil.cpp \
+ 	resParser.cpp \
+ 	markers.cpp \
+-	getopt.c \
+-	getopt1.c \
+ 	version.c
+ 
+ #	diffutils.cpp \