diff options
| author | sem <sem@FreeBSD.org> | 2007-02-03 00:18:49 +0800 |
|---|---|---|
| committer | sem <sem@FreeBSD.org> | 2007-02-03 00:18:49 +0800 |
| commit | 0b432d82bc45650b84dc17e00bff8b064f0a3021 (patch) | |
| tree | 32dc512c8e4d86ccda5554724a092bf960b3d969 /ports-mgmt/portupgrade-devel | |
| parent | 8697e2ebb8948b1ba9026a3fc8dcac9d444a8edb (diff) | |
| download | freebsd-ports-graphics-0b432d82bc45650b84dc17e00bff8b064f0a3021.tar.gz freebsd-ports-graphics-0b432d82bc45650b84dc17e00bff8b064f0a3021.tar.zst freebsd-ports-graphics-0b432d82bc45650b84dc17e00bff8b064f0a3021.zip | |
- Synchronyze patches with stable.
Reminded by: marck
Diffstat (limited to 'ports-mgmt/portupgrade-devel')
| -rw-r--r-- | ports-mgmt/portupgrade-devel/Makefile | 2 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade-devel/files/patch-portsdb.rb | 13 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade-devel/files/patch-portupgrade | 11 |
3 files changed, 26 insertions, 0 deletions
diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile index 1c374b6bf9f..6e9545f2361 100644 --- a/ports-mgmt/portupgrade-devel/Makefile +++ b/ports-mgmt/portupgrade-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= portupgrade-devel PORTVERSION= 2.2.2 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= portupgrade @@ -24,6 +25,7 @@ USE_BZIP2= yes USE_RUBY= yes USE_RUBY_FEATURES= optparse ruby18 USE_PERL5_RUN= yes + USE_LDCONFIG= ${PREFIX}/lib/compat/pkg LDCONFIG_DIRS= %%PREFIX%%/lib/compat/pkg diff --git a/ports-mgmt/portupgrade-devel/files/patch-portsdb.rb b/ports-mgmt/portupgrade-devel/files/patch-portsdb.rb new file mode 100644 index 00000000000..be6065d0931 --- /dev/null +++ b/ports-mgmt/portupgrade-devel/files/patch-portsdb.rb @@ -0,0 +1,13 @@ +--- lib/portsdb.rb.orig Thu Feb 1 10:15:59 2007 ++++ lib/portsdb.rb Thu Feb 1 10:17:25 2007 +@@ -387,8 +387,8 @@ + end + + def subdirs(dir) +- %x"fgrep -v bsd.port.subdir.mk #{dir}/Makefile | +- make -f - -V SUBDIR 2> /dev/null".split.select { |i| ++ %x"fgrep SUBDIR #{dir}/Makefile | sed -e 's/SUBDIR +=//' ++ 2> /dev/null".split.select { |i| + File.directory?(File.join(dir, i)) + }.sort + end diff --git a/ports-mgmt/portupgrade-devel/files/patch-portupgrade b/ports-mgmt/portupgrade-devel/files/patch-portupgrade new file mode 100644 index 00000000000..53c9037ebbf --- /dev/null +++ b/ports-mgmt/portupgrade-devel/files/patch-portupgrade @@ -0,0 +1,11 @@ +--- bin/portupgrade.orig Thu Feb 1 15:42:15 2007 ++++ bin/portupgrade Thu Feb 1 15:42:22 2007 +@@ -1594,7 +1594,7 @@ + end + + if $sudo && Process.euid != 0 +- dep_cmdargs = cmdargs.dup << 'fetch-depends' << 'build-depends' << 'lib-depends' << 'misc-depends' ++ dep_cmdargs = cmdargs.dup << 'fetch-depends' << 'build-depends' << 'lib-depends' + + if not system(shelljoin(*dep_cmdargs) + ' DEPENDS_TARGET="-n nonexistent_target" >/dev/null 2>&1') + script!(logfile, *dep_cmdargs) or |