Date: Mon, 4 Aug 2014 09:19:38 +0000 (UTC) From: Yen-Ming Lee <leeym@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363981 - head/textproc/bsdsort Message-ID: <53df502b.58cc.4752cfe0@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: leeym Date: Mon Aug 4 09:19:38 2014 New Revision: 363981 URL: http://svnweb.freebsd.org/changeset/ports/363981 QAT: https://qat.redports.org/buildarchive/r363981/ Log: - support stage Modified: head/textproc/bsdsort/Makefile head/textproc/bsdsort/pkg-plist Modified: head/textproc/bsdsort/Makefile ============================================================================== --- head/textproc/bsdsort/Makefile Mon Aug 4 09:18:27 2014 (r363980) +++ head/textproc/bsdsort/Makefile Mon Aug 4 09:19:38 2014 (r363981) @@ -14,8 +14,6 @@ COMMENT= BSD-licensed version of sort LICENSE= BSD WRKSRC= ${WRKDIR}/${PORTNAME} -MANCOMPRESSED= yes -MAN1= sort.1 MAKE_ENV+= BINDIR="${PREFIX}/bin" \ MANDIR="${MANPREFIX}/man/man" \ @@ -29,7 +27,6 @@ OPTIONS_DEFINE= THREADS NLS OVERWRITE_B OVERWRITE_BASE_DESC= Replaces base GNU sort OPTIONS_DEFAULT= THREADS NLS -NO_STAGE= yes .include <bsd.port.pre.mk> .if ${PORT_OPTIONS:MNLS} @@ -50,15 +47,15 @@ PLIST_SUB+= OVERWRITE_BASE="" NO_OVERWRI PLIST_SUB+= OVERWRITE_BASE="@comment " NO_OVERWRITE_BASE="" .endif -.if defined(WITH_OVERWRITE_BASE) && exists(${PREFIX}/bin/sort) +.if defined(WITH_OVERWRITE_BASE) && exists(${STAGEDIR}${PREFIX}/bin/sort) pre-install: - ${INSTALL_PROGRAM} ${PREFIX}/bin/sort ${PREFIX}/bin/gnusort + ${INSTALL_PROGRAM} ${STAGEDIR}${PREFIX}/bin/sort ${STAGEDIR}${PREFIX}/bin/gnusort .endif post-install: - ${LN} -s ${PREFIX}/bin/sort ${PREFIX}/bin/bsdsort + ${LN} -s ${PREFIX}/bin/sort ${STAGEDIR}${PREFIX}/bin/bsdsort .if !defined(WITH_OVERWRITE_BASE) - ${LN} -s /usr/bin/sort ${PREFIX}/bin/gnusort + ${LN} -s /usr/bin/sort ${STAGEDIR}${PREFIX}/bin/gnusort .endif .include <bsd.port.post.mk> Modified: head/textproc/bsdsort/pkg-plist ============================================================================== --- head/textproc/bsdsort/pkg-plist Mon Aug 4 09:18:27 2014 (r363980) +++ head/textproc/bsdsort/pkg-plist Mon Aug 4 09:19:38 2014 (r363981) @@ -4,5 +4,6 @@ %%OVERWRITE_BASE%%@unexec /bin/cp %%PREFIX%%/bin/gnusort %%PREFIX%%/bin/sort || true bin/bsdsort bin/gnusort +man/man1/sort.1.gz %%NO_OVERWRITE_BASE%%bin/sort %%NLS%%share/nls/hu_HU.ISO8859-2/sort.cat
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?53df502b.58cc.4752cfe0>