Date: Sat, 22 Nov 2014 19:24:06 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r373093 - head/textproc/bsdsort Message-ID: <201411221924.sAMJO637049478@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Sat Nov 22 19:24:06 2014 New Revision: 373093 URL: https://svnweb.freebsd.org/changeset/ports/373093 QAT: https://qat.redports.org/buildarchive/r373093/ Log: textproc/bsdsort: Fix install error, remove OVERWRITE_BASE option This port was using pkg-plist tricks to install install symlinks in a post-install phase. These were now needed due to how pkg works. However, between the complication added by overwriting base and the general trend to frown on such days, I just removed the option entirely. I also moved the now much shorter plist into the Makefile. PR: 194814 Submitted by: lidl (pix.net) Fixed by: marino Deleted: head/textproc/bsdsort/pkg-plist Modified: head/textproc/bsdsort/Makefile Modified: head/textproc/bsdsort/Makefile ============================================================================== --- head/textproc/bsdsort/Makefile Sat Nov 22 19:16:42 2014 (r373092) +++ head/textproc/bsdsort/Makefile Sat Nov 22 19:24:06 2014 (r373093) @@ -24,24 +24,21 @@ USES= uidfix CFLAGS+= -std=c99 -OPTIONS_DEFINE= THREADS NLS OVERWRITE_BASE -OVERWRITE_BASE_DESC= Replace base GNU sort +PLIST_FILES= bin/sort \ + bin/bsdsort \ + bin/gnusort \ + man/man1/sort.1.gz + +OPTIONS_DEFINE= THREADS NLS OPTIONS_DEFAULT= THREADS NLS OPTIONS_SUB= yes NLS_MAKE_ENV_OFF= WITHOUT_NLS=yes +NLS_PLIST_FILES= share/nls/hu_HU.ISO8859-2/sort.cat THREADS_MAKE_ENV= WITH_THREADS=yes -.include <bsd.port.pre.mk> - -.if ${PORT_OPTIONS:MOVERWRITE_BASE} -PREFIX= /usr -.endif - post-install: - ${LN} -s ${PREFIX}/bin/sort ${STAGEDIR}${PREFIX}/bin/bsdsort -.if empty(OVERWRITE_BASE) + (cd ${STAGEDIR}${PREFIX}/bin && ${LN} -s sort bsdsort) ${LN} -s /usr/bin/sort ${STAGEDIR}${PREFIX}/bin/gnusort -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411221924.sAMJO637049478>