pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

armagetronad: Handle pkgsrc specific sysconfdir



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sun Jul 24 16:56:18 2016 +0200
Changeset:	8a9bddb0317511bb0dac8ffd0d906475adc27500

Modified Files:
	armagetronad-server/Makefile
	armagetronad/Makefile
	armagetronad/PLIST

Log Message:
armagetronad: Handle pkgsrc specific sysconfdir

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8a9bddb0317511bb0dac8ffd0d906475adc27500

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 armagetronad-server/Makefile |  1 -
 armagetronad/Makefile        | 22 ++++++++++++++++++++++
 armagetronad/PLIST           | 38 +++++++++++++++++++-------------------
 3 files changed, 41 insertions(+), 20 deletions(-)

diffs:
diff --git a/armagetronad-server/Makefile b/armagetronad-server/Makefile
index 820079c..61a7b48 100644
--- a/armagetronad-server/Makefile
+++ b/armagetronad-server/Makefile
@@ -18,7 +18,6 @@ BUILD_DEFS+=		PKG_SYSCONFBASE
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE}
 INSTALL_MAKE_FLAGS+=    sysconfdir=${EGDIR}
 
-#MAKE_DIRS+=	${PKG_SYSCONFDIR}
 MAKE_DIRS+=	${PKG_SYSCONFDIR}/examples
 MAKE_DIRS+=	${PKG_SYSCONFDIR}/examples/cvs_test
 
diff --git a/armagetronad/Makefile b/armagetronad/Makefile
index 2598774..43c56e6 100644
--- a/armagetronad/Makefile
+++ b/armagetronad/Makefile
@@ -11,6 +11,28 @@ MAINTAINER=     pkgsrc-users%NetBSD.org@localhost
 # Disable server, build client
 CONFIGURE_ARGS+=	--disable-dedicated
 
+# pkgsrc specific handling of configuration
+EGDIR=			${PREFIX}/share/examples/${PKGBASE}
+PKG_SYSCONFSUBDIR=	armagetronad
+BUILD_DEFS+=		PKG_SYSCONFBASE
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE}
+INSTALL_MAKE_FLAGS+=	sysconfdir=${EGDIR}
+
+MAKE_DIRS+=     ${PKG_SYSCONFDIR}/examples
+MAKE_DIRS+=	${PKG_SYSCONFDIR}/examples/cvs_test
+
+.for f in aiplayers.cfg default.cfg master.srv rc.config settings.cfg settings_authentication.cfg settings_dedicated.cfg settings_visual.cfg subcultures.srv
+CONF_FILES+=	${EGDIR}/armagetronad/${f} ${PKG_SYSCONFDIR}/${f}
+.endfor
+
+.for f in breakfast_in_hell.cfg death_zone.cfg fortress_soccer.cfg single_use_turbo.cfg teamsumo.cfg
+CONF_FILES+=	${EGDIR}/armagetronad/examples/${f} ${PKG_SYSCONFDIR}/examples/${f}
+.endfor
+
+.for f in fortress_complete.cfg fortress_physics.cfg fortress_politics.cfg fortress_scoring.cfg sumo_complete.cfg
+CONF_FILES+=	${EGDIR}/armagetronad/examples/cvs_test/${f} ${PKG_SYSCONFDIR}/examples/cvs_test/${f}
+.endfor
+
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../graphics/SDL_image/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/armagetronad/PLIST b/armagetronad/PLIST
index b20e97c..541909f 100644
--- a/armagetronad/PLIST
+++ b/armagetronad/PLIST
@@ -1,24 +1,5 @@
 @comment $NetBSD$
 bin/armagetronad
-etc/armagetronad/aiplayers.cfg
-etc/armagetronad/default.cfg
-etc/armagetronad/examples/breakfast_in_hell.cfg
-etc/armagetronad/examples/cvs_test/fortress_complete.cfg
-etc/armagetronad/examples/cvs_test/fortress_physics.cfg
-etc/armagetronad/examples/cvs_test/fortress_politics.cfg
-etc/armagetronad/examples/cvs_test/fortress_scoring.cfg
-etc/armagetronad/examples/cvs_test/sumo_complete.cfg
-etc/armagetronad/examples/death_zone.cfg
-etc/armagetronad/examples/fortress_soccer.cfg
-etc/armagetronad/examples/single_use_turbo.cfg
-etc/armagetronad/examples/teamsumo.cfg
-etc/armagetronad/master.srv
-etc/armagetronad/rc.config
-etc/armagetronad/settings.cfg
-etc/armagetronad/settings_authentication.cfg
-etc/armagetronad/settings_dedicated.cfg
-etc/armagetronad/settings_visual.cfg
-etc/armagetronad/subcultures.srv
 share/armagetronad/desktop/armagetronad.desktop
 share/armagetronad/desktop/icons/large/armagetronad.png
 share/armagetronad/desktop/icons/medium/armagetronad.png
@@ -94,3 +75,22 @@ share/doc/armagetronad/html/network.html
 share/doc/armagetronad/html/readme_macosx.html
 share/doc/armagetronad/html/todo.html
 share/doc/armagetronad/html/versions.html
+share/examples/armagetronad/armagetronad/aiplayers.cfg
+share/examples/armagetronad/armagetronad/default.cfg
+share/examples/armagetronad/armagetronad/examples/breakfast_in_hell.cfg
+share/examples/armagetronad/armagetronad/examples/cvs_test/fortress_complete.cfg
+share/examples/armagetronad/armagetronad/examples/cvs_test/fortress_physics.cfg
+share/examples/armagetronad/armagetronad/examples/cvs_test/fortress_politics.cfg
+share/examples/armagetronad/armagetronad/examples/cvs_test/fortress_scoring.cfg
+share/examples/armagetronad/armagetronad/examples/cvs_test/sumo_complete.cfg
+share/examples/armagetronad/armagetronad/examples/death_zone.cfg
+share/examples/armagetronad/armagetronad/examples/fortress_soccer.cfg
+share/examples/armagetronad/armagetronad/examples/single_use_turbo.cfg
+share/examples/armagetronad/armagetronad/examples/teamsumo.cfg
+share/examples/armagetronad/armagetronad/master.srv
+share/examples/armagetronad/armagetronad/rc.config
+share/examples/armagetronad/armagetronad/settings.cfg
+share/examples/armagetronad/armagetronad/settings_authentication.cfg
+share/examples/armagetronad/armagetronad/settings_dedicated.cfg
+share/examples/armagetronad/armagetronad/settings_visual.cfg
+share/examples/armagetronad/armagetronad/subcultures.srv


Home | Main Index | Thread Index | Old Index