diff options
| author | gabor <gabor@FreeBSD.org> | 2012-03-19 07:48:38 +0800 |
|---|---|---|
| committer | gabor <gabor@FreeBSD.org> | 2012-03-19 07:48:38 +0800 |
| commit | 6e4321a7c40c9327b060aef9b2cb07c82cc6b83c (patch) | |
| tree | 6efbb79264a6cb2a0dbca85b1ac839c0a80365db /textproc | |
| parent | 5f1999958a4dc16ced3df6174852d44ed5cc283d (diff) | |
| download | freebsd-ports-gnome-6e4321a7c40c9327b060aef9b2cb07c82cc6b83c.tar.gz freebsd-ports-gnome-6e4321a7c40c9327b060aef9b2cb07c82cc6b83c.tar.zst freebsd-ports-gnome-6e4321a7c40c9327b060aef9b2cb07c82cc6b83c.zip | |
- Update to 20120318, which contains bugfixes and minor performance
improvements [1]
- Add OPTIONS with NLS and OVERWRITE_BASE [2]
- Fix plist [3]
Submitted by: Oleg Moskalenko <oleg.moskalenko@citrix.com> [1]
Requested by: Mark Felder <feld@feld.me> [2] (via current@)
Reported by: erwinmail and pavmail [3]
Feature safe: yes
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/bsdsort/Makefile | 33 | ||||
| -rw-r--r-- | textproc/bsdsort/distinfo | 4 | ||||
| -rw-r--r-- | textproc/bsdsort/pkg-plist | 7 |
3 files changed, 37 insertions, 7 deletions
diff --git a/textproc/bsdsort/Makefile b/textproc/bsdsort/Makefile index 78178cbca860..5daaeb24964a 100644 --- a/textproc/bsdsort/Makefile +++ b/textproc/bsdsort/Makefile @@ -6,7 +6,7 @@ # PORTNAME= sort -PORTVERSION= 20120313 +PORTVERSION= 20120318 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= gabor @@ -23,10 +23,37 @@ MAN1= sort.1 MAKE_ENV+= BINDIR="${PREFIX}/bin" \ MANDIR="${MANPREFIX}/man/man" \ - CATDIR="${MANPREFIX}/man/man" + CATDIR="${MANPREFIX}/man/man" \ + NLSDIR="${PREFIX}/share/nls" + +OPTIONS= NLS "Compile with NLS support" on \ + OVERWRITE_BASE "Replaces base GNU sort" off + +.include <bsd.port.pre.mk> + +.if defined(WITHOUT_NLS) +MAKE_ENV+= WITHOUT_NLS=yes +PLIST_SUB+= NLS="@comment " +.else +PLIST_SUB+= NLS="" +.endif + +.if defined(WITH_OVERWRITE_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(${PREFIX}/bin/sort) +pre-install: + ${INSTALL_PROGRAM} ${PREFIX}/bin/sort ${PREFIX}/bin/gnusort +.endif post-install: ${LN} -s ${PREFIX}/bin/sort ${PREFIX}/bin/bsdsort +.if !defined(WITH_OVERWRITE_BASE) ${LN} -s /usr/bin/sort ${PREFIX}/bin/gnusort +.endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/textproc/bsdsort/distinfo b/textproc/bsdsort/distinfo index 30e4c106ec5e..69ddf8a357ad 100644 --- a/textproc/bsdsort/distinfo +++ b/textproc/bsdsort/distinfo @@ -1,2 +1,2 @@ -SHA256 (sort-20120313.tar.gz) = e36b47ca7fa593ae013c1fa487d0bd9fbb60a77c10fb90bb20202569cbc1f323 -SIZE (sort-20120313.tar.gz) = 44462 +SHA256 (sort-20120318.tar.gz) = 441a00a392939c66be62b4c4c343672aef742f1abeebe49f0c312366227b6e8d +SIZE (sort-20120318.tar.gz) = 49397 diff --git a/textproc/bsdsort/pkg-plist b/textproc/bsdsort/pkg-plist index cb4db61de69e..c6401269e07d 100644 --- a/textproc/bsdsort/pkg-plist +++ b/textproc/bsdsort/pkg-plist @@ -1,5 +1,8 @@ @exec /bin/ln -s %%PREFIX%%/bin/sort %%PREFIX%%/bin/bsdsort -@exec /bin/ln -s /usr/bin/sort %%PREFIX%%/bin/gnusort +%%NO_OVERWRITE_BASE%%@exec /bin/ln -s /usr/bin/sort %%PREFIX%%/bin/gnusort +%%OVERWRITE_BASE%%@exec /bin/mv %%PREFIX%%/bin/sort %%PREFIX%%/bin/gnusort || true +%%OVERWRITE_BASE%%@unexec /bin/cp %%PREFIX%%/bin/gnusort %%PREFIX%%/bin/sort || true bin/bsdsort bin/gnusort -bin/sort +%%NO_OVERWRITE_BASE%%bin/sort +%%NLS%%share/nls/hu_HU.ISO8859-2/sort.cat |