svn commit: r473445 - in head/games/openlierox: . files
Dmitry Marakasov
amdmi3 at FreeBSD.org
Wed Jun 27 14:49:00 UTC 2018
Author: amdmi3
Date: Wed Jun 27 14:48:58 2018
New Revision: 473445
URL: https://svnweb.freebsd.org/changeset/ports/473445
Log:
- Switch to USES=localbase
- Tweak depends
- Switch to options helpers
- Fix build with clang 6
Added:
head/games/openlierox/files/patch-src_common_sex.cpp (contents, props changed)
Modified:
head/games/openlierox/Makefile
Modified: head/games/openlierox/Makefile
==============================================================================
--- head/games/openlierox/Makefile Wed Jun 27 14:46:54 2018 (r473444)
+++ head/games/openlierox/Makefile Wed Jun 27 14:48:58 2018 (r473445)
@@ -12,17 +12,14 @@ DISTNAME= OpenLieroX_${DISTVERSION}.src
MAINTAINER= amdmi3 at FreeBSD.org
COMMENT= Extremely addictive realtime worms shoot-em-up
-LIB_DEPENDS= libgd.so:graphics/gd \
- libboost_signals.so:devel/boost-libs \
+LIB_DEPENDS= libboost_signals.so:devel/boost-libs \
libcurl.so:ftp/curl
-USES= tar:bzip2 cmake openal:al,alut pkgconfig
+USES= tar:bzip2 cmake localbase pkgconfig
USE_SDL= sdl image
USE_GNOME= libxml2
-CFLAGS+= -I${LOCALBASE}/include
-CXXFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
+CXXFLAGS+= -Wno-c++11-narrowing
CMAKE_ARGS= -DHAWKNL_BUILTIN=YES \
-DLIBZIP_BUILTIN=YES \
@@ -43,17 +40,12 @@ PLIST_FILES= bin/openlierox \
share/pixmaps/OpenLieroX.svg
OPTIONS_DEFINE= DEDICATED_ONLY DOCS
-DEDICATED_ONLY_DESC=Build dedicated server only
-.include <bsd.port.options.mk>
+DEDICATED_ONLY_DESC= Build dedicated server only
+DEDICATED_ONLY_CMAKE_BOOL= DEDICATED_ONLY
+DEDICATED_ONLY_USE_OFF= XORG=x11 SDL=mixer
+DEDICATED_ONLY_LIB_DEPENDS_OFF= libgd.so:graphics/gd
-.if ${PORT_OPTIONS:MDEDICATED_ONLY}
-CMAKE_ARGS+= -DDEDICATED_ONLY=YES
-.else
-USE_XORG+= x11
-USE_SDL+= mixer
-.endif
-
post-patch:
@${REINPLACE_CMD} -e 's|EXEC_PROGRAM.*OLXVER)|SET(OLXVER "${DISTVERSION}")|; \
s|/usr/local|${LOCALBASE}|' ${WRKSRC}/CMakeOlxCommon.cmake
@@ -69,7 +61,9 @@ do-install:
${STAGEDIR}${PREFIX}/share/applications/
${INSTALL_DATA} ${WRKSRC}/share/OpenLieroX.svg \
${STAGEDIR}${PREFIX}/share/pixmaps/
- cd ${WRKSRC}/share/gamedir && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/
- cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/
+ @cd ${WRKSRC}/share/gamedir && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/
+
+do-install-DOCS-on:
+ @cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/
.include <bsd.port.mk>
Added: head/games/openlierox/files/patch-src_common_sex.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/openlierox/files/patch-src_common_sex.cpp Wed Jun 27 14:48:58 2018 (r473445)
@@ -0,0 +1,11 @@
+--- src/common/sex.cpp.orig 2018-06-25 13:54:25 UTC
++++ src/common/sex.cpp
+@@ -242,7 +242,7 @@ static Table list[] = {
+ {his, SZ(his)}, {dongadj, SZ(dongadj)},
+ {dong, SZ(dong)}, {intoher, SZ(intoher)},
+ {twatadj, SZ(twatadj)}, {twat, SZ(twat)},
+- {(const char **)NULL, (short)NULL},
++ {(const char **)NULL, 0},
+ };
+
+ std::string sex(short wraplen) {
More information about the svn-ports-all
mailing list