Creating a branch where I plan to slowly but surely move all of our base sources from the old DarwinPorts name

(or any variation and/or incarnation of it) to our new MacPorts name, at several levels:

 * source layout (e.g. src/darwinports1.0 -> src/macports1.0);
 * build system, adapting the existing one to the new source layout;
 * code level, moving all our *darwin* and *dport* procs and functions to the *macports* and *mport* namespace, respectively;
 * host installation (e.g. ${prefix}/share/darwinports -> ${prefix}/share/macports and several other important examples inside
  and outside of ${prefix}, while also dropping the d[arwin] moniker from our ports tree everywhere);
 * distribution means, among other things moving to rsync.macports.org but also getting rid of things like
  `/opt/local/var/db/dports/sources/rsync.rsync.darwinports.org_dpupdate1` that never made much sense in the first place and
  tied us to very rigid schemes and directory hierarchies (replacing them with a new scheme that will give us enough room to
  grow as we need and allow us to offer any source and ports trees we wish at any point through sync/selfupdate);
 * Anything else (relevant to this initiative, of course) that catches my eye while I work on this branch...

Current state of the branch is: as of this commit, branch mirrors trunk/base @ https://trac.macports.org/changeset/24452, all changesets merged and adapted manually and/or
via 'svn merge'; source layout mostly moved to the 'macports' namespace (some things might still escape my eye, will get to them over time).
The result configures, makes 'clean' and 'distclean', which already meant a lot of work on the Makefiles. Branch doesn't compile yet,
of course, since getting to that state is a rather slow process that goes through completing item No. 3 in my list above.

After that comes installation on a host system, item No. 4. Getting this right not only means a chance to re-think our desired
installation time filesystem layout (if any change other than darwinports -> macports is applicable), but also designing a migration
strategy for existing installations. Item No. 5 ties in with all of this, as new paths in our rsync repo and new conf file options
reflecting them will need migrating to for existing users.

Needless to say, once all that's done (migration paths written and tested locally) the hardest part it still to come: ensuring MacPorts
still Works As Expected (TM) before going live with this.

Only caveat that currently comes to mind from all of this, other than the work required to complete this branch, is the effect changing
the path to the depot location (`/opt/local/var/db/dports/{software,receipts}`) might have on installed ports. Will work to minimize
this side effect.

Motivation for this branch (or "Why I think investing some time on this initiative is well worth the effort!"):

 * The current mixture between darwinports and macports on so many levels (source layout, code namespace, installation paths, etc)
  is confusing to everyone (users, developers, contributors) at best, so sanitizing is in order;
 * Thinking through our distribution means calmly (without the pressure of releasing quick, as it was when 1.0 came about) and with
  all the experience of previous releases already with us will give us a chance to it right (or better, in any case);
 * I'm obsessive... but you all already knew that ;)

git-svn-id: https://svn.macports.org/repository/macports/branches/dp2mp-move/base@24454 d073be05-634f-4543-b044-5fe20cf6d1d6
This commit is contained in:
Juan Manuel Palacios
2007-04-24 17:28:16 +00:00
105 changed files with 1235 additions and 20820 deletions
+21
View File
@@ -6,6 +6,27 @@
(unreleased):
- ln now accepts combined flags (ex. ln -sf foo bar) (eridius r24452)
- default_variants now handles multiple values correctly (ticket #11828, eridius r24450).
- ln uses new symlink command so it can create symlinks that point to
files that don't actually exist (eridius r24444).
- New bare-bones Pextlib command `symlink source target` (ticket #11840, eridius r24444).
- delete reimplemented using fs-traverse (eridius r24435).
- fs-traverse now uses the fts(3) family of functions instead of readdir/opendir.
This fixes a couple behavioral oddities, and makes deleting during traversal work on 10.3
(ticket #11839, eridius r24423).
- fs-traverse now takes a list of targets rather than a variable number of arguments
(ticket #11836, eridius r24410).
- Fixed a potential crasher in fs-traverse when showing error message
(ticket #11827, eridius r24396, thanks sfiera).
- Fixed a bug where livecheck failed on ports that do not define a homepage
(ticket #11818, pguyot r24319).
+5 -5
View File
@@ -7,11 +7,11 @@ DISTARCTAG = ${DISTTAG}-archive
DISTARCNAME = ${DISTNAME}-archive
SVNURL = http://svn.macports.org/repository/macports
include Mk/dports.autoconf.mk
include Mk/macports.autoconf.mk
all:: Mk/dports.autoconf.mk
all:: Mk/macports.autoconf.mk
Mk/dports.autoconf.mk: Mk/dports.autoconf.mk.in src/config.h.in Makefile.in config.status
Mk/macports.autoconf.mk: Mk/macports.autoconf.mk.in src/config.h.in Makefile.in config.status
./config.status
make clean
@@ -24,7 +24,7 @@ config.status: configure
echo "Source tree not configured. Use ./configure" ; \
fi
include Mk/dports.subdir.mk
include Mk/macports.subdir.mk
install::
@echo ""
@@ -40,7 +40,7 @@ clean::
distclean::
rm -f config.log config.status configure.lineno
rm -rf autom4te.cache ${DISTDIR}
rm -f Makefile Mk/dports.autoconf.mk
rm -f Makefile Mk/macports.autoconf.mk
_gettag:
cd ${DISTDIR}; svn co ${SVNURL}/tags/${SVNTAG} ${PKGNAME}-svn
@@ -46,7 +46,7 @@ libdir = @libdir@
localstatedir = @localstatedir@
infodir = @infodir@
portconfigdir = @PORTCONFIGDIR@
dportsdir = @DPORTSDIR@
mpportconfigdir = @MPCONFIGDIR@
portsdir = @PORTSDIR@
SILENT = @
Vendored
+108 -128
View File
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -1,4 +1,4 @@
include ../Mk/dports.autoconf.mk
include ../Mk/macports.autoconf.mk
all:
@@ -10,4 +10,4 @@ distclean: clean
install::
$(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${DESTDIR}${portconfigdir}
$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 dp_version ${DESTDIR}${portconfigdir}
$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 mp_version ${DESTDIR}${portconfigdir}
+3 -3
View File
@@ -1,7 +1,7 @@
The file RELEASE_URL in this directory is used by the rsync infrastructure
at macports to control the tag from which "released" code is provided,
ultimately, at rsync://rsync.darwinports.org/dpupdate1/base.
at the MacPorts server to control the tag from which "released" code is provided,
ultimately, at rsync://rsync.macports.org/release/base.
The script handling that operation checks out from svn the code tagged by the
contents of the RELEASE_URL file, and makes that code available via rsync.
The script is at /base/portmgr/mprsyncup.
The script is svn at base/portmgr/mprsyncup.
Vendored
+136 -192
View File
File diff suppressed because it is too large Load Diff
+32 -32
View File
@@ -5,14 +5,15 @@ AC_CONFIG_SRCDIR([src/pextlib1.0/Pextlib.c])
AC_CONFIG_HEADERS([src/config.h])
AC_CANONICAL_SYSTEM
# Check user PATH for DP paths, and remove as necessary.
OD_PATH_SCAN
# Check user PATH for MP paths, and remove as necessary.
MP_PATH_SCAN
# Checks for programs.
AC_PROG_CC
AC_PROG_INSTALL
AC_PROG_MAKE_SET
AC_PROG_LN_S
AC_PATH_PROG(MTREE, [mtree], [])
AC_PATH_PROG(CVS, [cvs], [])
AC_PATH_PROG(RSYNC, [rsync], [])
AC_CHECK_PROG(HAVE_LAUNCHD, [launchd], [yes], [])
@@ -22,6 +23,7 @@ AC_PATH_PROG(BZIP2, [bzip2], [])
AC_PATH_PROG(XAR, [xar], [])
# Define some precious variables allowing user to override PATH for some programs
AC_ARG_VAR(MTREE, [path to mtree command])
AC_ARG_VAR(CVS, [path to cvs command])
AC_ARG_VAR(RSYNC, [path to rsync command])
AC_ARG_VAR(TAR, [path to tar command])
@@ -29,7 +31,7 @@ AC_ARG_VAR(GNUTAR, [path to gnutar command])
AC_ARG_VAR(BZIP2, [path to bzip2 command])
AC_ARG_VAR(XAR, [path to xar command])
OD_TAR_NO_SAME_OWNER
MP_TAR_NO_SAME_OWNER
# Quiche eaters options.
if test x$GCC = xyes; then
@@ -37,28 +39,27 @@ if test x$GCC = xyes; then
fi
AC_SUBST(CFLAGS_QUICHEEATERS)
OD_COMPILER_ATTRIBUTE_UNUSED
MP_COMPILER_ATTRIBUTE_UNUSED
OD_PROG_MTREE
#OD_PROG_XAR
OD_PROG_DAEMONDO
MP_PROG_DAEMONDO
#MP_PROG_XAR
AC_SUBST(REPLACEMENT_PROGS)
AC_SUBST(EXTRA_PROGS)
# set default dports-directory
DPORTS_DIR_DEFAULT=`pwd | sed -e "s/base/dports/"`
# set default ports-directory
PORTS_DIR_DEFAULT=`pwd | sed -e "s/base/ports/"`
# Check for paths
AC_PREFIX_DEFAULT(/opt/local)
OD_PATH_DPORTSDIR([$DPORTS_DIR_DEFAULT])
OD_PATH_PORTCONFIGDIR
OD_PATH_SQLITE3
MP_PATH_PORTSDIR([$PORTS_DIR_DEFAULT])
MP_PATH_MPCONFIGDIR
MP_PATH_SQLITE3
# Check for install ownership
OD_CHECK_INSTALLUSER
OD_CHECK_INSTALLGROUP
OD_DIRECTORY_MODE
MP_CHECK_INSTALLUSER
MP_CHECK_INSTALLGROUP
MP_DIRECTORY_MODE
# Check for standard header files.
AC_HEADER_STDC
@@ -75,12 +76,12 @@ AC_FUNC_CLOSEDIR_VOID
AC_FUNC_FORK
AC_FUNC_STRERROR_R
AC_CHECK_FUNCS([bzero memset dup2 regcomp strdup strerror strtol fgetln lockf flock setmode strcasecmp strncasecmp strlcpy copyfile])
DP_CHECK_READLINK_IS_P1003_1A
MP_CHECK_READLINK_IS_P1003_1A
# Check for md5 implementation
OD_LIB_MD5
MP_LIB_MD5
# Check for X11 and paraphernalia
OD_CHECK_X11
MP_CHECK_X11
# Check for readline
AC_CHECK_LIB([readline], [readline])
@@ -106,16 +107,16 @@ CYGPATH=echo
SC_PUBLIC_TCL_HEADERS
# Check for tclsh binary
OD_PROG_TCLSH
MP_PROG_TCLSH
# Check for Tcl package path
OD_TCL_PACKAGE_DIR
MP_TCL_PACKAGE_DIR
# Check if thread is enabled.
OD_TCL_THREAD_SUPPORT
MP_TCL_THREAD_SUPPORT
## libcurl
OD_LIBCURL_FLAGS
MP_LIBCURL_FLAGS
# Do we have curl_easy_strerror?
AH_TEMPLATE([HAVE_CURL_EASY_STRERROR],
@@ -136,7 +137,7 @@ AC_ARG_WITH(
# Check if thread package is already installed.
if test "x$with_included_tclthread" = "xunspecified" ; then
OD_TCL_PACKAGE(
MP_TCL_PACKAGE(
[Thread],
[AC_MSG_RESULT([yes]); with_included_tclthread=no],
[AC_MSG_RESULT([no]); with_included_tclthread=yes])
@@ -179,7 +180,7 @@ AC_SUBST(SHLIB_SUFFIX)
AC_SUBST(TCL_STUB_LIB_SPEC)
AC_SUBST(TCL_CC)
#misc variables that need to be expanded for substitution into tcl
# misc variables that need to be expanded for substitution into tcl
oldprefix=$prefix
if test "x$prefix" = "xNONE" ; then
@@ -190,9 +191,9 @@ eval "prefix_expanded=$prefix"
AC_SUBST(prefix_expanded)
# do this twice, since there is a nested variable of
# ${prefix} inside of ${sysconfdir}
eval "PORTCONFIGDIR_EXPANDED=$PORTCONFIGDIR"
eval "PORTCONFIGDIR_EXPANDED=$PORTCONFIGDIR_EXPANDED"
AC_SUBST(PORTCONFIGDIR_EXPANDED)
eval "MPCONFIGDIR_EXPANDED=$MPCONFIGDIR"
eval "MPCONFIGDIR_EXPANDED=$MPCONFIGDIR_EXPANDED"
AC_SUBST(MPCONFIGDIR_EXPANDED)
eval "localstatedir_expanded=$localstatedir"
AC_SUBST(localstatedir_expanded)
@@ -203,19 +204,18 @@ dnl
dnl SC_CONFIG_MANPAGES
# Output
AC_CONFIG_FILES([
Makefile
Mk/dports.autoconf.mk
Mk/macports.autoconf.mk
doc/prefix.mtree
doc/macosx.mtree
doc/ports.conf
doc/macports.conf
src/Makefile
src/darwinports1.0/darwinports_autoconf.tcl
src/macports1.0/macports_autoconf.tcl
src/port1.0/port_autoconf.tcl
src/registry1.0/registry_autoconf.tcl
src/programs/Makefile
src/darwinports1.0/darwinports_fastload.tcl
src/macports1.0/macports_fastload.tcl
])
AC_OUTPUT
+16 -16
View File
@@ -1,10 +1,10 @@
MAN5= ports.conf.5
MAN5= macports.conf.5
MAN7= portfile.7 portstyle.7 porthier.7 portgroup.7
INSTALLDIR= ${DESTDIR}${prefix}
TOPSRCDIR= ..
ifneq ($(MAKECMDGOALS),distclean)
include ../Mk/dports.autoconf.mk
include ../Mk/macports.autoconf.mk
endif
all:
@@ -14,7 +14,7 @@ clean:
test:
distclean: clean
rm -f prefix.mtree ports.conf macosx.mtree
rm -f prefix.mtree macports.conf macosx.mtree
install:
$(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
@@ -24,18 +24,18 @@ install:
if test -L "${INSTALLDIR}/man" ; then \
rm -f "${INSTALLDIR}/man"; \
fi
if test ! -e "${INSTALLDIR}/man" ; then \
$(LN_S) share/man ${INSTALLDIR}/man; \
fi
# Install the ports.conf file. If it's already installed, upgrade it
if test ! -e ${DESTDIR}/${portconfigdir}/ports.conf ; then \
# Install the macports.conf file. If it's already installed, upgrade it
if test ! -e ${DESTDIR}/${portconfigdir}/macports.conf ; then \
set -x; \
$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 ports.conf ${DESTDIR}${portconfigdir}; \
$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 macports.conf ${DESTDIR}${portconfigdir}; \
else \
sed -e s/rsync.opendarwin.org/rsync.darwinports.org/ ${DESTDIR}${portconfigdir}/ports.conf > ${DESTDIR}${portconfigdir}/ports.conf.tmp && \
mv ${DESTDIR}${portconfigdir}/ports.conf.tmp ${DESTDIR}${portconfigdir}/ports.conf; \
sed -e s/rsync.darwinports.org/rsync.macports.org/ ${DESTDIR}${portconfigdir}/macports.conf > ${DESTDIR}${portconfigdir}/macports.conf.tmp && \
mv ${DESTDIR}${portconfigdir}/macports.conf.tmp ${DESTDIR}${portconfigdir}mac/macports.conf; \
fi
# Install the sources.conf file. If it's already installed, upgrade it
@@ -43,19 +43,19 @@ install:
set -x; \
$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 sources.conf ${DESTDIR}${portconfigdir}; \
else \
sed -e s/rsync.opendarwin.org/rsync.darwinports.org/ ${DESTDIR}${portconfigdir}/sources.conf > ${DESTDIR}${portconfigdir}/sources.conf.tmp && \
sed -e s/rsync.darwinports.org/rsync.macports.org/ ${DESTDIR}${portconfigdir}/sources.conf > ${DESTDIR}${portconfigdir}/sources.conf.tmp && \
mv ${DESTDIR}${portconfigdir}/sources.conf.tmp ${DESTDIR}${portconfigdir}/sources.conf; \
fi
$(SILENT)if test ! -e ${DESTDIR}${portconfigdir}/variants.conf ; then \
set -x; \
$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 variants.conf ${DESTDIR}${portconfigdir}; \
fi
$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 prefix.mtree ${DESTDIR}${portconfigdir}
$(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}/share/darwinports/resources/port1.0/install
$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 prefix.mtree ${INSTALLDIR}/share/darwinports/resources/port1.0/install/
$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 macosx.mtree ${INSTALLDIR}/share/darwinports/resources/port1.0/install/
$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 ports.conf.5 ${INSTALLDIR}/share/man/man5
$(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}/share/macports/resources/port1.0/install
$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 prefix.mtree ${INSTALLDIR}/share/macports/resources/port1.0/install/
$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 macosx.mtree ${INSTALLDIR}/share/macports/resources/port1.0/install/
$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 macports.conf.5 ${INSTALLDIR}/share/man/man5
$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 portfile.7 ${INSTALLDIR}/share/man/man7
$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 portstyle.7 ${INSTALLDIR}/share/man/man7
$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 porthier.7 ${INSTALLDIR}/share/man/man7
-62
View File
@@ -1,62 +0,0 @@
DarwinPorts can be used on platforms other than Mac OS X 10.2 and 10.3,
but requires bootstrapping of various requirements.
Currently, DarwinPorts has been verified to work on the following
platforms:
Solaris (Sparc) 8 & 9 (tcl, curl, openssl, bzip2 need to be installed manually)
FreeBSD >= 4.8 (tcl and curl need to be installed manually)
OpenBSD >= 3.3 (tcl, curl and bzip2 need to be installed manually)
We will be assuming that you are installing into PREFIX=/opt/local,
although any path can be used. Further, we are assuming a sh-based shell
The following compilers have been tested:
Solaris:
Sunsoft Forte Developer 7 C 5.4
0)
PREFIX=/opt/local
export PREFIX
INSTALL REQUIREMENTS
1) Tcl. Use the Portfile as a template
gzip -c -d tcl8.4.6-src.tar.gz | tar xf -
cd tcl8.4.6
cd unix
./configure --prefix=$PREFIX --mandir=$PREFIX/share/man
make
make install
cd $PREFIX/bin
ln -s tclsh8.4 tclsh
$ echo puts foo | tclsh
foo
2) OpenSSL
gzip -c -d openssl-0.9.7d.tar.gz | tar xf -
cd openssl-0.9.7d
./config --prefix=$PREFIX --openssldir=$PREFIX/etc/openssl no-asm no-krb5 shared
make
make install
export LD_LIBRARY_PATH=$PREFIX/lib
3) Curl
gzip -c -d curl-7.11.1.tar.gz | tar xf -
cd curl-7.11.1
./configure --prefix=$PREFIX --mandir=$PREFIX/share/man --with-ssl=$PREFIX
make
make install
curl --version
4) GNU coreutils
gzip -c -d coreutils-5.2.1.tar.gz | tar xf -
cd coreutils-5.2.1
./configure --prefix=$PREFIX --mandir=$PREFIX/share/man
make
make install
5) darwinports
./configure --prefix=$PREFIX --with-install-user=ssen --with-install-group=mit --with-tcl=$PREFIX/lib --with-tclinclude=$PREFIX/include CPPFLAGS="-I$PREFIX/include" LDFLAGS="-L$PREFIX/lib"
make
make install
+30 -15
View File
@@ -28,8 +28,8 @@
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
.Dd February 13, 2007
.Dt PORTFILE 7 "Apple Computer, Inc."
.Os
.Dt PORTFILE 7 "Apple Inc."
.Os Darwin
.Sh NAME
.Nm Portfile
.Nd MacPorts description file reference
@@ -1486,20 +1486,19 @@ before working.
.Op Fl depth
.Op Fl ignoreErrors
.Ar varname
.Ar target
.Op Ar target ...
.Ar target-list
.Ar body
.Xc
Traverse the filesystem hierarchy rooted in each
.Ar target
Traverse the filesystem hierarchy rooted in each element of
.Ar target-list
and execute
.Ar body
for each found file/directory. Sets
.Ar varname
to the path of the file/directory. If
.Nm break
for each found file/directory.
.Va varname
is set to the path of the file/directory. If
.Ic break
is called during execution, the filesystem traversal is stopped. If
.Nm continue
.Ic continue
is called during execution, the current file and any children are skipped
and traversal continues with the next file/directory.
.Bl -tag -width indent
@@ -1511,13 +1510,28 @@ switch to
Please note that using
.Fl depth
means you cannot prune a directory with
.Nm continue
.Ic continue
as it will be processed after its children.
.It Fl ignoreErrors
Causes
.Nm fs-traverse
.Ic fs-traverse
to ignore any permissions/read errors encountered during processing.
.El
.Pp
If
.Nm fs-traverse
is called directly on a symbolic link, the link will be followed. All other
links encountered during traversal will not be followed.
.Pp
.Nm fs-traverse
will not descend into directories that have a different device number than
the root of the descent.
.Pp
If you remove the current directory during traversal, be aware that you must call
.Nm continue
to inform
.Nm fs-traverse
that the directory should not be descended into.
.It Xo
.Ic curl fetch
.Ar url
@@ -1582,9 +1596,9 @@ to also preserve Extended Attributes (i.e. Access Control Lists). See
.Xr file n
for more information on this command.
.It Ic copy
Built-in shorthand alternative to "file -copy".
Built-in shorthand alternative to "file copy".
.It Ic move
Built-in shorthand alternative to "file -rename".
Built-in shorthand alternative to "file rename".
.It Ic delete
Built-in shorthand alternative to "file -delete". Required over the latter for Portfiles that perform deleting
operations on directories while building the port on Mac OS X 10.3 and earlier, due to a Tcl anomaly on those systems
@@ -1695,3 +1709,4 @@ to the user, at various different levels.
.An "Kevin Van Vechten" Aq kevin@opendarwin.org
.An "Jordan K. Hubbard" Aq jkh@opendarwin.org
.An "Chris Ridd" Aq cjr@opendarwin.org
.An "Kevin Ballard" Aq eridius@macports.org
+4 -4
View File
@@ -21,14 +21,14 @@ MP_GROUP=staff
SPAM_LOVERS=macports-mgr@lists.macosforge.org,dluke@geeklair.net
# Other settings (probably don't need to be changed).
SVN_DPORTS_URL=http://svn.macports.org/repository/macports/trunk/dports
SVN_PORTS_URL=http://svn.macports.org/repository/macports/trunk/dports
SVN_BASE_URL=http://svn.macports.org/repository/macports/trunk/base
SVN_CONFIG_DIR=${ROOT}/svnconfig
# Where to checkout the source code. This needs to exist!
SRCTREE=${ROOT}/source
# Where MP will install its world. This gets created.
PREFIX=${ROOT}/opt/local
# Where MP installs darwinports1.0. This gets created.
# Where MP installs macports1.0. This gets created.
TCLPKG=${PREFIX}/lib/tcl
# Path.
PATH=${PREFIX}/bin:/bin:/usr/bin:/opt/local/bin
@@ -62,12 +62,12 @@ fi
# Update both the ports tree and base sources, bail out if they don't exist beforehand.
if [ ! -d ${SRCTREE}/dports/.svn ]; then
echo "No dports tree found at ${SRCTREE}. This needs to exist (with proper svn \
echo "No ports tree found at ${SRCTREE}. This needs to exist (with proper svn \
credentials at ${SVN_CONFIG_DIR}) prior to runnig this script." > $FAILURE_LOG; bail
else
cd ${SRCTREE}/dports && \
svn -q --non-interactive --config-dir $SVN_CONFIG_DIR update > $FAILURE_LOG 2>&1 \
|| { echo "Updating the ports tree from $SVN_DPORTS_URL failed." >> $FAILURE_LOG ; bail ; }
|| { echo "Updating the ports tree from $SVN_PORTS_URL failed." >> $FAILURE_LOG ; bail ; }
fi
if [ ! -d ${SRCTREE}/base/.svn ]; then
echo "No base sources found at ${SRCTREE}. This needs to exist (with proper svn \
+2 -2
View File
@@ -1,4 +1,4 @@
INSTALLDIR= ${DESTDIR}${datadir}/darwinports/resources/portmgr
INSTALLDIR= ${DESTDIR}${datadir}/macports/resources/portmgr
SCRIPTS= PortIndex2MySQL
@@ -6,7 +6,7 @@ edit = sed \
-e 's,@PREFIX\@,$(prefix),g' \
-e 's,@TCL_PACKAGE_DIR\@,$(TCL_PACKAGE_DIR),g'
include ../Mk/dports.autoconf.mk
include ../Mk/macports.autoconf.mk
all: ${SCRIPTS}
-30
View File
@@ -1,30 +0,0 @@
#!/bin/sh
# fkr, jberry, yeled
# checks out both HEAD and then the CVS Tag specified in $RELEASE_TAG_FILE
# made for dulcinea 2005-12-06
# TODO should clean up after itself.
# TODO shouldn't refer to the Tag as "dp1.0"
DPROOT="/Volumes/bigsrc/darwinports"
RELEASE_TAG_FILE="base/config/RELEASE_TAG"
# Check out HEAD
export HOME=/var/root
TMPDIR=dp
cd ${DPROOT} ; cvs -q -R -d /cvs/od co -P -d ${TMPDIR}.tmp darwinports
rsync -q --exclude=.cvsignore --exclude=CVS -a --delete ${DPROOT}/${TMPDIR}.tmp/ ${DPROOT}/${TMPDIR}/
#rsync --dry-run --exclude=.cvsignore --exclude=CVS -a --delete ${DPROOT}/${TMPDIR}.tmp/ ${DPROOT}/${TMPDIR}/
echo `date -u +%s` > ${DPROOT}/${TMPDIR}/TIMESTAMP
# Extract the release tag from HEAD
read RELEASE_TAG < ${DPROOT}/${TMPDIR}/${RELEASE_TAG_FILE}
[ -n "${RELEASE_TAG}" ] || ( echo "no RELEASE_TAG specified in cvs HEAD" ; exit 1 )
# Checkout from the release tag specified in HEAD
export HOME=/var/root
TMPDIR=dp1.0
cd ${DPROOT} ; cvs -q -R -d /cvs/od co -r ${RELEASE_TAG} -P -d ${TMPDIR}.tmp darwinports
rsync -q --exclude=.cvsignore --exclude=CVS -a --delete ${DPROOT}/${TMPDIR}.tmp/ ${DPROOT}/${TMPDIR}/
#rsync --dry-run --exclude=.cvsignore --exclude=CVS -a --delete ${DPROOT}/${TMPDIR}.tmp/ ${DPROOT}/${TMPDIR}/
echo `date -u +%s` > ${DPROOT}/${TMPDIR}/TIMESTAMP
+2 -2
View File
@@ -1,4 +1,4 @@
TCLPKG= darwinports1.0 port1.0 package1.0 pextlib1.0 registry1.0 \
TCLPKG= macports1.0 port1.0 package1.0 pextlib1.0 registry1.0 \
darwintracelib1.0 @OUR_INCLUDED_PACKAGES@
SUBDIR= ${TCLPKG} port programs
@@ -10,4 +10,4 @@ distclean::
test::
include ../Mk/dports.subdir.mk
include ../Mk/macports.subdir.mk

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