From 1c83a169bc6a81f6f49a2bdbfd8d64079236c5be Mon Sep 17 00:00:00 2001 From: Philip Paeps Date: Wed, 7 May 2008 12:58:39 +0000 Subject: - Fix pkg-plist when building without tools or without the editor[1]. - Finally convert to using OPTIONS=. PR: ports/123436 [1] Submitted by: Mel [1] Reviewed by: miwi --- games/wesnoth/Makefile | 64 +++++++++++++++++-------------------------------- games/wesnoth/pkg-plist | 22 ++++++++--------- 2 files changed, 33 insertions(+), 53 deletions(-) (limited to 'games/wesnoth') diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile index 60fb801dbff8..c05dcb23de22 100644 --- a/games/wesnoth/Makefile +++ b/games/wesnoth/Makefile @@ -7,6 +7,7 @@ PORTNAME= wesnoth PORTVERSION= 1.4.1 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.wesnoth.org/files/ @@ -37,68 +38,47 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ MAN6= wesnoth.6 MANLANG= "" ca_ES@valencia cs de fr gl_ES it ja nl sk sv zh_CN -.if defined(WITH_CAMPAIGN) || defined(PACKAGE_BUILDING) -CONFIGURE_ARGS+= --enable-campaign-server -PLIST_SUB+= CAMPAIGN:="" -.else -PLIST_SUB+= CAMPAIGN:="@comment " -.endif +OPTIONS= CAMPAIGN "Enable campaign server" On \ + EDITOR "Enable map editor" On \ + SERVER "Enable server" On \ + TOOLS "Enable extra tools for artists and translators" On .if defined(WITH_DEBUG) CONFIGURE_ARGS+= --enable-debug .endif -.if defined(WITH_ZIPIOS) -CONFIGURE_ARGS+= --with-zipios -LIB_DEPENDS+= zipios.0:${PORTSDIR}/archivers/zipios++ +.if defined(WITHOUT_CAMPAIGN) +PLIST_SUB+= CAMPAIGN="@comment " +.else +CONFIGURE_ARGS+= --enable-campaign-server +PLIST_SUB+= CAMPAIGN="" .endif -.if defined(WITH_EDITOR) || defined(PACKAGE_BUILDING) +.if defined(WITHOUT_EDITOR) +PLIST_SUB+= EDITOR="@comment " +.else CONFIGURE_ARGS+= --enable-editor MAN6+= wesnoth_editor.6 -PLIST_SUB+= EDITOR:="" -.else -PLIST_SUB+= EDITOR:="@comment " +PLIST_SUB+= EDITOR="" .endif -.if defined(WITH_SERVER) || defined(PACKAGE_BUILDING) +.if defined(WITHOUT_SERVER) +PLIST_SUB+= SERVER="@comment " +.else CONFIGURE_ARGS+= --enable-server MAN6+= wesnothd.6 -PLIST_SUB+= SERVER:="" -.else -PLIST_SUB+= SERVER:="@comment " +PLIST_SUB+= SERVER="" .endif -.if defined(WITH_TOOLS) || defined(PACKAGE_BUILDING) -CONFIGURE_ARGS+= --enable-tools -PLIST_SUB+= TOOLS:="" +.if defined(WITHOUT_TOOLS) +PLIST_SUB+= TOOLS="@comment " .else -PLIST_SUB+= TOOLS:="@comment " +CONFIGURE_ARGS+= --enable-tools +PLIST_SUB+= TOOLS="" .endif .include -pre-everything:: -.if !defined(WITH_CAMPAIGN) || !defined(WITH_DEBUG) || !defined(WITH_EDITOR) || !defined(WITH_SERVER) || !defined(WITH_TOOLS) - @${ECHO_MSG} "You may specify the following on the command line:" - @${ECHO_MSG} " " -.endif -.if !defined(WITH_CAMPAIGN) - @${ECHO_MSG} "WITH_CAMPAIGN=yes to enable compilation of campaign server." -.endif -.if !defined(WITH_DEBUG) - @${ECHO_MSG} "WITH_DEBUG=yes to enable debugging in Wesnoth." -.endif -.if !defined(WITH_EDITOR) - @${ECHO_MSG} "WITH_EDITOR=yes to enable compilation of map editor." -.endif -.if !defined(WITH_SERVER) - @${ECHO_MSG} "WITH_SERVER=yes to enable compilation of server." -.endif -.if !defined(WITH_TOOLS) - @${ECHO_MSG} "WITH_TOOLS=yes to enable compilation of tools for translators and artists." -.endif - post-configure: @${REINPLACE_CMD} -e 's|[$$][{]datarootdir[}]/icons|${LOCALBASE}/share/pixmaps|' \ ${WRKSRC}/icons/Makefile diff --git a/games/wesnoth/pkg-plist b/games/wesnoth/pkg-plist index 4e3ee237f48a..268694251ab7 100644 --- a/games/wesnoth/pkg-plist +++ b/games/wesnoth/pkg-plist @@ -1,12 +1,12 @@ -%%CAMPAIGN:%%bin/campaignd -%%TOOLS:%%bin/cutter -%%TOOLS:%%bin/exploder +%%CAMPAIGN%%bin/campaignd +%%TOOLS%%bin/cutter +%%TOOLS%%bin/exploder bin/wesnoth -bin/wmlindent -bin/wmllint -bin/wmlscope -%%EDITOR:%%bin/wesnoth_editor -%%SERVER:%%bin/wesnothd +%%TOOLS%%bin/wmlindent +%%TOOLS%%bin/wmllint +%%TOOLS%%bin/wmlscope +%%EDITOR%%bin/wesnoth_editor +%%SERVER%%bin/wesnothd share/locale/af/LC_MESSAGES/wesnoth-aoi.mo share/locale/af/LC_MESSAGES/wesnoth-did.mo share/locale/af/LC_MESSAGES/wesnoth-editor.mo @@ -8359,10 +8359,10 @@ share/locale/zh_TW/LC_MESSAGES/wesnoth.mo @dirrmtry man/zh_CN/man6 @dirrmtry man/zh_CN share/applications/wesnoth.desktop -share/applications/wesnoth_editor.desktop +%%EDITOR%%share/applications/wesnoth_editor.desktop share/pixmaps/wesnoth-icon.png -share/pixmaps/wesnoth_editor-icon.png -%%SERVER:%%@unexec rmdir /var/run/wesnothd 2>/dev/null || echo "If you are permanently removing this port, you should do a 'rm -rf /var/run/wesnothd' to remove it." | fmt +%%EDITOR%%share/pixmaps/wesnoth_editor-icon.png +%%SERVER%%@unexec rmdir /var/run/wesnothd 2>/dev/null || echo "If you are permanently removing this port, you should do a 'rm -rf /var/run/wesnothd' to remove it." | fmt @dirrmtry share/locale/ca_ES@valencia/LC_MESSAGES @dirrmtry share/locale/ca_ES@valencia @dirrmtry share/locale/gl_ES/LC_MESSAGES -- cgit v1.2.3