2 files changed, 24 insertions, 18 deletions

diff --git a/games/linux-enemyterritory-jaymod-21/Makefile b/games/linux-enemyterritory-jaymod-21/Makefile
index 0334e3cbad7b..ac7f7cba888c 100644
--- a/games/linux-enemyterritory-jaymod-21/Makefile
+++ b/games/linux-enemyterritory-jaymod-21/Makefile
@@ -22,6 +22,8 @@ PLIST_SUB=	VERSTR="${VERSTR}"
 
 USE_LINUX=	yes
 
+PORTSCOUT=	limit:^2\.1\.7
+
 OPTIONS_DEFINE=	DOCS OMNIBOT
 OMNIBOT_DESC=	Install Omni-Bot 0.660 for bot support
 
@@ -31,13 +33,10 @@ DOCSDIR=	${PREFIX}/share/doc/enemyterritory-${PORTNAME}-${VERSTR}
 CLIENT_PK3=	${PORTNAME}-${PORTVERSION}.pk3
 PLIST_SUB+=	CLIENT_PK3="${CLIENT_PK3}"
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MOMNIBOT}
 OB_VERSTR=	0660
-RUN_DEPENDS+=	et-omni-bot-${OB_VERSTR}:${PORTSDIR}/games/linux-enemyterritory-omni-bot-${OB_VERSTR}
-.endif
+OMNIBOT_RUN_DEPENDS=	et-omni-bot-${OB_VERSTR}:${PORTSDIR}/games/linux-enemyterritory-omni-bot-${OB_VERSTR}
+
+.include <bsd.port.options.mk>
 
 do-build:
 .for f in et etded
@@ -48,15 +47,18 @@ do-build:
 
 do-install:
 .for f in et etded
-	${INSTALL_SCRIPT} ${WRKSRC}/${f}-${PORTNAME}-${VERSTR} ${PREFIX}/bin
+	@${INSTALL_SCRIPT} ${WRKSRC}/${f}-${PORTNAME}-${VERSTR} ${STAGEDIR}${PREFIX}/bin
+.endfor
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	@${INSTALL_PROGRAM} ${WRKSRC}/qagame.mp.i386.so ${STAGEDIR}${DATADIR}
+	@cd ${WRKSRC} && ${INSTALL_DATA} ${CLIENT_PK3} ${STAGEDIR}${DATADIR}
+.for f in jaymod.cfg server.cfg
+	@${CP} -p ${WRKSRC}/${f} ${STAGEDIR}${DATADIR}/${f}.sample
+.endfor
+	@${CP} -r ${WRKSRC}/linux ${WRKSRC}/mapscripts ${STAGEDIR}${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for f in README.txt doc/jaymod.pdf
+	@cd ${WRKSRC} && ${INSTALL_DATA} ${f} ${STAGEDIR}${DOCSDIR}
 .endfor
-	${MKDIR} ${DATADIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/qagame.mp.i386.so ${DATADIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${CLIENT_PK3} *.cfg ${DATADIR}
-	${CP} -r ${WRKSRC}/linux ${WRKSRC}/mapscripts ${DATADIR}
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} README.txt doc/jaymod.pdf ${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/games/linux-enemyterritory-jaymod-21/pkg-plist b/games/linux-enemyterritory-jaymod-21/pkg-plist
index 6cafea9af8d2..a596cb9564dd 100644
--- a/games/linux-enemyterritory-jaymod-21/pkg-plist
+++ b/games/linux-enemyterritory-jaymod-21/pkg-plist
@@ -1,6 +1,8 @@
 bin/et-jaymod-%%VERSTR%%
 bin/etded-jaymod-%%VERSTR%%
-%%DATADIR%%/jaymod.cfg
+@unexec if cmp %D/lib/enemyterritory/jaymod-%%VERSTR%%/jaymod.cfg %D/lib/enemyterritory/jaymod-%%VERSTR%%/jaymod.cfg.sample; then rm -f %D/lib/enemyterritory/jaymod-%%VERSTR%%/jaymod.cfg; fi
+%%DATADIR%%/jaymod.cfg.sample
+@exec if [ ! -f %D/lib/enemyterritory/jaymod-%%VERSTR%%/jaymod.cfg ] ; then cp -p %D/%F %B/jaymod.cfg; fi
 %%DATADIR%%/%%CLIENT_PK3%%
 %%DATADIR%%/linux/convert_shrub
 %%DATADIR%%/linux/serverctl
@@ -14,10 +16,12 @@ bin/etded-jaymod-%%VERSTR%%
 %%DATADIR%%/mapscripts/railgun.script
 %%DATADIR%%/mapscripts/railgun_lms.script
 %%DATADIR%%/qagame.mp.i386.so
-%%DATADIR%%/server.cfg
+@unexec if cmp %D/lib/enemyterritory/jaymod-%%VERSTR%%/server.cfg %D/lib/enemyterritory/jaymod-%%VERSTR%%/server.cfg.sample; then rm -f %D/lib/enemyterritory/jaymod-%%VERSTR%%/server.cfg; fi
+%%DATADIR%%/server.cfg.sample
+@exec if [ ! -f %D/lib/enemyterritory/jaymod-%%VERSTR%%/server.cfg ] ; then cp -p %D/%F %B/server.cfg; fi
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%PORTDOCS%%%%DOCSDIR%%/jaymod.pdf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/mapscripts
 @dirrm %%DATADIR%%/linux
-@dirrm %%DATADIR%%
+@dirrmtry %%DATADIR%%