Fix pkgsrc configury and lift bogus ONLY_FOR_PLATFORM.

Bump PKGREVISION as a precaution.

4 files changed, 34 insertions, 40 deletions

diff --git a/games/tads/Makefile b/games/tads/Makefile
index d928e31c10f..8c1c44a09f8 100644
--- a/games/tads/Makefile
+++ b/games/tads/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2013/10/10 18:27:37 roy Exp $
+# $NetBSD: Makefile,v 1.17 2015/01/04 06:58:44 dholland Exp $
 #
 
 DISTNAME=	tads23-unix
 PKGNAME=	tads-3.0.8
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://www.tads.org/t3dl/
 
@@ -11,18 +11,15 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.tads.org/
 COMMENT=	TADS compiler and interpreter
 
-# for other OSs, enable appropriate Makefile sections
-ONLY_FOR_PLATFORM=	NetBSD-*-*
-
 DIST_SUBDIR=	${PKGNAME_NOREV}-1
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 NO_CONFIGURE=	yes
 BUILD_DIRS=	tads2 tads3
 USE_LANGUAGES=	c c++
+MAKE_ENV+=	PKGREVISION=${PKGREVISION} MAINTAINER=${MAINTAINER:Q}
 
 post-extract:
 	${RM} ${WRKSRC}/tads3/BSD/wchar.h
 
-#.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/termcap.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/tads/distinfo b/games/tads/distinfo
index 350a1278a91..8dcbbc06ee1 100644
--- a/games/tads/distinfo
+++ b/games/tads/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.12 2013/10/10 18:27:37 roy Exp $
+$NetBSD: distinfo,v 1.13 2015/01/04 06:58:44 dholland Exp $
 
 SHA1 (tads-3.0.8-1/tads23-unix.tar.gz) = 2bd4c64fd090d880b98a8a590d48482d4dfcb67b
 RMD160 (tads-3.0.8-1/tads23-unix.tar.gz) = 8f83f60d01fb8549fa38adcc48fa04c92fba5250
 Size (tads-3.0.8-1/tads23-unix.tar.gz) = 4122345 bytes
-SHA1 (patch-aa) = 1466c119b43e1090d4f0946cc2bceb40c8c2dc23
+SHA1 (patch-aa) = 11df10583079b27d116b3da0713d793abe0cc2d5
 SHA1 (patch-ab) = b8e48ff15ef5fa1834c98a5bcc6df3d732dfe062
-SHA1 (patch-ac) = 2e387c9844cdcf47ecd63ee1051876c27b50aa95
+SHA1 (patch-ac) = 8ceaa2739191faa6e2611a58e586a04ae6cae825
 SHA1 (patch-tads2_osunixt.c) = 7bf4ca85ae9986eea4caff61c27845b6a309ef9f
 SHA1 (patch-tads3_tcprs.cpp) = 7f377ea541009490910259c734d577b612f264ef
diff --git a/games/tads/patches/patch-aa b/games/tads/patches/patch-aa
index 41e8bbfbd1e..5dc878270e0 100644
--- a/games/tads/patches/patch-aa
+++ b/games/tads/patches/patch-aa
@@ -1,4 +1,7 @@
-$NetBSD: patch-aa,v 1.6 2013/10/10 18:27:37 roy Exp $
+$NetBSD: patch-aa,v 1.7 2015/01/04 06:58:44 dholland Exp $
+
+ - configure for pkgsrc
+ - add destdir support
 
 --- tads2/Makefile.orig	2004-11-05 13:34:49.000000000 +0000
 +++ tads2/Makefile
@@ -11,36 +14,29 @@ $NetBSD: patch-aa,v 1.6 2013/10/10 18:27:37 roy Exp $
  BINDIR=$(PREFIX)/bin
  DATADIR=$(PREFIX)/share/tads2
  
-@@ -278,16 +278,18 @@ MATT=Matt Herberg <meherberg@earthlink.n
- # No testing has been done on pre 1.5 or a.out systems
- # HAVE_TPARM is set in osunixt.h
+@@ -333,6 +333,21 @@ MATT=Matt Herberg <meherberg@earthlink.n
+ #MAKEXEC=touch
+ 
  #
--#CC=gcc
--#OPTIMIZE=
--#UNIXFLAGS=-g -DOSANSI -DUNIX -DHAVE_STRCASECMP
--#SYSFLAGS= -DOS_SYSTEM_NAME=\""NETBSD"\" -DSYSNAME=\""NetBSD"\" -DSYSPL=\"1\" -DPORTER=\""$(DOUGLAS)"\" -DSYSMAINTAINER=\""NetBSD port maintained by $(DOUGLAS)\n"\"
--#CFLAGS= $(UNIXFLAGS) $(SYSFLAGS) -DNETBSD
--#AFLAGS=
--#OVLFLG=
--#MACHDEP=
--#LIBS=-L/usr/pkg/lib -Wl,-R/usr/pkg/lib -lncurses
--#MAKEXEC=touch
-+.if ${OPSYS} == "NetBSD"
-+CC=gcc
++# pkgsrc (should be suitable for all modern or semimodern systems)
++#
++CC=cc
 +OPTIMIZE=
-+UNIXFLAGS=-g -DOSANSI -DUNIX -DHAVE_STRCASECMP
-+SYSFLAGS=-DOS_SYSTEM_NAME=\""NETBSD"\" -DSYSNAME=\""NetBSD"\" -DSYSPL=\"1\" -DPORTER=\""$(DOUGLAS)"\" -DSYSMAINTAINER=\""NetBSD port maintained by $(DOUGLAS)\n"\"
++UNIXFLAGS=-DOSANSI -DUNIX -DHAVE_STRCASECMP
++SYSFLAGS=-DOS_SYSTEM_NAME=\""${OPSYS}"\" -DSYSNAME=\""${OPSYS}"\" -DSYSPL=\"${PKGREVISION}\" -DPORTER=\""pkgsrc-users"\" -DSYSMAINTAINER=\""pkgsrc port maintained by ${MAINTAINER}\n"\"
 +CFLAGS+=$(UNIXFLAGS) $(SYSFLAGS) -DNETBSD
 +AFLAGS=
 +OVLFLG=
 +MACHDEP=
 +LIBS=-ltermcap
 +MAKEXEC=touch
-+.endif
- 
++
++
++#
+ # Don't change stuff below this line unless you really know what you're doing.
  #
- # i386+ running DOS/Windows, using DJGPP 2.X
-@@ -382,10 +384,14 @@ TDBOBJS= $(DBGOBJS) osgen.o osunixt.o tp
+ 
+@@ -382,10 +397,14 @@ TDBOBJS= $(DBGOBJS) osgen.o osunixt.o tp
  all: tadsr tadsc tdb
  
  install: all
diff --git a/games/tads/patches/patch-ac b/games/tads/patches/patch-ac
index 1b0aaf74796..e52bdf9c370 100644
--- a/games/tads/patches/patch-ac
+++ b/games/tads/patches/patch-ac
@@ -1,4 +1,7 @@
-$NetBSD: patch-ac,v 1.5 2013/10/10 18:27:37 roy Exp $
+$NetBSD: patch-ac,v 1.6 2015/01/04 06:58:44 dholland Exp $
+
+- configure for pkgsrc
+- destdir support
 
 --- tads3/Makefile.orig	2005-03-05 10:44:48.000000000 +0000
 +++ tads3/Makefile
@@ -14,11 +17,11 @@ $NetBSD: patch-ac,v 1.5 2013/10/10 18:27:37 roy Exp $
  DATADIR = $(PREFIX)/share/tads3
  LIBDIR  = $(DATADIR)/libraries
  INCDIR  = $(DATADIR)/includes
-@@ -117,6 +117,25 @@ RESDIR  = $(DATADIR)/resources
+@@ -117,6 +117,23 @@ RESDIR  = $(DATADIR)/resources
  #DISPLAY_LIB  = -ltermcap
  
  ###########################################################################
-+# NetBSD
++# pkgsrc (for NetBSD and ~anything else)
 +# Compiled and tested on NetBSD 1.6
 +# Maintainer:
 +#
@@ -26,21 +29,19 @@ $NetBSD: patch-ac,v 1.5 2013/10/10 18:27:37 roy Exp $
 +# current (> 2.7) version of g++.
 +###########################################################################
 +#
-+.if ${OPSYS} == "NetBSD"
-+CXX          = g++
-+CC           = gcc
-+IDENT        = -DOS_SYSTEM_NAME=\"NetBSD\"
++CXX          = c++
++CC           = cc
++IDENT        = -DOS_SYSTEM_NAME=\"${OPSYS}\"
 +OPTIMIZE     = -O2
 +CXX_OPTIMIZE = -fno-exceptions
 +OS_FLAGS     = -DOS_ANSI -DHAVE_STRCASECMP -Dmemicmp=strncasecmp -I./BSD
 +DISPLAY_LIB  = -ltermcap
-+.endif
 +
 +###########################################################################
  # OpenBSD
  # Compiled and tested on OpenBSD 3.0
  # Maintainer: Mark Wickham (macwickham@attbi.com)
-@@ -216,18 +235,46 @@ MKCHRTAB_OBJS = mkchrtab.o $(T2_DIR)/osu
+@@ -216,18 +233,46 @@ MKCHRTAB_OBJS = mkchrtab.o $(T2_DIR)/osu
  all: t3make t3run t23run t3pre t3res mkchrtab
  
  install: all install-common