Ignore:
Timestamp:
Dec 14, 2005, 5:10:20 AM (15 years ago)
Author:
jberry
Message:

Merge to HEAD changes between tags release_1_2-bp and release_1_2_0 on
release_1_2 branch. This should incorporate all changes that were made
on the 1.2 branch between the time it branched from HEAD, and the time
1.2 was tagged.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/Makefile.in

    r15338 r15506  
    1 SUBDIR= doc src portmgr
     1SUBDIR          = config doc src portmgr
     2DISTDIR         = dist
     3DISTVER         =
     4DISTTAG         = release_${subst .,_,${DISTVER}}
     5DISTNAME        = DarwinPorts-${DISTVER}
     6DISTARCTAG      = ${DISTTAG}-archive
     7DISTARCNAME     = ${DISTNAME}-archive
     8CVSLOGIN        = ${USER}
    29
    310include Mk/dports.subdir.mk
     
    1825
    1926install::
    20         $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 dp_version ${DESTDIR}${portconfigdir}
     27        # Compatibility upgrade from dp 1.1 to dp 1.2
     28        @echo "Renaming rsync'd directories from rsync.opendarwin.org to rsync.darwinports.org"
     29        if test -d ${localstatedir}/db/dports/sources/rsync.rsync.opendarwin.org_dpupdate_dports \
     30           -a ! -d ${localstatedir}/db/dports/sources/rsync.rsync.darwinports.org_dpupdate_dports; then \
     31                mv ${localstatedir}/db/dports/sources/rsync.rsync.opendarwin.org_dpupdate_dports \
     32                   ${localstatedir}/db/dports/sources/rsync.rsync.darwinports.org_dpupdate_dports; \
     33        fi
     34        if test -d ${localstatedir}/db/dports/sources/rsync.rsync.opendarwin.org_dpupdate1 \
     35           -a ! -d ${localstatedir}/db/dports/sources/rsync.rsync.darwinports.org_dpupdate1; then \
     36                mv ${localstatedir}/db/dports/sources/rsync.rsync.opendarwin.org_dpupdate1 \
     37                   ${localstatedir}/db/dports/sources/rsync.rsync.darwinports.org_dpupdate1; \
     38        fi
     39
    2140        @echo ""
    2241        @echo "Congratulations, you have successfully installed the DarwinPorts system."
     
    3352distclean::
    3453        rm -f config.log config.status configure.lineno
    35         rm -rf autom4te.cache
     54        rm -rf autom4te.cache ${DISTDIR}
    3655        rm -f Makefile Mk/dports.autoconf.mk
    3756
     57_gettag:
     58        cd ${DISTDIR}; cvs -d ":ext:${CVSLOGIN}@cvs.opendarwin.org:/Volumes/src/cvs/od" co -N -r ${CVSTAG} ${REPOPATH}
     59        cd ${DISTDIR}; mv ${REPOPATH} ${PKGNAME}; rm -Rf darwinports
     60
     61_pkgdist:
     62        cd ${DISTDIR}; COPY_EXTENDED_ATTRIBUTES_DISABLE=true tar --exclude CVS -c ${PKGNAME} | gzip > ${PKGNAME}.tar.gz
     63        cd ${DISTDIR}; COPY_EXTENDED_ATTRIBUTES_DISABLE=true tar --exclude CVS -c ${PKGNAME} | bzip2 > ${PKGNAME}.tar.bz2
     64        cd ${DISTDIR}; for type in -md5 -sha1 -ripemd160; do openssl dgst $$type ${PKGNAME}.tar.gz ${PKGNAME}.tar.bz2; done >> ${DISTNAME}.chk.txt
     65
     66_dopkg: _gettag _pkgdist
     67
     68# This target fetches a tagged distribution from cvs, and generates tarballs and checksums for it
     69distfromcvs:
     70        @[ -n "${DISTVER}" ] || ( echo Must specify DISTVER, like: make DISTVER=1.1 dist; exit 1 )
     71        [ -d ${DISTDIR} ] || mkdir ${DISTDIR}
     72        rm -f ${DISTDIR}/${DISTNAME}.chk.txt
     73        ${MAKE} PKGNAME=${DISTNAME} REPOPATH=darwinports/base CVSTAG=${DISTTAG} _dopkg
     74        ${MAKE} PKGNAME=${DISTARCNAME} REPOPATH=darwinports CVSTAG=${DISTARCTAG} _dopkg
     75
    3876test::
     77
     78.PHONY: dist _gettag _pkgdist _dopkg
Note: See TracChangeset for help on using the changeset viewer.