Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 30 Oct 2013 05:26:43 +0000 (UTC)
From:      Danilo Egea Gondolfo <danilo@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r332067 - head/games/battalion
Message-ID:  <201310300526.r9U5QhBJ022272@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danilo
Date: Wed Oct 30 05:26:42 2013
New Revision: 332067
URL: http://svnweb.freebsd.org/changeset/ports/332067

Log:
  - Add stage support
  - Add DOCS option

Modified:
  head/games/battalion/Makefile
  head/games/battalion/pkg-plist

Modified: head/games/battalion/Makefile
==============================================================================
--- head/games/battalion/Makefile	Wed Oct 30 05:09:22 2013	(r332066)
+++ head/games/battalion/Makefile	Wed Oct 30 05:26:42 2013	(r332067)
@@ -18,11 +18,10 @@ MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
 
 CFLAGS+=	-I${LOCALBASE}/include/X11 -I${LOCALBASE}/include \
 		-DLINUXVERSION -DLINUXAUDIO
-LDFLAGS=	-L${LOCALBASE}/lib -lX11 -lm
+LDFLAGS+=	-L${LOCALBASE}/lib -lX11 -lm
 
-MAN6=		battalion.6
+OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 post-extract:
 	@${GZCAT} ${DISTDIR}/battalionSUN4.tar.gz | \
 		(cd ${WRKDIR} && ${TAR} --unlink -xf -)
@@ -36,24 +35,22 @@ post-patch:
 		 s|<linux/soundcard\.h>|<sys/soundcard.h>|' ${WRKSRC}/soundIt.c
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/battalion ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/battalion ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKDIR}/battalionSUN4/battalion.man \
-		${MAN6PREFIX}/man/man6/battalion.6
-	@${MKDIR} ${DATADIR}
+		${STAGEDIR}${MAN6PREFIX}/man/man6/battalion.6
+	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/battalion.sho \
-		${DATADIR}
-	@${MKDIR} ${DATADIR}/DATA
-	${INSTALL_DATA} ${WRKSRC}/DATA/*.data ${DATADIR}/DATA
-	@${MKDIR} ${DATADIR}/MUSIC
-	${INSTALL_DATA} ${WRKSRC}/MUSIC/*.au ${DATADIR}/MUSIC
-	@${MKDIR} ${DATADIR}/SOUNDS
-	${INSTALL_DATA} ${WRKSRC}/SOUNDS/*.au ${DATADIR}/SOUNDS
-	@${MKDIR} ${DATADIR}/TEXTURES
-	${INSTALL_DATA} ${WRKSRC}/TEXTURES/*.tex ${DATADIR}/TEXTURES
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	${INSTALL_DATA} ${WRKDIR}/battalionSUN4/HELP/*.gif ${DOCSDIR}
-.endif
+		${STAGEDIR}${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DATADIR}/DATA
+	${INSTALL_DATA} ${WRKSRC}/DATA/*.data ${STAGEDIR}${DATADIR}/DATA
+	@${MKDIR} ${STAGEDIR}${DATADIR}/MUSIC
+	${INSTALL_DATA} ${WRKSRC}/MUSIC/*.au ${STAGEDIR}${DATADIR}/MUSIC
+	@${MKDIR} ${STAGEDIR}${DATADIR}/SOUNDS
+	${INSTALL_DATA} ${WRKSRC}/SOUNDS/*.au ${STAGEDIR}${DATADIR}/SOUNDS
+	@${MKDIR} ${STAGEDIR}${DATADIR}/TEXTURES
+	${INSTALL_DATA} ${WRKSRC}/TEXTURES/*.tex ${STAGEDIR}${DATADIR}/TEXTURES
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKDIR}/battalionSUN4/HELP/*.gif ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/games/battalion/pkg-plist
==============================================================================
--- head/games/battalion/pkg-plist	Wed Oct 30 05:09:22 2013	(r332066)
+++ head/games/battalion/pkg-plist	Wed Oct 30 05:26:42 2013	(r332067)
@@ -1,4 +1,5 @@
 bin/battalion
+man/man6/battalion.6.gz
 %%DATADIR%%/battalion.sho
 %%DATADIR%%/DATA/road.data
 %%DATADIR%%/DATA/tank.data



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310300526.r9U5QhBJ022272>