svn commit: r330699 - in head/games/apricots: . files

[Dmitry Marakasov]

Author: amdmi3
Date: Thu Oct 17 23:54:39 2013
New Revision: 330699
URL: http://svnweb.freebsd.org/changeset/ports/330699

Log:
  - Support staging
  - Reimplement build/install to avoid autocr*p madness
  - Handle config file properly

Added:
  head/games/apricots/files/apricots.in   (contents, props changed)
  head/games/apricots/files/patch-apricots-init.cpp   (contents, props changed)
Deleted:
  head/games/apricots/pkg-plist
Modified:
  head/games/apricots/Makefile

Modified: head/games/apricots/Makefile
==============================================================================
--- head/games/apricots/Makefile	Thu Oct 17 23:52:45 2013	(r330698)
+++ head/games/apricots/Makefile	Thu Oct 17 23:54:39 2013	(r330699)
@@ -11,50 +11,45 @@ MASTER_SITES=	http://www.fishies.org.uk/
 MAINTAINER=	amdmi3 at FreeBSD.org
 COMMENT=	Fly a little plane around and shoot things and drop bombs
 
-USE_AUTOTOOLS=	libtool
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 USE_SDL=	sdl
 USE_DOS2UNIX=	yes
+SUB_FILES=	${PORTNAME}
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-PORTDOCS=	README
+PLIST_FILES=	bin/${PORTNAME} libexec/${PORTNAME}
+PORTDATA=	*
+PORTDOCS=	*
+CPPFLAGS+=	-DAP_PATH="\"${DATADIR}/\""
 
 DESKTOP_ENTRIES="Apricots" \
-		"Fly a little plane around and shoot things and drop bombs" \
+		"${COMMENT}" \
 		"" \
-		"apricots" \
+		"${PORTNAME}" \
 		"Game;ArcadeGame;" \
 		false
 
-OPTIONS_DEFINE=	OPENAL
-OPTIONS_DEFAULT=OPENAL
+OPTIONS_DEFINE=	DOCS OPENAL
+OPTIONS_DEFAULT=DOCS OPENAL
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOPENAL}
 USE_OPENAL=	al alut
+CPPFLAGS+=	-DAP_AUDIO_OPENAL
+LDFLAGS+=	-L${LOCALBASE}/lib -lopenal -lalut
 .endif
 
-post-patch:
-	@${CP} -pP ${WRKSRC}/configure.in ${WRKSRC}/configure.in.in
-.if ${PORT_OPTIONS:MOPENAL}
-	@${REINPLACE_CMD} -e '/^LIBS = / s|$$| -lopenal -lalut|' \
-		${WRKSRC}/apricots/Makefile.in
-.else
-	@${REINPLACE_CMD} -e 's|-DAP_AUDIO_OPENAL||' ${WRKSRC}/configure
-.endif
-	@${REINPLACE_CMD} -e 's|-O2||' ${WRKSRC}/configure ${WRKSRC}/ac*.m4
-
-.if ${PORT_OPTIONS:MDOCS}
-post-install:
-	${MKDIR} ${DOCSDIR}
-.for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+do-build:
+	cd ${WRKSRC}/apricots && ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS} \
+		`${SDL_CONFIG} --cflags --libs` *.cpp -o ${PORTNAME}
+
+do-install:
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/apricots/${PORTNAME} ${STAGEDIR}${PREFIX}/libexec
+	${MKDIR} ${STAGEDIR}${DATADIR}
+.for ext in wav shapes psf cfg
+	${INSTALL_DATA} ${WRKSRC}/apricots/*.${ext} ${STAGEDIR}${DATADIR}
 .endfor
-.endif
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Added: head/games/apricots/files/apricots.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/apricots/files/apricots.in	Thu Oct 17 23:54:39 2013	(r330699)
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+if [ -z "$XDG_CONFIG_HOME" ]; then
+	XDG_CONFIG_HOME=$HOME/.config
+fi
+
+mkdir -p $XDG_CONFIG_HOME/apricots
+cd $XDG_CONFIG_HOME/apricots
+
+if [ ! -f apricots.cfg ]; then
+	cp %%DATADIR%%/apricots.cfg .
+fi
+
+exec %%PREFIX%%/libexec/apricots "$@"

Added: head/games/apricots/files/patch-apricots-init.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/apricots/files/patch-apricots-init.cpp	Thu Oct 17 23:54:39 2013	(r330699)
@@ -0,0 +1,11 @@
+--- apricots/init.cpp.orig	2013-10-18 03:20:08.162773332 +0400
++++ apricots/init.cpp	2013-10-18 03:21:49.134378818 +0400
+@@ -275,7 +275,7 @@
+ void init_gamedata(gamedata &g){
+ 
+   //--JAM: Read from config file
+-  string filename(AP_PATH);
++  string filename;
+   filename += "apricots.cfg";
+   ifstream config_stream(filename.c_str());
+   string config;