ports/110063: games/dungeoncrawl doesn't respect CXX/CXXFALGS

[Martin Tournoij]

>Number:         110063
>Category:       ports
>Synopsis:       games/dungeoncrawl doesn't respect CXX/CXXFALGS
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Mar 08 04:00:09 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Martin Tournoij
>Release:        FreeBSD 6.2-RELEASE-p1 i386
>Organization:
>Environment:
FreeBSD glitch.carpetsmoker.net 6.2-RELEASE-p1 FreeBSD 6.2-RELEASE-p1 #0: Thu Feb 15 20:56:16 CET 2007 carpetsmoker at glitch.carpetsmoker.net:/usr/obj/nfs/tinderbox/jails/6.2/src/sys/GENERICri386

>Description:
games/dungeoncrawl doesn't respect CXX and CXXFLAGS

Other changes while I'm editing this port anyway:
- Replaced pkg-plist with PLIST_FILES
- Install manpage
- Renamed patches
- Replace patch-aa(makefile.bsd) with sed

>How-To-Repeat:

>Fix:

--- patch-dungeoncrawl begins here ---
diff -urN --exclude CVS ../dungeoncrawl/Makefile ./Makefile
--- ../dungeoncrawl/Makefile	Fri Apr 18 07:31:35 2003
+++ ./Makefile	Thu Mar  8 04:43:56 2007
@@ -16,19 +16,29 @@
 COMMENT=	An old school roguelike game
 
 USE_BZIP2=	yes
-
-WRKSRC=		${WRKDIR}/${DISTNAME}/source/
-
+WRKSRC=		${WRKDIR}/${DISTNAME}/source
 MAKEFILE=	${WRKSRC}/makefile.bsd
 
-PLIST_SUB=	CRAWLDOCSDIR="${CRAWLDOCSDIR}"
+PLIST_FILES=	bin/dungeoncrawl
+PORTDOCS=	buglist.txt crawl.txt
+MAN6=		dungeoncrawl.6
+
+post-patch:
+	@${REINPLACE_CMD} -e "s|g++|${CXX}|; \
+		s|/tmp/CRAWLTEST/testdev|${PREFIX}/bin|; \
+		s|crawl|dungeoncrawl|; \
+		s|CFLAGS =|CFLAGS=${CXXFLAGS} |;" \
+			${MAKEFILE}
 
-CRAWLDOCSDIR?=	share/doc/${PORTNAME}
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/dungeoncrawl ${PREFIX}/bin/
+	${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/crawl.6 ${PREFIX}/man/man6/dungeoncrawl.6
 
 .if !defined(NOPORTDOCS)
-post-install:
-	@${MKDIR} ${PREFIX}/${CRAWLDOCSDIR}
-	${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/crawl.txt ${PREFIX}/${CRAWLDOCSDIR}
+	@${MKDIR} ${DOCSDIR}
+.for doc in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/docs/${doc} ${DOCSDIR}
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff -urN --exclude CVS ../dungeoncrawl/files/patch-aa ./files/patch-aa
--- ../dungeoncrawl/files/patch-aa	Tue Apr  1 02:37:38 2003
+++ ./files/patch-aa	Thu Jan  1 01:00:00 1970
@@ -1,20 +0,0 @@
---- makefile.bsd.orig	Thu Feb 27 22:39:20 2003
-+++ makefile.bsd	Thu Feb 27 23:27:25 2003
-@@ -1,7 +1,7 @@
- # -*- Makefile -*- for Dungeon Crawl (linux)
- 
- #APPNAME = crawl
--GAME = crawl
-+GAME = dungeoncrawl
- 
- # this file contains a list of the libraries.
- # it will make a variable called OBJECTS that contains all the libraries
-@@ -17,7 +17,7 @@
- LDFLAGS = -static -L/usr/lib
- MCHMOD = 711
- # INSTALLDIR = /usr/games
--INSTALLDIR = /tmp/CRAWLTEST/testdev
-+INSTALLDIR = ${PREFIX}/bin
- LIB = -lncurses
- 
- # Include for Linux
diff -urN --exclude CVS ../dungeoncrawl/files/patch-ba ./files/patch-ba
--- ../dungeoncrawl/files/patch-ba	Fri Apr 18 07:31:35 2003
+++ ./files/patch-ba	Thu Jan  1 01:00:00 1970
@@ -1,10 +0,0 @@
---- AppHdr.h.old	Sat Apr  5 14:18:24 2003
-+++ AppHdr.h	Sat Apr  5 14:19:31 2003
-@@ -153,6 +153,7 @@
-     #define PLAIN_TERM
- //#define MULTIUSER
-     #include "liblinux.h"
-+    #include <string.h>
- 
-     // The ALTCHARSET may come across as DEC characters/JIS on non-ibm platforms
-     #define CHARACTER_SET           0
diff -urN --exclude CVS ../dungeoncrawl/files/patch-ca ./files/patch-ca
--- ../dungeoncrawl/files/patch-ca	Tue Sep  2 20:51:16 2003
+++ ./files/patch-ca	Thu Jan  1 01:00:00 1970
@@ -1,33 +0,0 @@
---- religion.cc.orig	Tue Sep  2 13:42:32 2003
-+++ religion.cc	Tue Sep  2 13:43:30 2003
-@@ -53,18 +53,18 @@
- #include "stuff.h"
- 
- const char *sacrifice[] = {
--    {" glows silver and disappears."},
--    {" glows a brilliant golden colour and disappears."},
--    {" rots away in an instant."},
--    {" crumbles to dust."},
--    {" is eaten by a bug."},    /* Xom - no sacrifices */
--    {" explodes into nothingness."},
--    {" is consumed in a burst of flame."},
--    {" is consumed in a roaring column of flame."},
--    {" glows faintly for a moment, then is gone."},
--    {" is consumed in a roaring column of flame."},
--    {" glows with a rainbow of weird colours and disappears."},
--    {" evaporates."}
-+    " glows silver and disappears.",
-+    " glows a brilliant golden colour and disappears.",
-+    " rots away in an instant.",
-+    " crumbles to dust.",
-+    " is eaten by a bug.",    /* Xom - no sacrifices */
-+    " explodes into nothingness.",
-+    " is consumed in a burst of flame.",
-+    " is consumed in a roaring column of flame.",
-+    " glows faintly for a moment, then is gone.",
-+    " is consumed in a roaring column of flame.",
-+    " glows with a rainbow of weird colours and disappears.",
-+    " evaporates."
- };
- 
- void altar_prayer(void);
diff -urN --exclude CVS ../dungeoncrawl/files/patch-source-AppHdr.cc ./files/patch-source-AppHdr.cc
--- ../dungeoncrawl/files/patch-source-AppHdr.cc	Thu Jan  1 01:00:00 1970
+++ ./files/patch-source-AppHdr.cc	Thu Mar  8 04:42:48 2007
@@ -0,0 +1,10 @@
+--- AppHdr.h.old	Sat Apr  5 14:18:24 2003
++++ AppHdr.h	Sat Apr  5 14:19:31 2003
+@@ -153,6 +153,7 @@
+     #define PLAIN_TERM
+ //#define MULTIUSER
+     #include "liblinux.h"
++    #include <string.h>
+ 
+     // The ALTCHARSET may come across as DEC characters/JIS on non-ibm platforms
+     #define CHARACTER_SET           0
diff -urN --exclude CVS ../dungeoncrawl/files/patch-source-religion.cc ./files/patch-source-religion.cc
--- ../dungeoncrawl/files/patch-source-religion.cc	Thu Jan  1 01:00:00 1970
+++ ./files/patch-source-religion.cc	Thu Mar  8 04:42:48 2007
@@ -0,0 +1,33 @@
+--- religion.cc.orig	Tue Sep  2 13:42:32 2003
++++ religion.cc	Tue Sep  2 13:43:30 2003
+@@ -53,18 +53,18 @@
+ #include "stuff.h"
+ 
+ const char *sacrifice[] = {
+-    {" glows silver and disappears."},
+-    {" glows a brilliant golden colour and disappears."},
+-    {" rots away in an instant."},
+-    {" crumbles to dust."},
+-    {" is eaten by a bug."},    /* Xom - no sacrifices */
+-    {" explodes into nothingness."},
+-    {" is consumed in a burst of flame."},
+-    {" is consumed in a roaring column of flame."},
+-    {" glows faintly for a moment, then is gone."},
+-    {" is consumed in a roaring column of flame."},
+-    {" glows with a rainbow of weird colours and disappears."},
+-    {" evaporates."}
++    " glows silver and disappears.",
++    " glows a brilliant golden colour and disappears.",
++    " rots away in an instant.",
++    " crumbles to dust.",
++    " is eaten by a bug.",    /* Xom - no sacrifices */
++    " explodes into nothingness.",
++    " is consumed in a burst of flame.",
++    " is consumed in a roaring column of flame.",
++    " glows faintly for a moment, then is gone.",
++    " is consumed in a roaring column of flame.",
++    " glows with a rainbow of weird colours and disappears.",
++    " evaporates."
+ };
+ 
+ void altar_prayer(void);
--- patch-dungeoncrawl ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: