diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2014-05-25 16:24:26 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2014-05-25 16:24:26 +0000 |
| commit | 79db3dc62662feaf71538cdca5f0e1ad070cd46d (patch) | |
| tree | 209ef3844c73fdc6b493ab8541ab88da0bb1759b | |
| parent | 0dc3104a5b3fcd41d4477f86bb952b93e1419af6 (diff) | |
| download | FreeBSD-ports-79db3dc62662feaf71538cdca5f0e1ad070cd46d.zip FreeBSD-ports-79db3dc62662feaf71538cdca5f0e1ad070cd46d.tar.gz | |
- Blacklist ruby-bdb with Ruby 2.1 [1]
- Stop installing script(1) wrapper [2]
- Fix ZSH dir leftover (somewhat a false-positive) [3]
PR: ports/188084 [1]
Submitted by: Christoph Moench-Tegeder <cmt@burggraben.net> [1]
Submitted by: sunpoet [2]
Reported by: swills [3]
| -rw-r--r-- | ports-mgmt/portupgrade-devel/Makefile | 11 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade-devel/pkg-plist | 5 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade/Makefile | 11 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade/pkg-plist | 5 |
4 files changed, 6 insertions, 26 deletions
diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile index 8868b0a..baeaa2f 100644 --- a/ports-mgmt/portupgrade-devel/Makefile +++ b/ports-mgmt/portupgrade-devel/Makefile @@ -3,6 +3,7 @@ PORTNAME= portupgrade PORTVERSION= 20140524 +PORTREVISION= 1 PORTEPOCH= 3 CATEGORIES= ports-mgmt MASTER_SITES= GH \ @@ -40,18 +41,10 @@ INSTALL_TARGET+= install-doc .endif # Reported that ruby-bdb is BROKEN with 2.0 -.if ${RUBY_VER} != 2.0 +.if ${RUBY_VER} != 2.0 && ${RUBY_VER} != 2.1 RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/bdb.so:${PORTSDIR}/databases/ruby-bdb .endif -# Need to install working script(1) -.if ${OSVERSION} < 801000 -PLIST_SUB+= SCRIPT="" -MAKE_ENV+= NEED_COMPAT_SCRIPT=yes -.else -PLIST_SUB+= SCRIPT="@comment " -.endif - regression-test: patch cd ${WRKSRC} && ${MAKE} test diff --git a/ports-mgmt/portupgrade-devel/pkg-plist b/ports-mgmt/portupgrade-devel/pkg-plist index ff409a6..f5bc902 100644 --- a/ports-mgmt/portupgrade-devel/pkg-plist +++ b/ports-mgmt/portupgrade-devel/pkg-plist @@ -47,15 +47,12 @@ sbin/portversion %%RUBY_SITELIBDIR%%/pkgtools/revision.rb %%RUBY_SITELIBDIR%%/pkgtools.rb @dirrm %%RUBY_SITELIBDIR%%/pkgtools -%%SCRIPT%%@exec mkdir -p %D/libexec/pkgtools 2> /dev/null -%%SCRIPT%%libexec/pkgtools/script -%%SCRIPT%%@dirrm libexec/pkgtools @unexec if cmp -s %D/etc/pkgtools.conf %D/etc/pkgtools.conf.sample; then rm -f %D/etc/pkgtools.conf; fi etc/pkgtools.conf.sample @exec [ -f %B/pkgtools.conf ] || cp %B/%f %B/pkgtools.conf etc/pkgtools.status-pkg.sh share/zsh/site-functions/_pkgtools -@unexec [ -f %D/bin/zsh ] || rmdir %D/share/zsh/site-functions 2>/dev/null || true +@dirrmtry share/zsh/site-functions @dirrmtry share/zsh %%EXAMPLESDIR%%/bash/complete.sample %%EXAMPLESDIR%%/tcsh/complete.sample diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile index db111f3..24eb9f3 100644 --- a/ports-mgmt/portupgrade/Makefile +++ b/ports-mgmt/portupgrade/Makefile @@ -3,6 +3,7 @@ PORTNAME= portupgrade PORTVERSION= 2.4.12 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= ports-mgmt MASTER_SITES= SF/portupgrade/pkgtools/dist/ \ @@ -39,19 +40,11 @@ INSTALL_TARGET+= install-doc .endif # Reported that ruby-bdb is BROKEN with 2.0 -.if ${RUBY_VER} != 2.0 +.if ${RUBY_VER} != 2.0 && ${RUBY_VER} != 2.1 # For PKG_DBDRIVER={bdb_btree,bdb_hash} RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/bdb.so:${PORTSDIR}/databases/ruby-bdb .endif -# Need to install working script(1) -.if ${OSVERSION} < 801000 -PLIST_SUB+= SCRIPT="" -MAKE_ENV+= NEED_COMPAT_SCRIPT=yes -.else -PLIST_SUB+= SCRIPT="@comment " -.endif - post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/compat/pkg diff --git a/ports-mgmt/portupgrade/pkg-plist b/ports-mgmt/portupgrade/pkg-plist index b27b624..1e14136 100644 --- a/ports-mgmt/portupgrade/pkg-plist +++ b/ports-mgmt/portupgrade/pkg-plist @@ -47,13 +47,10 @@ sbin/portversion %%RUBY_SITELIBDIR%%/pkgtools/revision.rb %%RUBY_SITELIBDIR%%/pkgtools.rb @dirrm %%RUBY_SITELIBDIR%%/pkgtools -%%SCRIPT%%@exec mkdir -p %D/libexec/pkgtools 2> /dev/null -%%SCRIPT%%libexec/pkgtools/script -%%SCRIPT%%@dirrm libexec/pkgtools @sample etc/pkgtools.conf.sample etc/pkgtools.status-pkg.sh share/zsh/site-functions/_pkgtools -@unexec [ -f %D/bin/zsh ] || rmdir %D/share/zsh/site-functions 2>/dev/null || true +@dirrmtry share/zsh/site-functions @dirrmtry share/zsh %%EXAMPLESDIR%%/bash/complete.sample %%EXAMPLESDIR%%/tcsh/complete.sample |
