- Update to 0.5

PR:             111009
Submitted by:   Dmitry Marakasov <amdmi3@amdmi3.ru>
Approved by:    maintainer

4 files changed, 38 insertions, 57 deletions

diff --git a/games/cavezofphear/Makefile b/games/cavezofphear/Makefile
index 079aea8eae70..2526eb7ecce8 100644
--- a/games/cavezofphear/Makefile
+++ b/games/cavezofphear/Makefile
@@ -6,63 +6,37 @@
 #
 
 PORTNAME=	cavezofphear
-PORTVERSION=	0.1
+PORTVERSION=	0.5
 CATEGORIES=	games
-MASTER_SITES=	http://www.x86.no/cavezofphear/
+MASTER_SITES=	http://www.x86.no/cavezofphear/ \
+		http://www.amdmi3.ru/distfiles/
 DISTNAME=	phear-${PORTVERSION}
 
 MAINTAINER=	tlp@liquidx.org
 COMMENT=	Boulder Dash / Digger-like game written using ncurses
 
-WRKSRC=		${WRKDIR}/phear-${PORTVERSION}/src
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
+BUILD_WRKSRC=	${WRKDIR}/${DISTNAME}/src
 
-PLIST_DIRS=	share/${PORTNAME}/levels share/${PORTNAME}
+PORTDOCS=	ChangeLog README README-EDITOR TODO
 
-PLIST_FILES=	bin/phear bin/phear-editor \
-		share/${PORTNAME}/gover share/${PORTNAME}/htext \
-		share/${PORTNAME}/spgraf share/${PORTNAME}/tdesc \
-		share/${PORTNAME}/levels/01 share/${PORTNAME}/levels/02 \
-		share/${PORTNAME}/levels/03 share/${PORTNAME}/levels/04 \
-		share/${PORTNAME}/levels/05
-
-PORTDOCS=	AUTHORS ChangeLog README README-EDITOR TODO
-
-FIXME=		chk.c main.c splash.c
-
-pre-build:
-.for i in ${FIXME}
-	${REINPLACE_CMD} -e 's|data/|${DATADIR}/|' ${WRKSRC}/${i}
-.endfor
-	@${REINPLACE_CMD} -e 's|usage: editor|usage: phear-editor|' \
-	${WRKSRC}/editor.c
-	@${REINPLACE_CMD} -e 's|./editor|phear-editor|' \
-	${WRKSRC}/../README-EDITOR
-	@${REINPLACE_CMD} -e 's|./phear|phear|' \
-	${WRKSRC}/../README-EDITOR
+post-patch:
+	@${REINPLACE_CMD} -e 's|\./data|${DATADIR}/data|' ${WRKSRC}/src/chk.c
+	@${REINPLACE_CMD} -e 's|\./phear|phear|' ${WRKSRC}/README-EDITOR
 
 do-install:
 	${MKDIR} ${DATADIR}
-	${MKDIR} ${DATADIR}/levels
-	${INSTALL_DATA} ${WRKSRC}/../data/gover ${DATADIR}/gover
-	${INSTALL_DATA} ${WRKSRC}/../data/htext ${DATADIR}/htext
-	${INSTALL_DATA} ${WRKSRC}/../data/spgraf ${DATADIR}/spgraf
-	${INSTALL_DATA} ${WRKSRC}/../data/tdesc ${DATADIR}/tdesc
-	${INSTALL_DATA} ${WRKSRC}/../data/levels/01 ${DATADIR}/levels/01
-	${INSTALL_DATA} ${WRKSRC}/../data/levels/02 ${DATADIR}/levels/02
-	${INSTALL_DATA} ${WRKSRC}/../data/levels/03 ${DATADIR}/levels/03
-	${INSTALL_DATA} ${WRKSRC}/../data/levels/04 ${DATADIR}/levels/04
-	${INSTALL_DATA} ${WRKSRC}/../data/levels/05 ${DATADIR}/levels/05
-	${INSTALL_PROGRAM} ${WRKSRC}/../phear ${PREFIX}/bin/phear
-	${INSTALL_PROGRAM} ${WRKSRC}/../editor ${PREFIX}/bin/phear-editor
+	${INSTALL_PROGRAM} ${WRKSRC}/phear ${PREFIX}/bin
+	@(cd ${WRKSRC}; ${COPYTREE_SHARE} data ${DATADIR})
+
 .if !defined(NOPORTDOCS)
+post-install:
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/../AUTHORS ${DOCSDIR}/AUTHORS
-	${INSTALL_DATA} ${WRKSRC}/../ChangeLog ${DOCSDIR}/ChangeLog
-	${INSTALL_DATA} ${WRKSRC}/../README ${DOCSDIR}/README
-	${INSTALL_DATA} ${WRKSRC}/../README-EDITOR ${DOCSDIR}/README-EDITOR
-	${INSTALL_DATA} ${WRKSRC}/../TODO ${DOCSDIR}/TODO
+.for f in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/games/cavezofphear/distinfo b/games/cavezofphear/distinfo
index 498d8fe9cbbf..bf13bd04daaa 100644
--- a/games/cavezofphear/distinfo
+++ b/games/cavezofphear/distinfo
@@ -1,3 +1,3 @@
-MD5 (phear-0.1.tar.bz2) = 10875ba2d574e7e3cb293129876ee95d
-SHA256 (phear-0.1.tar.bz2) = 6512b894597bfa685b38b5b2cd8023af2441c08c81b38790eadd0148f36d621d
-SIZE (phear-0.1.tar.bz2) = 16858
+MD5 (phear-0.5.tar.bz2) = 232f6f34d2a5aede7af70eb6e3d8d49f
+SHA256 (phear-0.5.tar.bz2) = 1087c04347ff60d153ffceb91363a31643337ed71b4a40b68160392d32d68bb7
+SIZE (phear-0.5.tar.bz2) = 20502
diff --git a/games/cavezofphear/files/patch-isready.c b/games/cavezofphear/files/patch-isready.c
deleted file mode 100644
index 8e0fa50b2ba0..000000000000
--- a/games/cavezofphear/files/patch-isready.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- isready.c.orig	Wed Nov  5 16:00:45 2003
-+++ isready.c	Tue Sep 20 23:43:45 2005
-@@ -1,6 +1,9 @@
- #include <stdio.h>
-+#include <inttypes.h>
-+#include <sys/types.h>
- #include <sys/select.h>
- #include <sys/time.h>
-+#include <string.h>
- 
- int isready(int fd);
- 
diff --git a/games/cavezofphear/pkg-plist b/games/cavezofphear/pkg-plist
new file mode 100644
index 000000000000..bc08035771cf
--- /dev/null
+++ b/games/cavezofphear/pkg-plist
@@ -0,0 +1,19 @@
+bin/phear
+%%DATADIR%%/data/gover
+%%DATADIR%%/data/htext
+%%DATADIR%%/data/levels/01
+%%DATADIR%%/data/levels/02
+%%DATADIR%%/data/levels/03
+%%DATADIR%%/data/levels/04
+%%DATADIR%%/data/levels/05
+%%DATADIR%%/data/levels/06
+%%DATADIR%%/data/levels/07
+%%DATADIR%%/data/levels/08
+%%DATADIR%%/data/levels/09
+%%DATADIR%%/data/levels/10
+%%DATADIR%%/data/levels/11
+%%DATADIR%%/data/spgraf
+%%DATADIR%%/data/tdesc
+@dirrm %%DATADIR%%/data/levels
+@dirrm %%DATADIR%%/data
+@dirrm %%DATADIR%%