mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-24 04:33:24 +00:00
Code Issues Releases Activity

- Blacklist ruby-bdb with Ruby 2.1 [1]

Browse Source 
- 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]
This commit is contained in:
Bryan Drewery 2014-05-25 16:24:26 +00:00
parent bf30f17d18
commit d66d215cad
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=355252
4 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ports-mgmt/portupgrade-devel/Makefile
View File

@ -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

5
ports-mgmt/portupgrade-devel/pkg-plist
View File

@ -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

11
ports-mgmt/portupgrade/Makefile
View File

@ -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

5
ports-mgmt/portupgrade/pkg-plist
View File

@ -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