Mass-merge of destroot target changes. Before committing this, I also

laid down a PRE_DESTROOT_TARGET so we can easily compare the before and
after photos (or, in extremis, revert this change).  I doubt that will be
necessary, however, since things appear to be working quite well with this
change and it's better to do it sooner rather than later since it changes the
rules about what commands/variables to use in new ports.

Approved by:    fkr

git-svn-id: https://svn.macports.org/repository/macports/trunk/dports@3173 d073be05-634f-4543-b044-5fe20cf6d1d6
This commit is contained in:
Jordan K. Hubbard
2003-08-05 09:29:45 +00:00
parent 868098ed8e
commit e60c20764c
244 changed files with 603 additions and 611 deletions
+2 -2
View File
@@ -1,4 +1,4 @@
# $Id: Portfile,v 1.3 2003/07/18 18:49:13 fkr Exp $
# $Id: Portfile,v 1.4 2003/08/05 09:28:57 jkh Exp $
PortSystem 1.0
name sharutils
@@ -13,4 +13,4 @@ homepage http://www.gnu.org/software/sharutils/sharutils.html
checksums md5 b8ba1d409f07edcb335ff72a27bd9828
depends_lib lib:libintl:gettext
configure.args --with-gnu-gettext
install.args prefix=${destroot}/${prefix}
destroot.args prefix=${destroot}/${prefix}
+3 -4
View File
@@ -1,4 +1,4 @@
# $Id: Portfile,v 1.1 2003/07/30 19:47:03 waqar Exp $
# $Id: Portfile,v 1.2 2003/08/05 09:28:57 jkh Exp $
PortSystem 1.0
name tgzdrop
version 0.6
@@ -18,9 +18,8 @@ use_configure no
build.dir ${worksrcpath}/Project Builder Files/
build.type pbx
build.target
install { system "install -d ${destroot}/Applications/DarwinPorts \
destroot { system "install -d ${destroot}/Applications/DarwinPorts \
&& ditto -rsrcFork \
${worksrcpath}/Project\\ Builder\\ Files/build/tgzdrop.app \
${destroot}/Applications/DarwinPorts/tgzdrop.app" }
install.target
destroot.target
+4 -5
View File
@@ -22,9 +22,9 @@ post-patch {
configure {}
build.type gnu
install {
system "install -d ${destroot}/${prefix}/bin"
system "install -d ${destroot}/${prefix}/share/doc/${name}"
destroot {
file mkdir ${destroot}/${prefix}/bin
file mkdir ${destroot}/${prefix}/share/doc/${name}
system "install ${worksrcpath}/${name} \
${destroot}/${prefix}/bin/${name}"
system "install ${worksrcpath}/license.txt \
@@ -33,5 +33,4 @@ install {
${destroot}/${prefix}/share/doc/${name}"
}
install.destroot prefix=${destroot}/${prefix}
destroot.vars prefix=${destroot}/${prefix}
+2 -2
View File
@@ -1,4 +1,4 @@
# $Id: Portfile,v 1.2 2003/03/03 07:14:58 mij Exp $
# $Id: Portfile,v 1.3 2003/08/05 09:29:34 jkh Exp $
PortSystem 1.0
name unzip
@@ -22,7 +22,7 @@ worksrcdir ${name}-${version}
configure {}
build.target
build.args -f unix/Makefile macosx
install.args -f unix/Makefile install BINDIR=${destroot}${prefix}/bin MANDIR=${destroot}${prefix}/man/man1
destroot.args -f unix/Makefile install BINDIR=${destroot}${prefix}/bin MANDIR=${destroot}${prefix}/man/man1
long_description \
Zip is different from gzip in that it allows packing multiple files into a \
+2 -2
View File
@@ -1,4 +1,4 @@
# $Id: Portfile,v 1.4 2003/04/19 12:08:25 fkr Exp $
# $Id: Portfile,v 1.5 2003/08/05 09:29:35 jkh Exp $
PortSystem 1.0
@@ -22,7 +22,7 @@ worksrcdir ${name}-${version}
configure {}
build.target
build.args -f unix/Makefile generic
install.args -f unix/Makefile BINDIR=${destroot}${prefix}/bin MANDIR=${destroot}${prefix}/man/man1
destroot.args -f unix/Makefile BINDIR=${destroot}${prefix}/bin MANDIR=${destroot}${prefix}/man/man1
variant puredarwin { configure { cd ${worksrcpath}
reinplace "s|LFLAGS1=\"-s\"|LFLAGS1=|g" unix/configure }
+3 -3
View File
@@ -1,4 +1,4 @@
# $Id: Portfile,v 1.1 2003/03/17 06:55:41 landonf Exp $
# $Id: Portfile,v 1.2 2003/08/05 09:28:57 jkh Exp $
# This port installs only a static archive for zlib, which is not
# included by default with OS X
@@ -19,5 +19,5 @@ master_sites http://www.libpng.org/pub/png/src/ \
ftp://ftp.info-zip.org/pub/infozip/zlib/
checksums md5 ea16358be41384870acbdc372f9db152
use_bzip2 yes
pre-install "file mkdir ${destroot}/${prefix}/"
install.destroot prefix=${destroot}/${prefix}/
pre-destroot "file mkdir ${destroot}/${prefix}/"
destroot.vars prefix=${destroot}/${prefix}/
+2 -2
View File
@@ -1,4 +1,4 @@
# $Id: Portfile,v 1.1 2003/07/21 10:30:50 fkr Exp $
# $Id: Portfile,v 1.2 2003/08/05 09:28:57 jkh Exp $
PortSystem 1.0
name ample
@@ -19,4 +19,4 @@ patchfiles patch-ample.c \
checksums md5 2eabccb52ffbe6a73cf5e2b672ebc3f0
install.destroot prefix=${destroot}${prefix}
destroot.vars prefix=${destroot}${prefix}
+3 -3
View File
@@ -1,4 +1,4 @@
# $Id: Portfile,v 1.3 2003/03/03 06:10:42 mij Exp $
# $Id: Portfile,v 1.4 2003/08/05 09:28:57 jkh Exp $
PortSystem 1.0
name mp3info
@@ -19,10 +19,10 @@ depends_lib lib:libgtk.1:gtk
build.target mp3info
configure { cd ${worksrcpath}
reinplace "s|prefix=/usr/local|prefix=${destroot}${prefix}|g" Makefile }
install.target install-mp3info
destroot.target install-mp3info
variant x11 {
depends_lib-append lib:libgtk.1:gtk
build.target all
install.target install
destroot.target install
}
+2 -2
View File
@@ -1,4 +1,4 @@
# $Id: Portfile,v 1.8 2003/04/15 21:24:12 landonf Exp $
# $Id: Portfile,v 1.9 2003/08/05 09:28:58 jkh Exp $
PortSystem 1.0
name mpg123
@@ -25,7 +25,7 @@ post-patch {
configure {}
build.args LDFLAGS=-L${prefix}/lib \
CPPFLAGS=-I${prefix}/include
install.destroot PREFIX=${destroot}/${prefix}
destroot.vars PREFIX=${destroot}/${prefix}
variant darwin {
patchfiles patch-Makefile
+2 -2
View File
@@ -1,4 +1,4 @@
# $Id: Portfile,v 1.6 2003/04/15 21:24:13 landonf Exp $
# $Id: Portfile,v 1.7 2003/08/05 09:28:58 jkh Exp $
PortSystem 1.0
name vorbis-tools
@@ -33,4 +33,4 @@ configure.env \
CPPFLAGS="-I${prefix}/include -no-cpp-precomp"
#build.env LDFLAGS="-lpth"
configure.args --disable-ogg123
install.destroot prefix=${destroot}${prefix}
destroot.vars prefix=${destroot}${prefix}
+2 -2
View File
@@ -1,4 +1,4 @@
# $Id: Portfile,v 1.5 2003/03/03 06:12:17 mij Exp $
# $Id: Portfile,v 1.6 2003/08/05 09:28:58 jkh Exp $
PortSystem 1.0
name kermit
@@ -44,7 +44,7 @@ configure {
reinplace "973,996d" ${workdir}/makefile
}
pre-install { system "install -d ${destroot}${prefix}/bin"
pre-destroot { system "install -d ${destroot}${prefix}/bin"
system "install -d ${destroot}${prefix}/man/man1"
system "install -d ${destroot}${prefix}/share/kermit"
}
+2 -2
View File
@@ -1,4 +1,4 @@
# $Id: Portfile,v 1.17 2003/03/03 06:12:17 mij Exp $
# $Id: Portfile,v 1.18 2003/08/05 09:28:58 jkh Exp $
PortSystem 1.0
name scud
@@ -15,5 +15,5 @@ patchfiles patch-Makefile
configure {}
build.type bsd
build.args PREFIX=${prefix}
install.destroot PREFIX=${destroot}${prefix}
destroot.vars PREFIX=${destroot}${prefix}
+2 -2
View File
@@ -17,14 +17,14 @@ configure.args --enable-compat185 --enable-dump185 --enable-cxx \
--enable-dynamic --includedir=${prefix}/include/db3 \
--program-transform-name=s,^db,db3,
install.destroot prefix=${destroot}${prefix} includedir=${destroot}${prefix}/include/db3 \
destroot.vars prefix=${destroot}${prefix} includedir=${destroot}${prefix}/include/db3 \
docdir=${destroot}${prefix}/share/${name}-${version}/
long_description This is Version 3 of the Berkeley DB package. \
This port mainly exists for compatibility with Ximian Evolution \
and is based on the db4 port.
post-install { system "cd '${destroot}${prefix}/bin/'
post-destroot { system "cd '${destroot}${prefix}/bin/'
mv db_archive db3_archive
mv db_dump db3_dump
mv db_printlog db3_printlo
+3 -3
View File
@@ -1,4 +1,4 @@
# $Id: Portfile,v 1.14 2003/07/01 11:53:28 michaelm Exp $
# $Id: Portfile,v 1.15 2003/08/05 09:28:58 jkh Exp $
PortSystem 1.0
name db4
@@ -22,11 +22,11 @@ variant darwin { configure.args-append --enable-tcl \
--with-tcl=/System/Library/Tcl/8.3
}
install.destroot prefix=${destroot}${prefix} \
destroot.vars prefix=${destroot}${prefix} \
includedir=${destroot}${prefix}/include/db4 \
docdir=${destroot}${prefix}/share/${name}-${version}/
post-install { system "rm '${destroot}${prefix}/lib/libdb.a'
post-destroot { system "rm '${destroot}${prefix}/lib/libdb.a'
rm '${destroot}${prefix}/lib/libdb.dylib'
rm '${destroot}${prefix}/lib/libdb_cxx.a'
rm '${destroot}${prefix}/lib/libdb_cxx.dylib'
+2 -2
View File
@@ -1,4 +1,4 @@
# $Id: Portfile,v 1.10 2003/04/14 15:47:49 fkr Exp $
# $Id: Portfile,v 1.11 2003/08/05 09:28:59 jkh Exp $
PortSystem 1.0
@@ -21,4 +21,4 @@ distname ${portname}-${portversion}
checksums md5 1d1b1d5c0245b1c00aff92da751e9aa1
patchfiles patch-Makefile.in
install.args prefix=${destroot}/${prefix}
destroot.args prefix=${destroot}/${prefix}
+3 -3
View File
@@ -1,4 +1,4 @@
# $Id: Portfile,v 1.28 2003/03/03 06:13:24 mij Exp $
# $Id: Portfile,v 1.29 2003/08/05 09:28:59 jkh Exp $
PortSystem 1.0
name mysql
@@ -36,12 +36,12 @@ configure.env LDFLAGS=-L${prefix}/lib\\ -lncurses \
configure.args --localstatedir=${dbdir} \
--without-bench
pre-install { system "install -o root -m 755 -d ${dbdir}" }
pre-destroot { system "install -o root -m 755 -d ${dbdir}" }
variant server {
depends_run path:/Library/StartupItems/DarwinPortsStartup:DarwinPortsStartup
post-install {
post-destroot {
addgroup mysql
set gid [existsgroup mysql]
adduser mysql gid=${gid} realname=MySQL\ Server
+2 -2
View File
@@ -1,4 +1,4 @@
# $Id: Portfile,v 1.10 2003/05/24 19:43:25 mij Exp $
# $Id: Portfile,v 1.11 2003/08/05 09:28:59 jkh Exp $
PortSystem 1.0
name mysqltcl
@@ -16,4 +16,4 @@ checksums md5 49eda29dc599c51b056b2d67bfdb7d39
depends_lib lib:libmysqlclient.10:mysql bin:wish8.4:tk
configure.env LDFLAGS=-L${prefix}/lib/mysql/ CPPFLAGS=-I${prefix}/include/mysql/
configure.args --prefix=${destroot}${prefix}
install.destroot
destroot.vars
+3 -3
View File
@@ -1,4 +1,4 @@
# $Id: Portfile,v 1.1 2003/07/19 21:45:03 fkr Exp $
# $Id: Portfile,v 1.2 2003/08/05 09:28:59 jkh Exp $
PortSystem 1.0
name openldap
@@ -62,14 +62,14 @@ pre-build {
make depend"
}
pre-install {
pre-destroot {
# should be in pre-deploy....
addgroup ldap
set gid [existsgroup ldap]
adduser ldap gid=${gid}
}
post-install {
post-destroot {
file mkdir ${destroot}${prefix}/var/run
system "install -o ldap -g ldap -m 700 -d ${destroot}${prefix}/var/run/openldap-data"
#since post-deploy doesn't exist
+2 -2
View File
@@ -1,4 +1,4 @@
# $Id: Portfile,v 1.24 2003/03/24 18:23:54 michaelm Exp $
# $Id: Portfile,v 1.25 2003/08/05 09:28:59 jkh Exp $
PortSystem 1.0
name postgresql
@@ -40,7 +40,7 @@ variant darwin {
variant server {
depends_run path:/Library/StartupItems/DarwinPortsStartup:DarwinPortsStartup
post-install {
post-destroot {
set dbdir ${prefix}/var/db/pgsql/defaultdb
#XXX Breaks for binaries, need post-deploy
+2 -2
View File
@@ -1,4 +1,4 @@
# $Id: Portfile,v 1.9 2003/07/20 16:58:25 fkr Exp $
# $Id: Portfile,v 1.10 2003/08/05 09:28:59 jkh Exp $
PortSystem 1.0
@@ -22,4 +22,4 @@ master_sites http://www.sqlite.org/
checksums md5 317021b2ab5c81cc658228c18d9cba76
worksrcdir sqlite
install.destroot prefix=${destroot}${prefix}
destroot.vars prefix=${destroot}${prefix}

Some files were not shown because too many files have changed in this diff Show More