Bug 184821 - games/cheech: Fix build with clang
Summary: games/cheech: Fix build with clang
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: Pawel Pekala
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-12-16 18:10 UTC by tkato432
Modified: 2013-12-20 08:00 UTC (History)
0 users

See Also:

Attachments
file.diff (2.65 KB, patch)
2013-12-16 18:10 UTC, tkato432 		no flags Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description tkato432 2013-12-16 18:10:03 UTC 
- Fix build with clang
- Add LICENSE
Comment 1 Pawel Pekala freebsd_committer freebsd_triage 2013-12-19 16:22:46 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->pawel

I'll take it.
Comment 2 dfilter service freebsd_committer freebsd_triage 2013-12-19 16:59:47 UTC 
Author: pawel
Date: Thu Dec 19 16:59:39 2013
New Revision: 336937
URL: http://svnweb.freebsd.org/changeset/ports/336937

Log:
  - Fix build with clang
  - Add LICENSE
  
  PR:		ports/184821
  Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

Modified:
  head/games/cheech/Makefile
  head/games/cheech/pkg-plist   (contents, props changed)

Modified: head/games/cheech/Makefile
==============================================================================
--- head/games/cheech/Makefile	Thu Dec 19 16:53:08 2013	(r336936)
+++ head/games/cheech/Makefile	Thu Dec 19 16:59:39 2013	(r336937)
@@ -11,15 +11,17 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multiplayer Chinese Checkers game
 
-LIB_DEPENDS=	libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24 \
-		libgnet-2.0.so:${PORTSDIR}/net/gnet2
+LICENSE=	GPLv2 # (or later)
 
-USES=		gmake pkgconfig
-GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	automake:env
+LIB_DEPENDS=	libgnet-2.0.so:${PORTSDIR}/net/gnet2
 
 OPTIONS_DEFINE=	DOCS
 
+USES=		gmake pkgconfig
+USE_GNOME=	gtkmm24
+USE_AUTOTOOLS=	automake:env
+GNU_CONFIGURE=	yes
+
 DESKTOP_ENTRIES=	"cheech" \
 			"${COMMENT}" \
 			"${PREFIX}/share/pixmaps/${PORTNAME}.png" \
@@ -27,15 +29,17 @@ DESKTOP_ENTRIES=	"cheech" \
 			"Game;BoardGame;" \
 			"false"
 
-INSTALL_TARGET=	install install-cheechdocDATA
-
 post-patch:
-	@${REINPLACE_CMD} -e "s|doc/cheech|share/doc/cheech|g" \
-		-e "s|: install-cheechdocDATA|:|g" \
-		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|connect(SigC::slot|connect(sigc::mem_fun|g ; \
-		s|#include <sigc++\/compatibility\.h>||g' \
-			${WRKSRC}/src/*.cc
+	@${REINPLACE_CMD} -e \
+		's|$${prefix}/doc|$$(datadir)/doc| ; \
+		 /^cheechdoc_DATA/s|COPYING||' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e \
+		'/^AM_CXXFLAGS/s|[[:blank:]]-g||' ${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e \
+		's|\([[:blank:]]\)usleep|\1Glib::usleep|' ${WRKSRC}/src/utility.cc
+	@${REINPLACE_CMD} -e \
+		's|connect(SigC::slot|connect(sigc::mem_fun|g ; \
+		 s|#include <sigc++\/compatibility\.h>||g' ${WRKSRC}/src/*.cc
 
 pre-configure:
 	@${LN} -sf ${AUTOMAKE_DIR}/install-sh ${WRKSRC}

Modified: head/games/cheech/pkg-plist
==============================================================================
--- head/games/cheech/pkg-plist	Thu Dec 19 16:53:08 2013	(r336936)
+++ head/games/cheech/pkg-plist	Thu Dec 19 16:59:39 2013	(r336937)
@@ -39,7 +39,6 @@ bin/cheechwebd
 %%DATADIR%%/cheechweb/images/peg-yellow.png
 %%DATADIR%%/cheechweb/index.html
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
@@ -50,8 +49,8 @@ share/pixmaps/cheech/cheech.png
 share/pixmaps/cheech/highlight.png
 share/pixmaps/cheech/pegs.png
 share/pixmaps/cheech/smiley.png
-@dirrmtry share/pixmaps/cheech
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrmtry %%DATADIR%%/cheechweb/images
-@dirrmtry %%DATADIR%%/cheechweb
-@dirrmtry %%DATADIR%%
+@dirrm share/pixmaps/cheech
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%/cheechweb/images
+@dirrm %%DATADIR%%/cheechweb
+@dirrm %%DATADIR%%
_______________________________________________
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"
Comment 3 Pawel Pekala freebsd_committer freebsd_triage 2013-12-19 16:59:52 UTC 
State Changed
From-To: open->closed

Committed. Thanks!
Comment 4 dfilter service freebsd_committer freebsd_triage 2013-12-20 07:57:22 UTC 
Author: bapt
Date: Fri Dec 20 07:57:14 2013
New Revision: 336976
URL: http://svnweb.freebsd.org/changeset/ports/336976

Log:
  MFH: r336937
  
  - Fix build with clang
  - Add LICENSE
  
  PR:		ports/184821
  Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

Modified:
  branches/2014Q1/games/cheech/Makefile
  branches/2014Q1/games/cheech/pkg-plist   (contents, props changed)
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/games/cheech/Makefile
==============================================================================
--- branches/2014Q1/games/cheech/Makefile	Fri Dec 20 07:56:27 2013	(r336975)
+++ branches/2014Q1/games/cheech/Makefile	Fri Dec 20 07:57:14 2013	(r336976)
@@ -11,15 +11,17 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multiplayer Chinese Checkers game
 
-LIB_DEPENDS=	libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24 \
-		libgnet-2.0.so:${PORTSDIR}/net/gnet2
+LICENSE=	GPLv2 # (or later)
 
-USES=		gmake pkgconfig
-GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	automake:env
+LIB_DEPENDS=	libgnet-2.0.so:${PORTSDIR}/net/gnet2
 
 OPTIONS_DEFINE=	DOCS
 
+USES=		gmake pkgconfig
+USE_GNOME=	gtkmm24
+USE_AUTOTOOLS=	automake:env
+GNU_CONFIGURE=	yes
+
 DESKTOP_ENTRIES=	"cheech" \
 			"${COMMENT}" \
 			"${PREFIX}/share/pixmaps/${PORTNAME}.png" \
@@ -27,15 +29,17 @@ DESKTOP_ENTRIES=	"cheech" \
 			"Game;BoardGame;" \
 			"false"
 
-INSTALL_TARGET=	install install-cheechdocDATA
-
 post-patch:
-	@${REINPLACE_CMD} -e "s|doc/cheech|share/doc/cheech|g" \
-		-e "s|: install-cheechdocDATA|:|g" \
-		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|connect(SigC::slot|connect(sigc::mem_fun|g ; \
-		s|#include <sigc++\/compatibility\.h>||g' \
-			${WRKSRC}/src/*.cc
+	@${REINPLACE_CMD} -e \
+		's|$${prefix}/doc|$$(datadir)/doc| ; \
+		 /^cheechdoc_DATA/s|COPYING||' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e \
+		'/^AM_CXXFLAGS/s|[[:blank:]]-g||' ${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e \
+		's|\([[:blank:]]\)usleep|\1Glib::usleep|' ${WRKSRC}/src/utility.cc
+	@${REINPLACE_CMD} -e \
+		's|connect(SigC::slot|connect(sigc::mem_fun|g ; \
+		 s|#include <sigc++\/compatibility\.h>||g' ${WRKSRC}/src/*.cc
 
 pre-configure:
 	@${LN} -sf ${AUTOMAKE_DIR}/install-sh ${WRKSRC}

Modified: branches/2014Q1/games/cheech/pkg-plist
==============================================================================
--- branches/2014Q1/games/cheech/pkg-plist	Fri Dec 20 07:56:27 2013	(r336975)
+++ branches/2014Q1/games/cheech/pkg-plist	Fri Dec 20 07:57:14 2013	(r336976)
@@ -39,7 +39,6 @@ bin/cheechwebd
 %%DATADIR%%/cheechweb/images/peg-yellow.png
 %%DATADIR%%/cheechweb/index.html
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
@@ -50,8 +49,8 @@ share/pixmaps/cheech/cheech.png
 share/pixmaps/cheech/highlight.png
 share/pixmaps/cheech/pegs.png
 share/pixmaps/cheech/smiley.png
-@dirrmtry share/pixmaps/cheech
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrmtry %%DATADIR%%/cheechweb/images
-@dirrmtry %%DATADIR%%/cheechweb
-@dirrmtry %%DATADIR%%
+@dirrm share/pixmaps/cheech
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%/cheechweb/images
+@dirrm %%DATADIR%%/cheechweb
+@dirrm %%DATADIR%%
_______________________________________________
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"