Date: Tue, 26 May 2015 04:33:09 +0000 (UTC) From: David Naylor <dbn@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r387457 - head/emulators/i386-wine-devel Message-ID: <201505260433.t4Q4X9hA089192@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dbn Date: Tue May 26 04:33:08 2015 New Revision: 387457 URL: https://svnweb.freebsd.org/changeset/ports/387457 Log: emulators/i386-wine-devel: fix COMPHOLIO->STAGING rename issue Changes: a) Rename plist substitution for STAGING [1]. b) Rename extracted files for staging. Impact: a) Unbreak packaging for i386-wine-devel b) Unbreak extraction for i386-wine-staging PR: 200443 [1] Modified: head/emulators/i386-wine-devel/Makefile.inc Modified: head/emulators/i386-wine-devel/Makefile.inc ============================================================================== --- head/emulators/i386-wine-devel/Makefile.inc Tue May 26 02:26:46 2015 (r387456) +++ head/emulators/i386-wine-devel/Makefile.inc Tue May 26 04:33:08 2015 (r387457) @@ -29,7 +29,8 @@ CONFLICTS_INSTALL?= wine-[0-9]* wine EXTRACT_AFTER_ARGS= -C / --exclude +COMPACT_MANIFEST --exclude +MANIFEST \ --exclude +MTREE_DIRS --exclude share/licenses/'*' \ --exclude libdata/ldconfig32/${UNIQUENAME} \ - -s '|/usr/local|${STAGEDIR}${PREFIX}|gs' + -s '|/usr/local|${STAGEDIR}${PREFIX}|gs' \ + -s '|compholio|staging|gs' NO_BUILD= yes ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= wine only runs on x86 architecture @@ -60,15 +61,15 @@ BROKEN= Temporary fix for compholio->st PLIST_SUB+= OSREL${osrel}="" .if ${PKGNAMESUFFIX} == -devel PLIST_SUB+= OSREL${osrel}-DEVEL="" -PLIST_SUB+= OSREL${osrel}-COMPHOLIO="@comment " +PLIST_SUB+= OSREL${osrel}-STAGING="@comment " .else PLIST_SUB+= OSREL${osrel}-DEVEL="@comment " -PLIST_SUB+= OSREL${osrel}-COMPHOLIO="" +PLIST_SUB+= OSREL${osrel}-STAGING="" .endif .else PLIST_SUB+= OSREL${osrel}="@comment " PLIST_SUB+= OSREL${osrel}-DEVEL="@comment " -PLIST_SUB+= OSREL${osrel}-COMPHOLIO="@comment " +PLIST_SUB+= OSREL${osrel}-STAGING="@comment " .endif .endfor @@ -80,7 +81,7 @@ DISTFILES= do-extract: @${RM} -rf ${WRKDIR} @${MKDIR} ${WRKDIR} - ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${EXTRACT_ONLY} -C ${WRKDIR} --include '/usr/local/share/licenses/${PKGNAME}/LICENSE' -s '|/usr/local/share/licenses/${PKGNAME}/||g' + ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${EXTRACT_ONLY} -C ${WRKDIR} --include '/usr/local/share/licenses/${DISTNAME}/LICENSE' -s '|/usr/local/share/licenses/${DISTNAME}/||g' -s '|compholio|staging|gs' do-install: ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${EXTRACT_ONLY} ${EXTRACT_AFTER_ARGS}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505260433.t4Q4X9hA089192>