pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Better coding on wanderer Makefile



Module Name:	pkgsrc-wip
Committed By:	Marina Brown <catskillmarina%gmail.com@localhost>
Pushed By:	catskillmarina
Date:		Fri Jan 15 02:40:32 2016 +0000
Changeset:	b6dfa093732fe83f0b1ae0a8b9a98fc5e5761325

Modified Files:
	wanderer/Makefile
	wanderer/distinfo

Log Message:
Better coding on wanderer Makefile

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b6dfa093732fe83f0b1ae0a8b9a98fc5e5761325

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 wanderer/Makefile | 29 ++++++++++++++---------------
 wanderer/distinfo |  6 +++---
 2 files changed, 17 insertions(+), 18 deletions(-)

diffs:
diff --git a/wanderer/Makefile b/wanderer/Makefile
index 2ba22ea..6a45168 100644
--- a/wanderer/Makefile
+++ b/wanderer/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	wanderer-dev
+DISTNAME=	wanderer-dev.3.2.1
 PKGREVISION=    1
 CATEGORIES=	games
 MASTER_SITES=	http://e271.net/~marina/
@@ -13,26 +13,25 @@ LICENSE=	gnu-gpl-v2
 
 INSTALLATION_DIRS+=     man man/man6 bin share/wanderer share/wanderer/screens games
 
-do-build:
-	${MV} ${WRKSRC}/wand_head.h ${WRKSRC}/wand_head.h.pre
-	${SED} -e "s,/usr/local/share/wanderer/screens,${PREFIX}/share/wanderer/screens," \
-               -e "s,/var/games/wandererscores,${PREFIX}/games/wandererscores," \
-		${WRKSRC}/wand_head.h.pre > ${WRKSRC}/wand_head.h
-	${MV} ${WRKSRC}/wand_head.h ${WRKSRC}/wand_head.h.pre
-	${SED} -e "s,#include <ncurses.h>,#include <curses.h>," \
-		${WRKSRC}/wand_head.h.pre > ${WRKSRC}/wand_head.h
-	${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.pre
-	${SED} -e 's|${DESTDIR}||' ${WRKSRC}/Makefile.pre  \
-            > ${WRKSRC}/Makefile
-	${SED} -i -e "s,/usr/local/,${PREFIX}/," ${WRKSRC}/Makefile
-	cd ${WRKSRC}; make
+SUBST_CLASSES+= wanderer
+SUBST_STAGE.wanderer= pre-build
+SUBST_FILES.wanderer= wand_head.h
+SUBST_SED.wanderer= -e "s,/usr/local/share/wanderer/screens,${PREFIX}/share/wanderer/screens,"
+SUBST_SED.wanderer+= -e "s,/var/games/wandererscores,${PREFIX}/games/wandererscores,"
+SUBST_SED.wanderer+= -e "s,\#include <ncurses.h>,\#include <curses.h>,"
+
+SUBST_CLASSES+= wand-mk
+SUBST_STAGE.wand-mk= pre-build
+SUBST_FILES.wand-mk= Makefile
+SUBST_SED.wand-mk= -e 's|${DESTDIR}||'
+SUBST_SED.wand-mk+= -e "s,/usr/local/,${PREFIX}/,"
 
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/wanderer
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/games
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/wanderer/screens
 	${INSTALL_DATA} -m 0644 ${WRKSRC}/screens/* ${DESTDIR}${PREFIX}/share/wanderer/screens/
-        ${INSTALL} -o ${GAMES_USER} -g ${GAMES_GROUP} -m 2755 ${WRKSRC}/wanderer ${DESTDIR}${PREFIX}/bin/
+	${INSTALL} -o ${GAMES_USER} -g ${GAMES_GROUP} -m 2755 ${WRKSRC}/wanderer ${DESTDIR}${PREFIX}/bin/
 	${INSTALL_MAN} ${WRKSRC}/wanderer.6 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/wanderer/distinfo b/wanderer/distinfo
index 03cd0ff..f27d61e 100644
--- a/wanderer/distinfo
+++ b/wanderer/distinfo
@@ -1,5 +1,5 @@
 $NetBSD$
 
-SHA1 (wanderer-dev.tgz) = 6ccc3dee8be2cd77c23326c667c36e9cc228163f
-RMD160 (wanderer-dev.tgz) = e59195b8691244d49e84671e9220ae3f9e0409d0
-Size (wanderer-dev.tgz) = 164992 bytes
+SHA1 (wanderer-dev.3.2.1.tgz) = 0187fe83a2e3b68ab51b53adfca160b95737dbc2
+RMD160 (wanderer-dev.3.2.1.tgz) = 9f0e40776376651761b11570d422e4ede22282fa
+Size (wanderer-dev.3.2.1.tgz) = 165025 bytes


Home | Main Index | Thread Index | Old Index