From 49243ae7aaa1b4725042f9b739f54382b6b12300 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Fri, 17 Feb 2006 19:25:24 +0000
Subject: Do not install *.orig files. Get rid of autoconf dependency.

---
 emulators/twin/Makefile         | 15 ++++++---------
 emulators/twin/distinfo         |  3 ++-
 emulators/twin/patches/patch-ap | 31 +++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 10 deletions(-)
 create mode 100644 emulators/twin/patches/patch-ap

(limited to 'emulators/twin')

diff --git a/emulators/twin/Makefile b/emulators/twin/Makefile
index 5ea9f089c68..84485f52fcd 100644
--- a/emulators/twin/Makefile
+++ b/emulators/twin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/02/05 23:09:04 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2006/02/17 19:25:24 wiz Exp $
 #
 
 DISTNAME=		twin-src-3.1.14
@@ -9,30 +9,27 @@ MASTER_SITES=		ftp://ftp.willows.com/pub/twin/
 
 MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.willows.com/
-COMMENT=		Cross-platform implementation of the win32 api
+COMMENT=		Cross-platform implementation of the Win32 API
 
 BROKEN_IN=		pkgsrc-2005Q4
 
 WRKSRC=			${WRKDIR}/twin
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		autoconf213 gmake
+USE_TOOLS+=		gmake
 BUILD_TARGET=		depend world
 CONFIGURE_ARGS+=	--enable-debugger
 
-.include "../../mk/x11.buildlink3.mk"
-
-pre-configure:
-	cd ${WRKSRC} && autoreconf --force
-
 pre-build:
 	${CP} ${WRKSRC}/windows/Execfreebsd.c ${WRKSRC}/windows/Execnetbsd.c
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/twin
 	${INSTALL_DATA} ${WRKSRC}/documentation/* ${PREFIX}/share/doc/twin/
-	${INSTALL_DATA} ${WRKSRC}/include/* ${PREFIX}/include/
+	${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/
+	${INSTALL_DATA} ${WRKSRC}/include/*.h.in ${PREFIX}/include/
 	${INSTALL_DATA} ${WRKSRC}/documentation/rc.1 ${PREFIX}/man/man1
 	${INSTALL_DATA} ${WRKSRC}/documentation/debugger.1 ${PREFIX}/man/man1
 	${INSTALL_PROGRAM} ${WRKSRC}/tools/rc/rc ${PREFIX}/bin
 
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/twin/distinfo b/emulators/twin/distinfo
index 49b6ddcd064..130c4cb659b 100644
--- a/emulators/twin/distinfo
+++ b/emulators/twin/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2006/01/15 19:20:59 joerg Exp $
+$NetBSD: distinfo,v 1.6 2006/02/17 19:25:24 wiz Exp $
 
 SHA1 (twin-src-3.1.14.tar.gz) = b1652f07adcc2c98948a4458480b2d8436cc893f
 RMD160 (twin-src-3.1.14.tar.gz) = e4b54f515505176498335387415dc5797b3e63eb
@@ -18,3 +18,4 @@ SHA1 (patch-al) = 9c27e11439360db805d6d6165a3af0f75064dcec
 SHA1 (patch-am) = 1df7aa9125830374cb52a02638249473c69af833
 SHA1 (patch-an) = 8eb83db7351e146bfb0357dd2f4495a38d28530b
 SHA1 (patch-ao) = 7c4a48ad57d76238e097bcf9f1b2fe773cf374ff
+SHA1 (patch-ap) = 728d3ad7a7094e55cd25581d5e1221b0818c3bb0
diff --git a/emulators/twin/patches/patch-ap b/emulators/twin/patches/patch-ap
new file mode 100644
index 00000000000..de4f52a682d
--- /dev/null
+++ b/emulators/twin/patches/patch-ap
@@ -0,0 +1,31 @@
+$NetBSD: patch-ap,v 1.1 2006/02/17 19:25:24 wiz Exp $
+
+--- configure.orig	2001-01-14 08:25:13.000000000 +0000
++++ configure
+@@ -830,6 +830,14 @@ case "$host" in
+ 	TARGET=freebsd
+ 	;;
+ 
++   i386-*-dragonfly* )
++	TARGET=freebsd
++	;;
++
++   *netbsd* )
++	TARGET=netbsd
++	;;
++
+    i*86-*-linux* )
+ 	TARGET=linux
+ 	;;
+@@ -2849,6 +2857,11 @@ EOF
+ 	# egcs still broken on ppc
+ 	TWIN_CFLAGS=-g
+ 	;;
++
++   *netbsd* | *dragonfly* | *freebsd*)
++	LIBTWIN_LDFLAGS="$LDFLAGS $LIBTWIN_LDFLAGS"
++	DLL_LDFLAGS="$LDFLAGS $DLL_LDFLAGS"
++	;;
+ esac
+ 
+ if test -n "$GCC"
-- 
cgit v1.2.3