Date: Fri, 15 Aug 2014 16:17:20 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r364990 - in head/textproc/bsdsort: . files Message-ID: <201408151617.s7FGHKoh048282@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Fri Aug 15 16:17:20 2014 New Revision: 364990 URL: http://svnweb.freebsd.org/changeset/ports/364990 QAT: https://qat.redports.org/buildarchive/r364990/ Log: - Fix build with -current's clang by fixing header typo - Use OPTIONS helpers - Remove pre-install target that checked whether a file exists in ${STAGEDIR}${PREFIX} (it doesn't) Added: head/textproc/bsdsort/files/patch-vsort.h (contents, props changed) Modified: head/textproc/bsdsort/Makefile Modified: head/textproc/bsdsort/Makefile ============================================================================== --- head/textproc/bsdsort/Makefile Fri Aug 15 16:00:28 2014 (r364989) +++ head/textproc/bsdsort/Makefile Fri Aug 15 16:17:20 2014 (r364990) @@ -24,37 +24,22 @@ MAKE_ENV+= BINDIR="${PREFIX}/bin" \ CFLAGS+= -std=c99 OPTIONS_DEFINE= THREADS NLS OVERWRITE_BASE -OVERWRITE_BASE_DESC= Replaces base GNU sort +OVERWRITE_BASE_DESC= Replace base GNU sort OPTIONS_DEFAULT= THREADS NLS +OPTIONS_SUB= yes -.include <bsd.port.pre.mk> - -.if ${PORT_OPTIONS:MNLS} -PLIST_SUB+= NLS="" -.else -MAKE_ENV+= WITHOUT_NLS=yes -PLIST_SUB+= NLS="@comment " -.endif +NLS_MAKE_ENV_OFF= WITHOUT_NLS=yes +THREADS_MAKE_ENV= WITH_THREADS=yes -.if ${PORT_OPTIONS:MTHREADS} -MAKE_ENV+= WITH_THREADS=yes -.endif +.include <bsd.port.pre.mk> .if ${PORT_OPTIONS:MOVERWRITE_BASE} PREFIX= /usr -PLIST_SUB+= OVERWRITE_BASE="" NO_OVERWRITE_BASE="@comment " -.else -PLIST_SUB+= OVERWRITE_BASE="@comment " NO_OVERWRITE_BASE="" -.endif - -.if defined(WITH_OVERWRITE_BASE) && exists(${STAGEDIR}${PREFIX}/bin/sort) -pre-install: - ${INSTALL_PROGRAM} ${STAGEDIR}${PREFIX}/bin/sort ${STAGEDIR}${PREFIX}/bin/gnusort .endif post-install: ${LN} -s ${PREFIX}/bin/sort ${STAGEDIR}${PREFIX}/bin/bsdsort -.if !defined(WITH_OVERWRITE_BASE) +.if empty(OVERWRITE_BASE) ${LN} -s /usr/bin/sort ${STAGEDIR}${PREFIX}/bin/gnusort .endif Added: head/textproc/bsdsort/files/patch-vsort.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/bsdsort/files/patch-vsort.h Fri Aug 15 16:17:20 2014 (r364990) @@ -0,0 +1,11 @@ +--- vsort.h.orig 2014-08-15 12:06:55.000000000 -0400 ++++ vsort.h 2014-08-15 12:07:03.000000000 -0400 +@@ -28,7 +28,7 @@ + */ + + #if !defined(__VSORT_H__) +-#define _VSORT_H__ ++#define __VSORT_H__ + + #include "bwstring.h" +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408151617.s7FGHKoh048282>