Date: Sat, 28 Mar 2015 11:38:29 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r382463 - in head/games/typespeed: . files Message-ID: <201503281138.t2SBcTlG084933@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Sat Mar 28 11:38:28 2015 New Revision: 382463 URL: https://svnweb.freebsd.org/changeset/ports/382463 QAT: https://qat.redports.org/buildarchive/r382463/ Log: - Simplify - Switch to upstream installation, install missing files - Convert install/deinstall scripts to @sample - Drop @dirrm* from plist - Add LICENSE Deleted: head/games/typespeed/files/ Modified: head/games/typespeed/Makefile head/games/typespeed/pkg-plist Modified: head/games/typespeed/Makefile ============================================================================== --- head/games/typespeed/Makefile Sat Mar 28 11:38:26 2015 (r382462) +++ head/games/typespeed/Makefile Sat Mar 28 11:38:28 2015 (r382463) @@ -3,62 +3,42 @@ PORTNAME= typespeed PORTVERSION= 0.6.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Test your typing speed and get your fingers' CPS -OPTIONS_DEFINE= NLS -OPTIONS_SUB= yes +LICENSE= GPLv2 # or later +LICENSE_FILE= ${WRKSRC}/COPYING USES= ncurses GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-highscoredir="${SCOREDIR}" -CFLAGS+= -I${LOCALBASE}/include -DWITH_HIGHSCOREDIR=\"${SCOREDIR}\" \ - -DHIGHDIR=\"${SCOREDIR}\" -DHIGHSCOREDIR=\"${SCOREDIR}\" +SCOREDIR= /var/games/typespeed +SCOREFILE= typespeed.score -SUB_FILES= pkg-install pkg-deinstall -SUB_LIST= SCOREDIR="${SCOREDIR}" SCOREFILE="${SCOREFILE}" +OPTIONS_DEFINE= NLS DOCS +OPTIONS_SUB= yes NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls -SCOREPREFIX?= /var/games -SCOREDIR= ${SCOREPREFIX}/typespeed -SCOREFILE= typespeed.score - -.include <bsd.port.options.mk> - post-patch: - @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ - 's|^\(CC =\).*|\1 @CC@|' + @${FIND} ${WRKSRC} -name "Makefile.in" -exec \ + ${REINPLACE_CMD} -e 's|^\(CC =\).*|\1 @CC@|; \ + /chmod/ d; /chgrp/ d' {} \; @${REINPLACE_CMD} -e \ 's|\(/etc\)|${PREFIX}\1|' ${WRKSRC}/src/pathnames.h -do-install: - (cd ${WRKSRC}/src && ${INSTALL_PROGRAM} ${PORTNAME} \ - ${STAGEDIR}${PREFIX}/bin) - (cd ${WRKSRC}/src && ${INSTALL_PROGRAM} convert \ - ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-hs-conv) - (cd ${WRKSRC}/man && ${INSTALL_MAN} ${PORTNAME}.6 \ - ${STAGEDIR}${MAN6PREFIX}/man/man6) - (cd ${WRKSRC}/etc && ${INSTALL_DATA} typespeedrc \ - ${STAGEDIR}${PREFIX}/etc/typespeedrc.dist) - @${MKDIR} ${STAGEDIR}${DATADIR} - (cd ${WRKSRC}/src && ${INSTALL_DATA} ${SCOREFILE} \ - ${STAGEDIR}${DATADIR}/${SCOREFILE}.default) - @${MKDIR} ${STAGEDIR}${DATADIR}/words - (cd ${WRKSRC}/words && ${INSTALL_DATA} words.* \ - ${STAGEDIR}${DATADIR}/words) -.if ${PORT_OPTIONS:MNLS} -.for i in de_DE fr_FR it - @${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${i}/LC_MESSAGES - (cd ${WRKSRC}/po && ${INSTALL_DATA} ${i}.gmo \ - ${STAGEDIR}${PREFIX}/share/locale/${i}/LC_MESSAGES/typespeed.mo) -.endfor -.endif +post-install: + ${INSTALL_PROGRAM} ${WRKSRC}/src/convert \ + ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-hs-conv + ${MV} ${STAGEDIR}${PREFIX}/etc/typespeedrc \ + ${STAGEDIR}${PREFIX}/etc/typespeedrc.sample + ${MV} ${STAGEDIR}${SCOREDIR}/${SCOREFILE} \ + ${STAGEDIR}${SCOREDIR}/${SCOREFILE}.sample .include <bsd.port.mk> Modified: head/games/typespeed/pkg-plist ============================================================================== --- head/games/typespeed/pkg-plist Sat Mar 28 11:38:26 2015 (r382462) +++ head/games/typespeed/pkg-plist Sat Mar 28 11:38:28 2015 (r382463) @@ -1,17 +1,14 @@ -@group games -@mode 2555 -bin/typespeed -@mode -@group +@(,games,2555) bin/typespeed bin/typespeed-hs-conv -@unexec if cmp -s %D/etc/typespeedrc %D/etc/typespeedrc.dist; then rm -f %D/etc/typespeedrc; fi -etc/typespeedrc.dist -@exec [ -f %B/typespeedrc ] || cp %B/%f %B/typespeedrc +@sample etc/typespeedrc.sample man/man6/typespeed.6.gz +%%PORTDOCS%%%%DOCSDIR%%/README %%NLS%%share/locale/de_DE/LC_MESSAGES/typespeed.mo %%NLS%%share/locale/fr_FR/LC_MESSAGES/typespeed.mo %%NLS%%share/locale/it/LC_MESSAGES/typespeed.mo -%%DATADIR%%/typespeed.score.default +%%DATADIR%%/rules/rule.classic +%%DATADIR%%/rules/rule.training +%%DATADIR%%/rules/template %%DATADIR%%/words/words.csharp %%DATADIR%%/words/words.csharp_with_operators %%DATADIR%%/words/words.dos @@ -26,7 +23,5 @@ man/man6/typespeed.6.gz %%DATADIR%%/words/words.prog %%DATADIR%%/words/words.tha %%DATADIR%%/words/words.unix -@dirrm %%DATADIR%%/words -@dirrm %%DATADIR%% -%%NLS%%@dirrmtry share/locale/de_DE/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/de_DE +@sample(,games,664) /var/games/typespeed/typespeed.score.sample +@dir(,games,775) /var/games/typespeed
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503281138.t2SBcTlG084933>