Bug 187064 - games/burrtools: Update to version 0.6.3
Summary: games/burrtools: Update to version 0.6.3
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Martin Wilke
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-02-25 18:10 UTC by tkato432
Modified: 2014-03-11 02:40 UTC (History)
0 users

See Also:


Attachments
file.diff (3.55 KB, patch)
2014-02-25 18:10 UTC, tkato432
no flags Details | Diff
games_burrtools.diff (3.55 KB, patch)
2014-02-28 17:52 UTC, tkato432
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description tkato432 2014-02-25 18:10:08 UTC
- Update to version 0.6.3
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2014-02-25 18:14:08 UTC
Responsible Changed
From-To: freebsd-ports-bugs->miwi

miwi@ wants this submitter's PRs (via the GNATS Auto Assign Tool)
Comment 2 Martin Wilke freebsd_committer freebsd_triage 2014-02-27 08:25:35 UTC
State Changed
From-To: open->feedback

fails to build 
http://pkgdev.miwibox.org/84i386-default-default/2014-02-27_03h58m36s/logs/errors/burrtools-0.6.3.log
Comment 3 tkato432 2014-02-28 17:52:09 UTC
Here is the corrected patch.
Comment 4 Martin Wilke freebsd_committer freebsd_triage 2014-03-11 02:34:22 UTC
State Changed
From-To: feedback->closed

Committed. Thanks!
Comment 5 dfilter service freebsd_committer freebsd_triage 2014-03-11 02:34:31 UTC
Author: miwi
Date: Tue Mar 11 02:34:23 2014
New Revision: 347830
URL: http://svnweb.freebsd.org/changeset/ports/347830
QAT: https://qat.redports.org/buildarchive/r347830/

Log:
  - Update to 0.6.3
  
  PR:		187064
  Submitted by:	Ports Fury

Modified:
  head/games/burrtools/Makefile
  head/games/burrtools/distinfo

Modified: head/games/burrtools/Makefile
==============================================================================
--- head/games/burrtools/Makefile	Tue Mar 11 02:33:17 2014	(r347829)
+++ head/games/burrtools/Makefile	Tue Mar 11 02:34:23 2014	(r347830)
@@ -2,50 +2,69 @@
 # $FreeBSD$
 
 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@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=	yes # 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>

Modified: head/games/burrtools/distinfo
==============================================================================
--- head/games/burrtools/distinfo	Tue Mar 11 02:33:17 2014	(r347829)
+++ head/games/burrtools/distinfo	Tue Mar 11 02:34:23 2014	(r347830)
@@ -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
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"