aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYen-Ming Lee <leeym@FreeBSD.org>2014-08-04 09:19:38 +0000
committerYen-Ming Lee <leeym@FreeBSD.org>2014-08-04 09:19:38 +0000
commit73e54859265ce167a792117865eb246d2df2e8df (patch)
treeccfbf6d8be3b1268ef6ca627a3fc12575271e68c
parentb8129d8b0f3f707b296bee42a8a01b21c4c860d0 (diff)
downloadports-73e54859265ce167a792117865eb246d2df2e8df.tar.gz
ports-73e54859265ce167a792117865eb246d2df2e8df.zip
Notes
-rw-r--r--textproc/bsdsort/Makefile11
-rw-r--r--textproc/bsdsort/pkg-plist1
2 files changed, 5 insertions, 7 deletions
diff --git a/textproc/bsdsort/Makefile b/textproc/bsdsort/Makefile
index 2f4aee8e5838..3ef720e11b23 100644
--- a/textproc/bsdsort/Makefile
+++ b/textproc/bsdsort/Makefile
@@ -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_BASE
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_OVERWRITE_BASE="@comment "
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>
diff --git a/textproc/bsdsort/pkg-plist b/textproc/bsdsort/pkg-plist
index c6401269e07d..e57595067d52 100644
--- a/textproc/bsdsort/pkg-plist
+++ b/textproc/bsdsort/pkg-plist
@@ -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