Date: Tue, 17 Dec 2013 02:48:05 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/184821: games/cheech: Fix build with clang Message-ID: <20131217024805.34a89d39314da1db0b24e280@yahoo.com> Resent-Message-ID: <201312161810.rBGIA35v015885@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 184821
>Category: ports
>Synopsis: games/cheech: Fix build with clang
>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: Mon Dec 16 18:10:03 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 8.4-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Fix build with clang
- Add LICENSE
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/games/cheech/Makefile games/cheech/Makefile
--- /usr/ports/games/cheech/Makefile 2013-11-06 22:01:07.000000000 +0900
+++ games/cheech/Makefile 2013-12-17 00:00:00.000000000 +0900
@@ -3,7 +3,7 @@
PORTNAME= cheech
PORTVERSION= 0.8
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= games
MASTER_SITES= SF
EXTRACT_SUFX= .tgz
@@ -11,15 +11,17 @@
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 @@
"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}
diff -urN /usr/ports/games/cheech/pkg-plist games/cheech/pkg-plist
--- /usr/ports/games/cheech/pkg-plist 2013-11-06 22:01:07.000000000 +0900
+++ games/cheech/pkg-plist 2013-12-17 00:00:00.000000000 +0900
@@ -39,7 +39,6 @@
%%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/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%%
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131217024805.34a89d39314da1db0b24e280>