From owner-svn-ports-all@FreeBSD.ORG Sat Nov 22 19:24:06 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D71BE35A; Sat, 22 Nov 2014 19:24:06 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C37B29B0; Sat, 22 Nov 2014 19:24:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAMJO63x049479; Sat, 22 Nov 2014 19:24:06 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAMJO637049478; Sat, 22 Nov 2014 19:24:06 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201411221924.sAMJO637049478@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Sat, 22 Nov 2014 19:24:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r373093 - head/textproc/bsdsort X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Nov 2014 19:24:07 -0000 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 - -.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 +.include