aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--games/fretsonfire-data/Makefile7
-rw-r--r--games/fretsonfire-data/pkg-descr2
-rw-r--r--games/fretsonfire/Makefile30
-rw-r--r--games/fretsonfire/pkg-descr2
4 files changed, 17 insertions, 24 deletions
diff --git a/games/fretsonfire-data/Makefile b/games/fretsonfire-data/Makefile
index 741ca986ee72..c04b47a4f4c6 100644
--- a/games/fretsonfire-data/Makefile
+++ b/games/fretsonfire-data/Makefile
@@ -19,11 +19,10 @@ WRKSRC= ${WRKDIR}/Frets\ on\ Fire-${PORTVERSION}
EXTRACT_AFTER_ARGS= --exclude 'win32' "Frets on Fire-${PORTVERSION}/${PORTNAME}"
-NO_STAGE= yes
do-install:
- @${MKDIR} ${PREFIX}/${DATADIR}
+ @${MKDIR} ${STAGEDIR}${PREFIX}/${DATADIR}
@cd ${WRKSRC}/data && \
- ${FIND} * -type d -exec ${MKDIR} "${PREFIX}/${DATADIR}/{}" \; && \
- ${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${PREFIX}/${DATADIR}/{}" \;
+ ${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${PREFIX}/${DATADIR}/{}" \; && \
+ ${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${PREFIX}/${DATADIR}/{}" \;
.include <bsd.port.mk>
diff --git a/games/fretsonfire-data/pkg-descr b/games/fretsonfire-data/pkg-descr
index 2ce9d1819701..aa4330d62da5 100644
--- a/games/fretsonfire-data/pkg-descr
+++ b/games/fretsonfire-data/pkg-descr
@@ -1,3 +1,3 @@
The Frets on Fire data files
-WWW: http://louhi.kempele.fi/~skyostil/uv/fretsonfire/
+WWW: http://louhi.kempele.fi/~skyostil/uv/fretsonfire/
diff --git a/games/fretsonfire/Makefile b/games/fretsonfire/Makefile
index 58d5d79b3c6f..4849e2bdc7dd 100644
--- a/games/fretsonfire/Makefile
+++ b/games/fretsonfire/Makefile
@@ -3,7 +3,7 @@
PORTNAME= fretsonfire
PORTVERSION= 1.3.110
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games python
MASTER_SITES= SF
DISTNAME= ${PORTNAME:S/f/F/g:S/o/O/}-${PORTVERSION}
@@ -31,26 +31,20 @@ WRKSRC= "${WRKDIR}/Frets on Fire-${PORTVERSION}"
FOF_DIR= ${PREFIX}/lib/${PORTNAME}
-NO_STAGE= yes
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE= DOCS
do-install:
- ${MKDIR} ${FOF_DIR}/${PORTNAME:S/f/F/g:S/o/O/}
+ @${MKDIR} ${STAGEDIR}${FOF_DIR}/${PORTNAME:S/f/F/g:S/o/O/}
@cd ${WRKSRC}/src && \
- ${FIND} * -type d -exec ${MKDIR} "${FOF_DIR}/${PORTNAME:S/f/F/g:S/o/O/}/{}" \; && \
- ${FIND} -E * -type f -iregex ".*\.(py)" -exec ${INSTALL_DATA} "{}" "${FOF_DIR}/${PORTNAME:S/f/F/g:S/o/O/}/{}" \;
+ ${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${FOF_DIR}/${PORTNAME:S/f/F/g:S/o/O/}/{}" \; && \
+ ${FIND} -E * -type f -iregex ".*\.(py)" -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${FOF_DIR}/${PORTNAME:S/f/F/g:S/o/O/}/{}" \;
- ${MKDIR} ${FOF_DIR}/data
- ${LN} -s ${LOCALBASE}/${DATADIR}/* ${FOF_DIR}/data
- ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME:S/f/F/g:S/o/O/} ${PREFIX}/bin
+ @${MKDIR} ${STAGEDIR}${FOF_DIR}/data
+ ${LN} -s ${LOCALBASE}/${DATADIR}/* ${STAGEDIR}${FOF_DIR}/data
+ ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME:S/f/F/g:S/o/O/} ${STAGEDIR}${PREFIX}/bin
-.if ${PORT_OPTIONS:MDOCS}
- ${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/readme.txt ${DOCSDIR}/README
- ${INSTALL_DATA} ${WRKSRC}/install.txt ${DOCSDIR}/INSTALL
-.endif
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/readme.txt ${STAGEDIR}${DOCSDIR}/README
+ ${INSTALL_DATA} ${WRKSRC}/install.txt ${STAGEDIR}${DOCSDIR}/INSTALL
-post-install:
- @${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/fretsonfire/pkg-descr b/games/fretsonfire/pkg-descr
index af0eee11e115..c8c09794eaf8 100644
--- a/games/fretsonfire/pkg-descr
+++ b/games/fretsonfire/pkg-descr
@@ -1,4 +1,4 @@
Frets on Fire is a game of musical skill and fast fingers. The aim of the game
is to play guitar with the keyboard as accurately as possible.
-WWW: http://fretsonfire.sf.net
+WWW: http://fretsonfire.sf.net