Date: Thu, 24 Jul 2014 17:10:57 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362833 - head/Keywords Message-ID: <201407241710.s6OHAvBo050382@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Thu Jul 24 17:10:57 2014 New Revision: 362833 URL: http://svnweb.freebsd.org/changeset/ports/362833 QAT: https://qat.redports.org/buildarchive/r362833/ Log: Convert keywords in pure ucl format yaml version will be removed later Added: head/Keywords/fc.ucl - copied, changed from r362655, head/Keywords/fc.yaml head/Keywords/fcfontsdir.ucl - copied, changed from r362655, head/Keywords/fcfontsdir.yaml head/Keywords/fmtutil.ucl - copied, changed from r362655, head/Keywords/fmtutil.yaml head/Keywords/fontsdir.ucl - copied, changed from r362655, head/Keywords/fontsdir.yaml head/Keywords/info.ucl - copied, changed from r362655, head/Keywords/info.yaml head/Keywords/sample.ucl - copied, changed from r362655, head/Keywords/sample.yaml head/Keywords/shell.ucl - copied, changed from r362655, head/Keywords/shell.yaml Copied and modified: head/Keywords/fc.ucl (from r362655, head/Keywords/fc.yaml) ============================================================================== --- head/Keywords/fc.yaml Wed Jul 23 10:21:18 2014 (r362655, copy source) +++ head/Keywords/fc.ucl Thu Jul 24 17:10:57 2014 (r362833) @@ -3,7 +3,9 @@ # MAINTAINER: x11@FreeBSD.org actions: [dirrmtry] -post-install: | +post-install: <<EOD fc-cache -s %D/%@ 2>/dev/null || true -post-deinstall: | +EOD +post-deinstall: <<EOD fc-cache -s %D/%@ 2>/dev/null || true +EOD Copied and modified: head/Keywords/fcfontsdir.ucl (from r362655, head/Keywords/fcfontsdir.yaml) ============================================================================== --- head/Keywords/fcfontsdir.yaml Wed Jul 23 10:21:18 2014 (r362655, copy source) +++ head/Keywords/fcfontsdir.ucl Thu Jul 24 17:10:57 2014 (r362833) @@ -3,11 +3,12 @@ # MAINTAINER: x11@FreeBSD.org actions: [dirrmtry] -post-install: | +post-install: <<EOD fc-cache -s %D/%@ 2>/dev/null || true mkfontscale %D/%@ 2>/dev/null || true mkfontdir %D/%@ 2>/dev/null || true -post-deinstall: | +EOD +post-deinstall: <<EOD fc-cache -s %D/%@ 2>/dev/null || true mkfontscale %D/%@ 2>/dev/null || true if [ -e %D/%@/fonts.scale -a "`stat -f '%%z' %D/%@/fonts.scale 2>/dev/null`" = '2' ]; then @@ -17,3 +18,4 @@ post-deinstall: | if [ -e %D/%@/fonts.dir -a "`stat -f '%%z' %D/%@/fonts.dir 2>/dev/null`" = '2' ]; then rm %D/%@/fonts.dir fi +EOD Copied and modified: head/Keywords/fmtutil.ucl (from r362655, head/Keywords/fmtutil.yaml) ============================================================================== --- head/Keywords/fmtutil.yaml Wed Jul 23 10:21:18 2014 (r362655, copy source) +++ head/Keywords/fmtutil.ucl Thu Jul 24 17:10:57 2014 (r362833) @@ -3,11 +3,13 @@ # MAINTAINER: portmgr@FreeBSD.org actions: [] -post-install: | +post-install: <<EOD fmtutil-sys --missing >/dev/null -post-deinstall: | +EOD +post-deinstall: <<EOD set -- %@ for f in $@; do rm -f $f rmdir -p ${f%/*} 2>/dev/null done +EOD Copied and modified: head/Keywords/fontsdir.ucl (from r362655, head/Keywords/fontsdir.yaml) ============================================================================== --- head/Keywords/fontsdir.yaml Wed Jul 23 10:21:18 2014 (r362655, copy source) +++ head/Keywords/fontsdir.ucl Thu Jul 24 17:10:57 2014 (r362833) @@ -3,10 +3,11 @@ # MAINTAINER: x11@FreeBSD.org actions: [dirrmtry] -post-install: | +post-install: <<EOD mkfontscale %D/%@ 2>/dev/null || true mkfontdir %D/%@ 2>/dev/null || true -post-deinstall: | +EOD +post-deinstall: <<EOD mkfontscale %D/%@ 2>/dev/null || true if [ -e %D/%@/fonts.scale -a "`stat -f '%%z' %D/%@/fonts.scale 2>/dev/null`" = '2' ]; then rm %D/%@/fonts.scale @@ -15,3 +16,4 @@ post-deinstall: | if [ -e %D/%@/fonts.dir -a "`stat -f '%%z' %D/%@/fonts.dir 2>/dev/null`" = '2' ]; then rm %D/%@/fonts.dir fi +EOD Copied and modified: head/Keywords/info.ucl (from r362655, head/Keywords/info.yaml) ============================================================================== --- head/Keywords/info.yaml Wed Jul 23 10:21:18 2014 (r362655, copy source) +++ head/Keywords/info.ucl Thu Jul 24 17:10:57 2014 (r362833) @@ -3,9 +3,11 @@ # MAINTAINER: portmgr@FreeBSD.org actions: [file] -post-install: | +post-install: <<EOD file=%D/%@ indexinfo ${file%/*} -post-deinstall: | +EOD +post-deinstall: <<EOD file=%D/%@ indexinfo ${file%/*} +EOD Copied and modified: head/Keywords/sample.ucl (from r362655, head/Keywords/sample.yaml) ============================================================================== --- head/Keywords/sample.yaml Wed Jul 23 10:21:18 2014 (r362655, copy source) +++ head/Keywords/sample.ucl Thu Jul 24 17:10:57 2014 (r362833) @@ -15,15 +15,17 @@ # @exec [ -f %B/pkgtools.conf ] || cp %B/%f %B/pkgtools.conf actions: [file] -post-install: | +post-install: <<EOD sample_file="%D/%@" target_file="${sample_file%.sample}" if ! [ -f "${target_file}" ]; then /bin/cp -p "${sample_file}" "${target_file}" fi -pre-deinstall: | +EOD +pre-deinstall: <<EOD sample_file="%D/%@" target_file="${sample_file%.sample}" if cmp -s "${target_file}" "${sample_file}"; then rm -f "${target_file}" fi +EOD Copied and modified: head/Keywords/shell.ucl (from r362655, head/Keywords/shell.yaml) ============================================================================== --- head/Keywords/shell.yaml Wed Jul 23 10:21:18 2014 (r362655, copy source) +++ head/Keywords/shell.ucl Thu Jul 24 17:10:57 2014 (r362833) @@ -12,11 +12,13 @@ # @unexec echo "Updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak actions: [file] -post-install: | +post-install: <<EOD cp /etc/shells /etc/shells.bak (grep -v %D/%@ /etc/shells.bak; echo %D/%@) > /etc/shells rm -f /etc/shells.bak -pre-deinstall: | +EOD +pre-deinstall: <<EOD cp /etc/shells /etc/shells.bak grep -v %D/%@ /etc/shells.bak > /etc/shells rm -f /etc/shells.bak +EOD
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407241710.s6OHAvBo050382>