From af9e7689c66234a1102b98d104c5899f8e17917e Mon Sep 17 00:00:00 2001 From: John Marino Date: Sat, 22 Nov 2014 19:24:06 +0000 Subject: 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 --- textproc/bsdsort/Makefile | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to 'textproc/bsdsort/Makefile') diff --git a/textproc/bsdsort/Makefile b/textproc/bsdsort/Makefile index f2a8538d5324..7fbb274a503f 100644 --- a/textproc/bsdsort/Makefile +++ b/textproc/bsdsort/Makefile @@ -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 -- cgit v1.2.3