ports/187064: games/burrtools: Update to version 0.6.3

[KATO Tsuguru]

>Number:         187064
>Category:       ports
>Synopsis:       games/burrtools: Update to version 0.6.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Feb 25 18:10:08 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE-p7 i386
>Organization:
>Environment:
>Description:
- Update to version 0.6.3

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/games/burrtools/Makefile games/burrtools/Makefile
--- /usr/ports/games/burrtools/Makefile	2014-02-20 00:54:22.000000000 +0900
+++ games/burrtools/Makefile	2014-02-26 00:00:00.000000000 +0900
@@ -2,50 +2,69 @@
 # $FreeBSD: head/games/burrtools/Makefile 345004 2014-02-19 05:44:13Z amdmi3 $
 
 PORTNAME=	burrtools
-PORTVERSION=	0.6.2
-PORTREVISION=	3
+PORTVERSION=	0.6.3
 CATEGORIES=	games
-MASTER_SITES=	SF \
-		http://www.c-s.li/ports/
+MASTER_SITES=	SF
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Puzzle solver
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png \
+BUILD_DEPENDS=	netpbm>0:${PORTSDIR}/graphics/netpbm
+LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs \
+		libpng15.so:${PORTSDIR}/graphics/png \
 		libxmlwrapp.so:${PORTSDIR}/textproc/xmlwrapp \
-		libfltk.so:${PORTSDIR}/x11-toolkits/fltk \
-		libboost_thread.so:${PORTSDIR}/devel/boost-libs
+		libfltk.so:${PORTSDIR}/x11-toolkits/fltk
 
+USES=		gmake
 USE_XORG=	x11 xt xext xmu xi
 USE_GL=		glu
-USES=		gmake
+USE_GCC=	any # clang generates incorrect binaries: cause SIGILL
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	`fltk-config --cxxflags`
-LDFLAGS+=	`fltk-config --ldflags`
+CONFIGURE_ARGS=	--disable-silent-rules
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lboost_system
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
-PLIST_FILES=	bin/burrTxt bin/burrTxt2 bin/burrGui
+PLIST_FILES=	bin/burrTxt bin/burrTxt2 bin/burrGui \
+		share/pixmaps/burricons.png
+
+DESKTOP_ENTRIES="BurrGui" "" "${PREFIX}/pixmaps/burricons.png" "burrGui" "" ""
+
+OPTIONS_DEFINE=		DOCS EXAMPLES
+
+.include <bsd.port.options.mk>
 
-OPTIONS_DEFINE=	DOCS EXAMPLES
+.if ${OSVERSION} >= 1000024
+LDFLAGS+=	-lc++
+.endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|g++|$$(CXX)|; \
-		/burrTxt2_LDADD =/ s|$$| -lboost_system|; \
-		/burrGui_LDADD =/ s|$$| -lboost_system|' \
-		${WRKSRC}/src/Makefile.am ${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e \
+		's|g++ |$$(CXX) | ; \
+		 s|-O2 |$$(CXXFLAGS) |' ${WRKSRC}/src/Makefile.in
+
+post-build:
+	(cd ${WRKSRC} && ${CAT} burricons.ico | winicontoppm -bestqual | \
+		pnmtopng -transparent=black > burricons.png)
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/burrTxt ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/src/burrTxt2 ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/src/gui/burrGui ${STAGEDIR}${PREFIX}/bin
+	(cd ${WRKSRC}/src && ${INSTALL_PROGRAM} burrTxt burrTxt2 \
+		${STAGEDIR}${PREFIX}/bin)
+	(cd ${WRKSRC}/src/gui && ${INSTALL_PROGRAM} burrGui \
+		${STAGEDIR}${PREFIX}/bin)
+	(cd ${WRKSRC} && ${INSTALL_DATA} burricons.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for file in burricons.ico AUTHORS ChangeLog NEWS README
-	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
+.for i in AUTHORS ChangeLog NEWS README
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} \
+		${STAGEDIR}${DOCSDIR})
 .endfor
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	(cd ${WRKSRC}/examples; ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
+	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . \
+		${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
diff -urN /usr/ports/games/burrtools/distinfo games/burrtools/distinfo
--- /usr/ports/games/burrtools/distinfo	2014-01-23 05:22:19.000000000 +0900
+++ games/burrtools/distinfo	2014-02-26 00:00:00.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (burrtools-0.6.2.tar.gz) = c2036f1f22e1ec5a03591c6c0c3be738ed85676a5bd53e5a9aaa14725dcc3d2b
-SIZE (burrtools-0.6.2.tar.gz) = 1893752
+SHA256 (burrtools-0.6.3.tar.gz) = 7354804f41a7326c36bf5f4b0b4c8d39c683ce522700192fb05d8436b9da93ff
+SIZE (burrtools-0.6.3.tar.gz) = 1895328
>Release-Note:
>Audit-Trail:
>Unformatted: