Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 26 Dec 2013 14:28:52 +0000 (UTC)
From:      Rusmir Dusko <nemysis@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r337517 - head/games/kajaani-kombat
Message-ID:  <201312261428.rBQESqII019124@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: nemysis
Date: Thu Dec 26 14:28:51 2013
New Revision: 337517
URL: http://svnweb.freebsd.org/changeset/ports/337517

Log:
  - Change Makefile header
  - Use the new format for LIB_DEPENDS
  - USES gmake instead of USE_GMAKE
  - Add DOCS Option
  - Change Desktop entry file
  - Support STAGEDIR
  - Mute dir install
  
  Approved by:	pawel / wg (mentors, implicit)

Modified:
  head/games/kajaani-kombat/Makefile
  head/games/kajaani-kombat/pkg-plist

Modified: head/games/kajaani-kombat/Makefile
==============================================================================
--- head/games/kajaani-kombat/Makefile	Thu Dec 26 14:28:47 2013	(r337516)
+++ head/games/kajaani-kombat/Makefile	Thu Dec 26 14:28:51 2013	(r337517)
@@ -1,4 +1,4 @@
-# Created by: nemysis@gmx.ch
+# Created by: nemysis <nemysis@gmx.ch>
 # $FreeBSD$
 
 PORTNAME=	kajaani-kombat
@@ -12,42 +12,39 @@ COMMENT=	Funny multiplayer game... and m
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
 
+USES=		gmake iconv
 USE_SDL=	sdl image mixer net ttf
-USE_GMAKE=	yes
 ALL_TARGET=	client server
-USES=		iconv
 
 PORTDOCS=	AUTHORS ChangeLog README
 
-MAN6=		${PORTNAME}.6
+OPTIONS_DEFINE=	DOCS
 
 SUB_FILES=	${PORTNAME}
 
-DESKTOP_ENTRIES="Kajaani Kombat" "${COMMENT}" "${PORTNAME}" \
-		"${PORTNAME}" "Game;ArcadeGame;" false
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+DESKTOP_ENTRIES="Kajaani Kombat" "" "${PORTNAME}" \
+		"${PORTNAME}" "Game;ArcadeGame;" ""
 
 post-patch:
 	@${REINPLACE_CMD} 's|-O||g; s|-Wall $$(DEBUG)|${CXXFLAGS} &|' \
 		${WRKSRC}/Makefile
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
-	${MKDIR} ${DATADIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${DATADIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-server ${DATADIR}
-	@(cd ${WRKSRC} && ${INSTALL_DATA} *.png *.ogg *.ttf ${DATADIR})
-	${LN} -sf ${DATADIR}/logo.png ${PREFIX}/share/pixmaps/${PORTNAME}.png
-
-	${INSTALL_MAN} ${WRKSRC}/${MAN6} ${MAN6PREFIX}/man/man6
-
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-.endif
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+.for d in *.png *.ogg *.ttf
+	@(cd ${WRKSRC} && ${INSTALL_DATA} ${d} ${STAGEDIR}${DATADIR})
+.endfor
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${DATADIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-server ${STAGEDIR}${DATADIR}
+	${LN} -sf ${DATADIR}/logo.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
+
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.6 ${STAGEDIR}${MAN6PREFIX}/man/man6/
+
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/games/kajaani-kombat/pkg-plist
==============================================================================
--- head/games/kajaani-kombat/pkg-plist	Thu Dec 26 14:28:47 2013	(r337516)
+++ head/games/kajaani-kombat/pkg-plist	Thu Dec 26 14:28:51 2013	(r337517)
@@ -1,4 +1,5 @@
 bin/kajaani-kombat
+man/man6/kajaani-kombat.6.gz
 %%DATADIR%%/0ammo.png
 %%DATADIR%%/0big_ammo.png
 %%DATADIR%%/0big_cannon.png



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