Date: Thu, 28 Aug 2014 03:18:32 +0000 (UTC) From: "Vanilla I. Shu" <vanilla@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r366372 - in head/games/xjewel: . files Message-ID: <201408280318.s7S3IWVh061577@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vanilla Date: Thu Aug 28 03:18:32 2014 New Revision: 366372 URL: http://svnweb.freebsd.org/changeset/ports/366372 QAT: https://qat.redports.org/buildarchive/r366372/ Log: Support STAGEDIR. PR: ports/193036 Submitted by: Ports Fury Added: head/games/xjewel/files/pkg-deinstall.in (contents, props changed) head/games/xjewel/files/pkg-install.in (contents, props changed) Deleted: head/games/xjewel/pkg-req Modified: head/games/xjewel/Makefile head/games/xjewel/files/patch-aa head/games/xjewel/pkg-plist Modified: head/games/xjewel/Makefile ============================================================================== --- head/games/xjewel/Makefile Thu Aug 28 03:14:24 2014 (r366371) +++ head/games/xjewel/Makefile Thu Aug 28 03:18:32 2014 (r366372) @@ -3,7 +3,7 @@ PORTNAME= xjewel PORTVERSION= 1.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= XCONTRIB/../R5contrib EXTRACT_SUFX= .tar.z @@ -14,22 +14,22 @@ COMMENT= X11 dropping jewels game BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale +RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir USES= imake USE_XORG= x11 xext -MAN6= xjewel.6 +SUB_FILES= pkg-install pkg-deinstall +SUB_LIST= FONTSDIR="${FONTSDIR}" -FONTSDIR= lib/X11/fonts/local -PLIST_SUB= FONTSDIR=${FONTSDIR} +PLIST_SUB= FONTSDIR="${FONTSDIR}" + +DESKTOP_ENTRIES="XJewel" "" "" "${PORTNAME}" "" "" -NO_STAGE= yes -pre-install: - @${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGREQ} ${PKGNAME} INSTALL +FONTSDIR= lib/X11/fonts/local post-install: - ${INSTALL_DATA} ${WRKSRC}/bitmaps/seven_seg.pcf.gz ${PREFIX}/${FONTSDIR} - @(cd ${PREFIX}/${FONTSDIR} ; mkfontdir) + (cd ${WRKSRC}/bitmaps && ${INSTALL_DATA} seven_seg.pcf.gz \ + ${STAGEDIR}${PREFIX}/${FONTSDIR}) .include <bsd.port.mk> Modified: head/games/xjewel/files/patch-aa ============================================================================== --- head/games/xjewel/files/patch-aa Thu Aug 28 03:14:24 2014 (r366371) +++ head/games/xjewel/files/patch-aa Thu Aug 28 03:18:32 2014 (r366372) @@ -41,6 +41,8 @@ all:: $(CFONT) install:: +- touch $(HSCORE_FILE) +- chmod a+w $(HSCORE_FILE) + MakeDir($(DESTDIR)$(HSCORE_DIR)) - touch $(HSCORE_FILE) - chmod a+w $(HSCORE_FILE) ++ touch $(DESTDIR)$(HSCORE_FILE) ++ chmod a+w $(DESTDIR)$(HSCORE_FILE) Added: head/games/xjewel/files/pkg-deinstall.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/xjewel/files/pkg-deinstall.in Thu Aug 28 03:18:32 2014 (r366372) @@ -0,0 +1,13 @@ +#!/bin/sh + +if [ "x$2" = "xPOST-DEINSTALL" ]; then + cd ${PKG_PREFIX}/%%FONTSDIR%%; ${PKG_PREFIX}/bin/mkfontdir + ${PKG_PREFIX}/bin/xset fp rehash || + ( + echo "**********************************************************" + echo "You should restart X server or do 'xset fp rehash' command" + echo "to enable this update." + echo "**********************************************************" + ) + [ `wc -c ${PKG_PREFIX}/%%FONTSDIR%%/fonts.dir | awk '{print $1}'` = 2 ] && rm -f ${PKG_PREFIX}/%%FONTSDIR%%/fonts.dir +fi Added: head/games/xjewel/files/pkg-install.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/xjewel/files/pkg-install.in Thu Aug 28 03:18:32 2014 (r366372) @@ -0,0 +1,12 @@ +#!/bin/sh + +if [ "x$2" = "xPOST-INSTALL" ]; then + cd ${PKG_PREFIX}/%%FONTSDIR%%; ${PKG_PREFIX}/bin/mkfontdir + ${PKG_PREFIX}/bin/xset fp rehash || + ( + echo "**********************************************************" + echo "You should restart X server or do 'xset fp rehash' command" + echo "to enable this update." + echo "**********************************************************" + ) +fi Modified: head/games/xjewel/pkg-plist ============================================================================== --- head/games/xjewel/pkg-plist Thu Aug 28 03:14:24 2014 (r366371) +++ head/games/xjewel/pkg-plist Thu Aug 28 03:18:32 2014 (r366372) @@ -1,7 +1,5 @@ bin/xjewel +man/man6/xjewel.6.gz lib/X11/xjewel/xjewel.scores %%FONTSDIR%%/seven_seg.pcf.gz -@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir -@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir -@unexec if [ `wc -c %D/%%FONTSDIR%%/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/%%FONTSDIR%%/fonts.dir; fi @dirrm lib/X11/xjewel
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408280318.s7S3IWVh061577>