PERFORCE change 106224 for review
Gabor Kovesdan
gabor at FreeBSD.org
Sun Sep 17 01:49:21 PDT 2006
http://perforce.freebsd.org/chv.cgi?CH=106224
Change 106224 by gabor at gabor_server on 2006/09/17 08:49:05
IFC
Affected files ...
.. //depot/projects/soc2006/gabor_ports/CHANGES#7 integrate
.. //depot/projects/soc2006/gabor_ports/GIDs#3 integrate
.. //depot/projects/soc2006/gabor_ports/KNOBS#4 integrate
.. //depot/projects/soc2006/gabor_ports/LEGAL#5 integrate
.. //depot/projects/soc2006/gabor_ports/MOVED#12 integrate
.. //depot/projects/soc2006/gabor_ports/Mk/bsd.gnustep.mk#2 integrate
.. //depot/projects/soc2006/gabor_ports/Mk/bsd.java.mk#2 integrate
.. //depot/projects/soc2006/gabor_ports/Mk/bsd.kde.mk#3 integrate
.. //depot/projects/soc2006/gabor_ports/Mk/bsd.lua.mk#1 branch
.. //depot/projects/soc2006/gabor_ports/Mk/bsd.php.mk#4 integrate
.. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#84 integrate
.. //depot/projects/soc2006/gabor_ports/Mk/bsd.python.mk#6 integrate
.. //depot/projects/soc2006/gabor_ports/Mk/bsd.ruby.mk#5 integrate
.. //depot/projects/soc2006/gabor_ports/Mk/bsd.scons.mk#7 integrate
.. //depot/projects/soc2006/gabor_ports/Mk/bsd.sites.mk#9 integrate
.. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/buildscript#2 integrate
.. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/claim-chroot#2 integrate
.. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/clean-chroot#2 integrate
.. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/dopackages#2 integrate
.. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/makeworld#2 integrate
.. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/mkbindist#2 integrate
.. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/pdispatch#2 integrate
.. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/portbuild#2 integrate
.. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/processlogs#2 integrate
.. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/processonelog#5 integrate
.. //depot/projects/soc2006/gabor_ports/Tools/scripts/rmport#3 integrate
.. //depot/projects/soc2006/gabor_ports/UIDs#3 integrate
.. //depot/projects/soc2006/gabor_ports/UPDATING#14 integrate
Differences ...
==== //depot/projects/soc2006/gabor_ports/CHANGES#7 (text+ko) ====
@@ -10,6 +10,33 @@
All ports committers are allowed to commit to this file.
+20060914:
+AUTHOR: portmgr at FreeBSD.org
+The following functional changes were made to bsd.port.mk:
+
+ * PKGVERSION was introduced as an intermediate variable refactored out of
+ PKGNAME.
+
+ * bsd.lua.mk was added to support lua-related ports.
+
+ * DESTDIR was removed from bsd.scons.mk because it was problematic.
+
+ * Some quotes were added to the 'missing' target to improve handling of
+ duplicate origins.
+
+20060903:
+AUTHOR: sat at FreeBSD.org
+The following functional changes were made to bsd.sites.mk:
+
+ * MASTER_SITES variable can now look like MACRO1/subdir1 MACRO2/subdir2, and
+ be expanded in a way that you expect it to, that is apply different subdirs
+ to different sites. You can safely replace ${M_S_FOO:S/%SUBDIR%/bar/} with
+ FOO/bar.
+
+ * If M_S_SUBDIR is unset, a macro in M_S won't set it anymore, but rather
+ substitute %SUBDIR% all by itself. Now it's possible to use macros with
+ different default subdirs and they will expand in a proper way.
+
20060805:
AUTHOR: sat at FreeBSD.org
The following functional changes were made to bsd.sites.mk:
@@ -1176,4 +1203,4 @@
Contact Erwin Lansing if you have any questions about your use of
this document.
-$FreeBSD: ports/CHANGES,v 1.58 2006/08/04 20:44:18 sat Exp $
+$FreeBSD: ports/CHANGES,v 1.60 2006/09/15 06:57:07 linimon Exp $
==== //depot/projects/soc2006/gabor_ports/GIDs#3 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: ports/GIDs,v 1.9 2006/07/29 07:16:00 ume Exp $
+$FreeBSD: ports/GIDs,v 1.11 2006/08/28 20:15:56 pav Exp $
# Please keep this file sorted by GID!
bind:*:53:
rdfdb:*:55:
@@ -46,8 +46,10 @@
dhis:*:114:
_symon:*:115:
smokeping:*:117:
+ircproxyd:*:118:
postfix:*:125:
maildrop:*:126:
+vchat:*:128:
_bgpd:*:130:
_ospfd:*:131:
rbldns:*:153:
==== //depot/projects/soc2006/gabor_ports/KNOBS#4 (text+ko) ====
@@ -1,7 +1,7 @@
#
# KNOBS - A list of popular knobs and descriptions
#
-# $FreeBSD: ports/KNOBS,v 1.13 2006/07/05 15:18:35 skv Exp $
+# $FreeBSD: ports/KNOBS,v 1.15 2006/09/04 11:10:04 sat Exp $
#
# Rules to adding knobs:
#
@@ -46,6 +46,9 @@
FLAC Flac audio support
GHC Prefer/use Glasgow Haskell Compiler
GNOME Adds GNOME support
+GNUTLS Adds GnuTLS support
+GSASL Adds GSASL support
+GSM GSM audio codec support
GSTREAMER Gstreamer multimedia support
GTK1 Adds Gtk+1 support
GTK2 Adds Gtk+2 support
==== //depot/projects/soc2006/gabor_ports/LEGAL#5 (text+ko) ====
@@ -1,5 +1,5 @@
# Creator: Jordan Hubbard
-# $FreeBSD: ports/LEGAL,v 1.490 2006/08/03 01:17:28 acm Exp $
+# $FreeBSD: ports/LEGAL,v 1.496 2006/09/11 18:06:11 vd Exp $
**********************************************************************
*** NOTE TO COMMITTERS ***
@@ -67,7 +67,6 @@
atari800/* emulators/atari800 xf25 contains copyright ROMs
and cannot be distributed
autopano-sift graphics/autopano-sift May be covered by patents
-antivir-milter-* security/antivir-milter No redistribution allowed
bamg* math/bamg Contact author personally
regarding commercial use
baudline_* audio/baudline No redistribution allowed
@@ -166,7 +165,7 @@
We currently ask for permission
to put a package on the CD-ROM
dns.tar.Z dns/h2n Never get an approval yet
-doom3-linux-* games/linux-doom3-demo Redistribution limited
+doom3-linux-* games/linux-doom3* Redistribution limited
doomsrc.zip games/doom requested by id Software
dr_freebsd_*.zip sysutils/megarc Must be downloaded manually
drweb-qmail-*.tar.gz security/drweb-qmail Non-commercial or evaluation use
@@ -383,7 +382,6 @@
linunace* archivers/linux-unace Distribution is permitted within the
original package only
Linux-ACU-Driver-v* sysutils/linux-acu Redistribution not allowed
-linux_devtools devel/linux_devtools GPL binaries
linux-gtk2 x11-toolkits/linux-gtk2 LGPL binary, no source
linuxq3ademo-* games/linux-q3ademo Restrictive license by Loki Software
l0phtcrack/* security/l0phtcrack Parts are under GPL, so
@@ -507,6 +505,8 @@
rtplib-* devel/rtplib Limited use license
ruby/ruby_cast_256.zip security/ruby-cast_256 Crypto; export-controlled
runrev/linux.tgz devel/linux-runrev Do not sell for profit
+savage/savage* games/linux-savage Savage is freeware, but i am
+ not sure of its license
sdr-* mbone/sdr Crypto; export-controlled
serialmail-* mail/serialmail No license -- see
http://cr.yp.to/softwarelaw.html
@@ -603,6 +603,7 @@
of a license agreement
upsmon* sysutils/upsmon Redistribute only with
original source code
+ut_linux_mgr_ sysutils/linux-megamgr Redistribution prohibited
urchin*.tar.gz www/urchin5 Commercial software, also comes
bundled with Apache-SSL
unreal.tournament*.run games/linux-ut Redistribution limited
@@ -685,3 +686,4 @@
xGate/* japanese/xgate Requested by Orangesoft Inc
tw_cli-* sysutils/tw_cli Redistribution forbidden by
license.
+lha-1.14i-ac* archivers/lha-ac No Redistribution
==== //depot/projects/soc2006/gabor_ports/MOVED#12 (text+ko) ====
@@ -1,7 +1,7 @@
#
# MOVED - a list of (recently) moved or removed ports
#
-# $FreeBSD: ports/MOVED,v 1.1115 2006/08/14 03:04:49 acm Exp $
+# $FreeBSD: ports/MOVED,v 1.1134 2006/09/11 18:06:11 vd Exp $
#
# Each entry consists of a single line containing the following four
# fields in the order named, separated with the pipe (`|') character:
@@ -1563,6 +1563,7 @@
editors/openoffice-1.1-devel|editors/openoffice.org-1.1-devel|2005-08-29|port should have a correct PORTNAME
editors/openoffice-2.0-devel|editors/openoffice.org-2.0-devel|2005-08-29|port should have a correct PORTNAME
shells/zsh-devel|shells/zsh|2005-08-29|Development version of Zsh is no longer being released
+shells/zsh+euc_hack|shells/zsh|2006-09-01|Multibyte support has been added to the main stream
russian/nagios||2005-08-30|Obsoleted; new version is not planned
www/py-websvcs|net/py-soappy|2005-08-30|duplicate port
x11-toolkits/wxgtk26-contrib-utils||2005-08-31|Deprecated
@@ -2442,3 +2443,24 @@
russian/xpi-imagezoom|www/xpi-imagezoom|2006-08-09|Russian locale now comes bundled with official version
security/linux-krb5-libs||2006-08-13|Integrated with emulators/linux_base-fc4
sysutils/linux-e2fsprogs||2006-08-13|Integrated with emulators/linux_base-fc4
+net/magictun||2006-08-17|Abandoned
+lang/gcc41-withgcjawt|lang/gcc41-withgcjawt|2006-08-18|finished repocopy
+net/lam7|net/lam|2006-08-21|Replace lam-6 which was deprecated
+devel/py-ui||2006-08-25|Has expired: PyUI does not work with well with current versions of graphics/py-opengl and has not been developed in over two years. Python game development should be done with devel/py-game instead
+net-im/jabber-msn||2006-08-25|Has expired: Depends on broken net-im/jabber, please use net-im/jabber-pymsn instead
+net-im/gaim-devel|net-im/gaim|2006-08-26|Remove since gaim's maintainer don't want to add it now
+graphics/GIFgraph|graphics/p5-GD-Graph|2006-08-27|broken, use graphics/p5-GD-Graph instead
+www/p5-Apache-SizeLimit||2006-09-02|unresolvable conflict with www/mod_perl
+www/firefox10|www/firefox|2006-09-02|Security vulnerabilities
+net/samba|net/samba3|2006-09-02|Security vulnerabilities
+security/antivir-milter||2006-09-02|Free license keys are no longer available since September 2005
+security/finger_mysql||2006-09-02|Project has closed
+devel/bitkeeper||2006-09-02|Project was discontinued
+net/asterisk-devel||2006-09-02|Port was not currently useful; may return later
+devel/p5-Linux-Pid||2006-09-03|Was a p5-Apache-SizeLimit dependency, now removed
+www/mozilla-devel|www/seamonkey|2006-09-03|Security vulnerabilities
+textproc/p5-Text-SwiftTemplate||2006-09-04|unfetchable, removed
+security/fpc-md5|security/fpc-hash|2006-09-07|Port was renamed
+devel/linux_devtools||2006-09-11|Has expired: the dependcy is deprecated, please use a linux_dist port instead
+graphics/pecl-imagick||2006-09-11|Has expired: Project is dead and does not work
+korean/linux_locale||2006-09-11|Has expired: the dependency is scheduled for removal and a recent glib does not need this
==== //depot/projects/soc2006/gabor_ports/Mk/bsd.gnustep.mk#2 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: ports/Mk/bsd.gnustep.mk,v 1.27 2006/04/04 19:22:25 dinoex Exp $
+# $FreeBSD: ports/Mk/bsd.gnustep.mk,v 1.29 2006/09/10 16:41:27 dinoex Exp $
#
# This file contains some variable definitions that are supposed to
# make your life easier when dealing with ports related to the GNUstep.
@@ -63,6 +63,12 @@
# USE_GNUSTEP_INSTALL=yes
# call install target with GNUstep.sh sourced in the current shell
#
+# USE_GNUSTEP_SYSTEM_LIBS= Renaissance:x11-toolkits/renaissance
+# depends on a shared lib in System directrory
+#
+# USE_GNUSTEP_LOCAL_LIBS= pantomime:mail/pantomime
+# depends on a shared lib in Local directrory
+#
# ---------------------------------------------------------------------------
.if !defined(_POSTMKINCLUDED)
@@ -80,6 +86,13 @@
.endif
.endif
+.if defined(USE_GNUSTEP_BUILD)
+BUILD_DEPENDS+= ${SYSMAKEDIR}/GNUstep.sh:${PORTSDIR}/${GNUSTEP_MAKE_PORT}
+.endif
+.if defined(USE_GNUSTEP_INSTALL)
+RUN_DEPENDS+= ${SYSMAKEDIR}/GNUstep.sh:${PORTSDIR}/${GNUSTEP_MAKE_PORT}
+.endif
+
GNUSTEP_MAKE_PORT?= devel/gnustep-make
GNUSTEP_OBJC_PORT?= lang/gnustep-objc
GNUSTEP_BASE_PORT?= lang/gnustep-base
@@ -174,7 +187,7 @@
# using any backend
#
.if defined(USE_GNUSTEP_BACK)
-BACKSUFFIX?= -010
+BACKSUFFIX?= -011
.if defined(WITH_GNUSTEP_XDPS)
GNUSTEP_WITH_XDPS=yes
.elif defined(WITH_GNUSTEP_LIBART)
@@ -234,6 +247,27 @@
.endif
# ---------------------------------------------------------------------------
+# source system liibs
+#
+.if defined(USE_GNUSTEP_SYSTEM_LIBS)
+.for _GNUSTEP_DEP in ${USE_GNUSTEP_SYSTEM_LIBS}
+BUILD_DEPENDS+= ${COMBOLIBDIR}/lib${_GNUSTEP_DEP:C/:.*//}.so:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
+RUN_DEPENDS+= ${COMBOLIBDIR}/lib${_GNUSTEP_DEP:C/:.*//}.so:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
+.endfor
+.endif
+
+# ---------------------------------------------------------------------------
+# source local liibs
+#
+:C/[.][0-9]*$//1
+.if defined(USE_GNUSTEP_LOCAL_LIBS)
+.for _GNUSTEP_DEP in ${USE_GNUSTEP_LOCAL_LIBS}
+BUILD_DEPENDS+= ${LOCALLIBDIR}/lib${_GNUSTEP_DEP:C/:.*//}.so:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
+RUN_DEPENDS+= ${LOCALLIBDIR}/lib${_GNUSTEP_DEP:C/:.*//}.so:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://}
+.endfor
+.endif
+
+# ---------------------------------------------------------------------------
# source GNUstep.sh
#
.if defined(USE_GNUSTEP_CONFIGURE)
@@ -260,8 +294,6 @@
# source GNUstep.sh
#
.if defined(USE_GNUSTEP_BUILD)
-BUILD_DEPENDS+= ${SYSMAKEDIR}/GNUstep.sh:${PORTSDIR}/${GNUSTEP_MAKE_PORT}
-
do-build:
@(cd ${WRKSRC}; . ${SYSMAKEDIR}/GNUstep.sh; \
${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET})
@@ -272,8 +304,6 @@
# source GNUstep.sh
#
.if defined(USE_GNUSTEP_INSTALL)
-RUN_DEPENDS+= ${SYSMAKEDIR}/GNUstep.sh:${PORTSDIR}/${GNUSTEP_MAKE_PORT}
-
do-install:
@(cd ${WRKSRC}; . ${SYSMAKEDIR}/GNUstep.sh; \
${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
==== //depot/projects/soc2006/gabor_ports/Mk/bsd.java.mk#2 (text+ko) ====
@@ -9,7 +9,7 @@
# Please send all suggested changes to the maintainer instead of committing
# them to CVS yourself.
#
-# $FreeBSD: ports/Mk/bsd.java.mk,v 1.71 2006/04/24 18:27:45 glewis Exp $
+# $FreeBSD: ports/Mk/bsd.java.mk,v 1.72 2006/09/14 19:54:46 glewis Exp $
#
.if !defined(Java_Include)
@@ -216,9 +216,8 @@
_JAVA_OS_linux= Linux
# Enforce preferred Java ports according to OS
-. if ${ARCH} == "amd64"
-_JAVA_PREFERRED_PORTS+= JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5
-. elif ${OSVERSION} >= 500000
+. if (${ARCH} == "amd64" && ${OSVERSION} >= 600000 && ${OSVERSION} < 700000) || \
+ (${ARCH} == "i386" && ${OSVERSION} >= 500000 && ${OSVERSION} < 700000)
_JAVA_PREFERRED_PORTS+= JAVA_PORT_NATIVE_FREEBSD_JDK_1_5
. else
_JAVA_PREFERRED_PORTS+= JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5
==== //depot/projects/soc2006/gabor_ports/Mk/bsd.kde.mk#3 (text+ko) ====
@@ -1,7 +1,7 @@
#-*- mode: Makefile; tab-width: 4; -*-
# ex:ts=4
#
-# $FreeBSD: ports/Mk/bsd.kde.mk,v 1.62 2006/07/05 02:18:08 linimon Exp $
+# $FreeBSD: ports/Mk/bsd.kde.mk,v 1.63 2006/09/12 23:26:10 lofi Exp $
#
# Please view me with 4 column tabs!
@@ -97,7 +97,7 @@
# Yeah, it's namespace pollution, but this is really the best place for this
# stuff. Arts does NOT use it anymore.
-KDE_VERSION= 3.5.3
+KDE_VERSION= 3.5.4
KDE_ORIGVER= ${KDE_VERSION}
KDE_PREFIX?= ${LOCALBASE}
==== //depot/projects/soc2006/gabor_ports/Mk/bsd.php.mk#4 (text+ko) ====
@@ -7,7 +7,7 @@
# Please send all suggested changes to the maintainer instead of committing
# them to CVS yourself.
#
-# $FreeBSD: ports/Mk/bsd.php.mk,v 1.32 2006/07/27 06:21:15 ale Exp $
+# $FreeBSD: ports/Mk/bsd.php.mk,v 1.33 2006/09/11 21:10:07 ale Exp $
#
# Adding 'USE_PHP=yes' to a port includes this Makefile after bsd.ports.pre.mk.
# If the port requires a predefined set of PHP extensions, they can be
@@ -229,7 +229,7 @@
# non-version specific components
_USE_PHP_ALL= bcmath bz2 calendar ctype curl dba dbase \
exif fileinfo filepro fribidi ftp gd gettext gmp \
- hash iconv imagick imap interbase ldap mbstring mcrypt \
+ hash iconv imap interbase ldap mbstring mcrypt \
mhash ming mssql mysql ncurses odbc \
openssl panda pcntl pcre pdf pgsql posix \
pspell radius readline recode session shmop snmp \
@@ -263,7 +263,6 @@
gmp_DEPENDS= math/php${PHP_VER}-gmp
hash_DEPENDS= security/pecl-hash
iconv_DEPENDS= converters/php${PHP_VER}-iconv
-imagick_DEPENDS=graphics/pecl-imagick
imap_DEPENDS= mail/php${PHP_VER}-imap
interbase_DEPENDS= databases/php${PHP_VER}-interbase
ldap_DEPENDS= net/php${PHP_VER}-ldap
==== //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#84 (text+ko) ====
@@ -1,7 +1,7 @@
#-*- mode: makefile; tab-width: 4; -*-
# ex:ts=4
#
-# $FreeBSD: ports/Mk/bsd.port.mk,v 1.540 2006/08/14 13:24:18 erwin Exp $
+# $FreeBSD: ports/Mk/bsd.port.mk,v 1.541 2006/09/15 06:57:07 linimon Exp $
# $NetBSD: $
#
# bsd.port.mk - 940820 Jordan K. Hubbard.
@@ -72,6 +72,9 @@
# PKGNAMEPREFIX - Prefix to specify that port is language-specific, etc.
# Optional.
# PKGNAMESUFFIX - Suffix to specify compilation options. Optional.
+# PKGVERSION - Always defined as
+# ${PORTVERSION}.
+# Do not define this in your Makefile.
# UNIQUENAME - A name for your port that is globally unique. By default,
# this is set to ${LATEST_LINK} when LATEST_LINK is set,
# and to ${PKGNAMEPREFIX}${PORTNAME} otherwise.
@@ -434,6 +437,12 @@
# or http://www.FreeBSD.org/gnome/docs/porting.html
# for more details.
##
+# USE_LUA - If set, this port uses the Lua library and related
+# components. See bsd.lua.mk for more details.
+##
+# USE_WX - If set, this port uses the WxWidgets library and related
+# components. See bsd.wx.mk for more details.
+##
# USE_KDEBASE_VER
# - Set to 3 to use the KDE windowing system.
# Implies inclusion of bsd.kde.mk.
@@ -1326,8 +1335,11 @@
# check for old, crufty, makefile types, part 2. The "else" case
# should have been handled in part 1, above.
+.if !defined(PKGVERSION)
+PKGVERSION= ${PORTVERSION:C/[-_,]/./g}${_SUF1}${_SUF2}
+.endif
.if !defined(PKGNAME)
-PKGNAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION:C/[-_,]/./g}${_SUF1}${_SUF2}
+PKGNAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PKGVERSION}
.endif
DISTNAME?= ${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION:C/:(.)/\1/g}${DISTVERSIONSUFFIX}
@@ -1520,6 +1532,10 @@
.include "${PORTSDIR}/Mk/bsd.gnome.mk"
.endif
+.if defined(WANT_LUA) || defined(USE_LUA) || defined(USE_LUA_NOT)
+.include "${PORTSDIR}/Mk/bsd.lua.mk"
+.endif
+
.if defined(WANT_WX) || defined(USE_WX) || defined(USE_WX_NOT)
.include "${PORTSDIR}/Mk/bsd.wx.mk"
.endif
@@ -2030,6 +2046,10 @@
.include "${PORTSDIR}/Mk/bsd.tcl.mk"
.endif
+.if defined(USE_LUA) || defined(USE_LUA_NOT)
+.include "${PORTSDIR}/Mk/bsd.lua.mk"
+.endif
+
.if defined(USE_WX) || defined(USE_WX_NOT)
.include "${PORTSDIR}/Mk/bsd.wx.mk"
.endif
@@ -4761,7 +4781,7 @@
@for dir in $$(${ALL-DEPENDS-LIST}); do \
THISORIGIN=$$(${ECHO_CMD} $$dir | ${SED} 's,${PORTSDIR}/,,'); \
installed=$$(${PKG_INFO} -qO $${THISORIGIN}); \
- if [ -z $$installed ]; then \
+ if [ -z "$$installed" ]; then \
${ECHO_CMD} $$THISORIGIN; \
fi \
done
==== //depot/projects/soc2006/gabor_ports/Mk/bsd.python.mk#6 (text+ko) ====
@@ -1,7 +1,7 @@
# -*- mode: Makefile; tab-width: 4; -*-
# ex: ts=4
#
-# $FreeBSD: ports/Mk/bsd.python.mk,v 1.81 2006/08/04 12:34:41 erwin Exp $
+# $FreeBSD: ports/Mk/bsd.python.mk,v 1.82 2006/09/13 16:26:49 perky Exp $
#
.if !defined(_POSTMKINCLUDED) && !defined(Python_Pre_Include)
@@ -298,7 +298,7 @@
# Python-2.5
.if ${PYTHON_VERSION} == "python2.5"
-PYTHON_PORTVERSION?=2.5.b3
+PYTHON_PORTVERSION?=2.5.c2
PYTHON_PORTSDIR= ${PORTSDIR}/lang/python-devel
PYTHON_REL= 250
PYTHON_SUFFIX= 25
@@ -355,8 +355,8 @@
.if defined(PYTHON_REL) && ${PYTHON_REL} == 250
PYTHON_MASTER_SITES= ${MASTER_SITE_PYTHON}
PYTHON_MASTER_SITE_SUBDIR= ftp/python/2.5
-PYTHON_DISTFILE= Python-${PYTHON_PORTVERSION:S/5.b/5b/}.tgz
-PYTHON_WRKSRC= ${WRKDIR}/Python-${PYTHON_PORTVERSION:S/5.b/5b/}
+PYTHON_DISTFILE= Python-${PYTHON_PORTVERSION:S/5.c/5c/}.tgz
+PYTHON_WRKSRC= ${WRKDIR}/Python-${PYTHON_PORTVERSION:S/5.c/5c/}
.else
PYTHON_MASTER_SITES= ${MASTER_SITE_PYTHON}
PYTHON_MASTER_SITE_SUBDIR= ftp/python/${PYTHON_PORTVERSION}
==== //depot/projects/soc2006/gabor_ports/Mk/bsd.ruby.mk#5 (text+ko) ====
@@ -3,7 +3,7 @@
#
# Created by: Akinori MUSHA <knu at FreeBSD.org>
#
-# $FreeBSD: ports/Mk/bsd.ruby.mk,v 1.153 2006/08/04 12:34:41 erwin Exp $
+# $FreeBSD: ports/Mk/bsd.ruby.mk,v 1.154 2006/08/27 09:53:27 sem Exp $
#
.if !defined(Ruby_Include)
@@ -136,7 +136,7 @@
RUBY?= ${LOCALBASE}/bin/${RUBY_NAME}
.if defined(RUBY_VER) && ${RUBY_VER} == 1.8
-RUBY_VERSION?= 1.8.4
+RUBY_VERSION?= 1.8.5
#RUBY_DISTVERSION?= ${RUBY_VERSION}
#RUBY_PATCHFILES?= ruby-${RUBY_DISTVERSION}-yyyy.mm.dd.diff.bz2
==== //depot/projects/soc2006/gabor_ports/Mk/bsd.scons.mk#7 (text+ko) ====
@@ -1,15 +1,15 @@
#-*- mode: Makefile; tab-width: 4; -*-
# ex:ts=4
#
-# $FreeBSD: ports/Mk/bsd.scons.mk,v 1.6 2006/08/04 12:34:41 erwin Exp $
+# $FreeBSD: ports/Mk/bsd.scons.mk,v 1.8 2006/09/15 08:06:12 linimon Exp $
#
# bsd.scons.mk - Python-based SCons build system interface.
-# Author: Alexander Botero-Lowry <alex at foxybanana.com>
+# Author: Alexander Botero-Lowry <alexbl at FreeBSD.org>
#
# Please view me with 4 column tabs!
# Please make sure all changes to this file are passed through the maintainer.
-SCONS_MAINTAINER= alex at foxybanana.com
+SCONS_MAINTAINER= alexbl at FreeBSD.org
#
# SCONS_BIN is the location where the scons port installs the scons
@@ -57,7 +57,7 @@
SCONS_ENV?= CCFLAGS="${CCFLAGS}" CXXFLAGS="${CXXFLAGS}" \
LINKFLAGS="${LINKFLAGS}" PKGCONFIGDIR="${PKGCONFIGDIR}" \
CPPPATH="${CPPPATH}" LIBPATH="${LIBPATH}" PREFIX="${PREFIX}" \
- DESTDIR="${DESTDIR}" CC="${CC}" CXX="${CXX}"
+ CC="${CC}" CXX="${CXX}"
SCONS_ARGS?=
SCONS_BUILDENV?=
SCONS_TARGET?=
==== //depot/projects/soc2006/gabor_ports/Mk/bsd.sites.mk#9 (text+ko) ====
@@ -20,7 +20,7 @@
#
# Note: all entries should terminate with a slash.
#
-# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.396 2006/08/09 11:45:43 sat Exp $
+# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.398 2006/09/12 14:23:12 kuriyama Exp $
#
# Where to put distfiles that don't have any other master site
@@ -981,7 +981,7 @@
.endif
.if !defined(IGNORE_MASTER_SITE_SOURCEFORGE_JP)
-.for mirror in keihanna
+.for mirror in keihanna osdn qgpop
MASTER_SITE_SOURCEFORGE_JP+= \
http://${mirror}.dl.sourceforge.jp/%SUBDIR%/
.endfor
@@ -1294,15 +1294,22 @@
SOURCEFORGE:${PORTNAME:L} \
SOURCEFORGE_EXTENDED:${PORTNAME:L}
-.if defined(MASTER_SITES) && ${MASTER_SITES:N*/*}
+.if defined(MASTER_SITES) && ${MASTER_SITES:N*\:/*}
.for _site__ in ${MASTER_SITES}
_site_=${_site__}
-. if ${_site_:M*/*}
+. if ${_site_:M*\:/*}
MASTER_SITES_EXP+= ${_site_}
MASTER_SITES_EXP:= ${MASTER_SITES_EXP}
. else
-_site_url_= ${_site_:C@^(.*):[^/:]+$@\1@}
+_site_urlpath_= ${_site_:C@^(.*):[^/:]+$@\1@}
+. if ${_site_urlpath_:M*/*}
+_site_url_= ${_site_urlpath_:C@^([^/]+)/.*$@\1@}
+_site_subdir_= ${_site_urlpath_:S/^${_site_urlpath_:C@^([^/]+)/.*$@\1@}//:S!^/!!:S!/$!!}
+. else
+_site_url_= ${_site_urlpath_}
+.undef _site_subdir_
+. endif
_site_group_= ${_site_:S/^${_site_:C@^(.*):[^/:]+$@\1@}//:S/^://}
. for _abbrev_ in ${MASTER_SITES_ABBREVS}
. if ${_site_url_} == ${_abbrev_:C/:.*//}
@@ -1310,12 +1317,16 @@
. endif
. endfor
. for _subdir_ in ${MASTER_SITES_SUBDIRS}
-. if ${_site_url_} == ${_subdir_:C/:.*//}
-MASTER_SITE_SUBDIR?= ${_subdir_:C/.*://}
+. if ${_site_url_} == ${_subdir_:C/:.*//} && !defined(MASTER_SITE_SUBDIR)
+_site_subdir_?= ${_subdir_:C/.*://}
. endif
. endfor
. ifdef MASTER_SITE_${_site_url_}
+. ifdef _site_subdir_
+MASTER_SITES_EXP+= ${MASTER_SITE_${_site_url_}:S^%SUBDIR%^${_site_subdir_}^:S/$/:${_site_group_}/:S/:$//}
+. else
MASTER_SITES_EXP+= ${MASTER_SITE_${_site_url_}:S/$/:${_site_group_}/:S/:$//}
+. endif
MASTER_SITES_EXP:= ${MASTER_SITES_EXP}
. endif
. endif
==== //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/buildscript#2 (text+ko) ====
@@ -61,7 +61,6 @@
export PKG_PATH=/tmp/depends
if [ ! -z "${pkgs}" ]; then
arch=$(uname -m)
- umountprocfs ${arch}
echo "adding dependencies"
for i in $pkgs; do
echo "pkg_add $i"
@@ -76,7 +75,6 @@
fi
fi
done
- mountprocfs ${arch}
fi
}
@@ -141,6 +139,7 @@
if [ $phase = 1 ]; then
cd $dir || exit 1
+ echo "building for: $(uname -mr)"
echo "maintained by: $(make maintainer)"
echo "port directory: ${dir}"
echo "build started at $(date)"
@@ -170,6 +169,7 @@
./usr/local/etc/apache2
./usr/local/news
./usr/local/share/xml
+./usr/X11R6/etc/gconf
EOF
# Record a "pristine" mtree.
mtree -X /tmp/mtree.preexclude -xcn -k uid,gid,mode -p / > /tmp/mtree.pristine
@@ -234,6 +234,7 @@
./usr/local/etc/apache2
./usr/local/news
./usr/local/share/xml
+./usr/X11R6/etc/gconf
EOF
# Record a "pristine" mtree.
mtree -X /tmp/mtree.buildexclude -xcn -k uid,gid,mode -p / > /tmp/mtree.prebuild
@@ -258,7 +259,7 @@
/pnohang $TIMEOUT /tmp/make.log5 ${pkgname} make -k regression-test
cat /tmp/make.log5
- mtree -X /tmp/mtree.buildexclude -x -f /tmp/mtree.prebuild -p / | egrep -v "^(${L}/var|${X}/lib/X11/xserver/SecurityPolicy|${L}/share/nls/POSIX|${L}/share/nls/en_US.US-ASCII|etc/services|compat |${X} |etc/manpath.config|etc/.*.bak|${L}/info/dir|${X}/lib/X11/fonts/.*/fonts\.|usr/(X11R6|local)/man/..( |/man. )|${X}/lib/X11/fonts/TrueType )" > /tmp/list.preinstall
+ mtree -X /tmp/mtree.buildexclude -x -f /tmp/mtree.prebuild -p / | egrep -v "^(${L}/var|${X}/lib/X11/xserver/SecurityPolicy|${L}/share/nls/POSIX|${L}/share/nls/en_US.US-ASCII|etc/services|compat |${X} |etc/manpath.config|etc/.*.bak|${L}/info/dir|${X}/lib/X11/fonts/.*/fonts\.|usr/(X11R6|local)/man/..( |/man. )|${X}/lib/X11/fonts/TrueType|${X}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml )" > /tmp/list.preinstall
if [ -s /tmp/list.preinstall ]; then
echo "================================================================"
@@ -304,7 +305,7 @@
cleanup 7
fi
- mtree -X /tmp/mtree.exclude -x -f /tmp/mtree -p / | egrep -v "^(${L}/var|${X}/lib/X11/xserver/SecurityPolicy|${L}/share/nls/POSIX|${L}/share/nls/en_US.US-ASCII|etc/services|compat |${X} |etc/manpath.config|etc/.*.bak|${L}/info/dir|${X}/lib/X11/fonts/.*/fonts\.|usr/(X11R6|local)/man/..( |/man. )|${X}/lib/X11/fonts/TrueType )" > /tmp/list3
+ mtree -X /tmp/mtree.exclude -x -f /tmp/mtree -p / | egrep -v "^(${L}/var|${X}/lib/X11/xserver/SecurityPolicy|${L}/share/nls/POSIX|${L}/share/nls/en_US.US-ASCII|etc/services|compat |${X} |etc/manpath.config|etc/.*.bak|${L}/info/dir|${X}/lib/X11/fonts/.*/fonts\.|usr/(X11R6|local)/man/..( |/man. )|${X}/lib/X11/fonts/TrueType|${X}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml )" > /tmp/list3
# Compare the state of the filesystem now to before the 'make install' phase
dirty=0
==== //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/claim-chroot#2 (text+ko) ====
@@ -61,7 +61,7 @@
mkdir ${dir}/used 2>/dev/null || continue
touch ${dir}/used/${pkgname}
if [ -f ${dir}/.dirty ]; then
- ${pb}/scripts/clean-chroot ${arch} ${branch} ${dir} 2 &
+ ${pb}/scripts/clean-chroot ${arch} ${branch} ${dir} 2 >/dev/null 2>/dev/null &
continue
fi
found=1
==== //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/clean-chroot#2 (text+ko) ====
@@ -24,11 +24,11 @@
if [ -d ${chroot}${mount} ]; then
mdir=$(fstat -f ${chroot}${mount} | head -2 | tail -1 | awk '{print $5}')
if [ "${mdir}" = "MOUNT" ]; then
- umount ${chroot}${mount} || echo "Cleanup of ${chroot}${mount} failed!"
+ umount -f ${chroot}${mount} || echo "Cleanup of ${chroot}${mount} failed!"
fi
if [ "${mdir}" = "${chroot}${mount}" ]; then
kill_procs ${chroot} ${mount}
- umount ${chroot}${mount} || echo "Cleanup of ${chroot}${mount} failed!"
+ umount -f ${chroot}${mount} || echo "Cleanup of ${chroot}${mount} failed!"
fi
fi
}
==== //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/dopackages#2 (text+ko) ====
@@ -70,6 +70,7 @@
echo "generating duds"
echo "================================================"
echo "duds generation started at $(date)"
+ cp -p ${pb}/${arch}/${branch}/duds ${pb}/${arch}/${branch}/duds.old
if ! ${scripts}/makeduds ${arch} ${branch}; then
echo "error(s) detected, exiting script at $(date). Failed duds list was:"
cat ${pb}/${arch}/${branch}/duds
@@ -79,7 +80,6 @@
echo $(wc -l < ${pb}/${arch}/${branch}/duds) "items in duds"
echo "duds diff:"
diff ${pb}/${arch}/${branch}/duds.old ${pb}/${arch}/${branch}/duds
- cp -p ${pb}/${arch}/${branch}/duds ${pb}/${arch}/${branch}/duds.old
cp -p ${pb}/${arch}/${branch}/duds ${pb}/${arch}/${branch}/duds.orig
}
@@ -132,6 +132,8 @@
echo "ended archive of ${pb}/${arch}/${branch}/ports at $(date)"
}
+# XXX Should use SHA256 instead, but I'm not sure what consumes this file (if anything)
+# XXX Should generate these as the packages are copied in, instead of all at once at the end
# usage: generatemd5 pb branch
generatemd5 () {
pb=$1
@@ -293,8 +295,8 @@
cd ${PORTSDIR}
cvs -qR update -PAd
# XXX Check for conflicts
+ date > ${pb}/${arch}/${branch}/cvsdone
fi
- date > ${pb}/${arch}/${branch}/cvsdone
if [ "$nocvs" = 0 ]; then
echo "================================================"
@@ -312,15 +314,18 @@
make checksubdirs
# this one not run in background to check return status
+ # XXX Return status not checked!
if [ "$noduds" = 0 ]; then
makeduds ${pb} ${arch} ${scripts} ${branch}
fi
- echo "================================================"
- echo "pruning stale entries from the failed ports list"
- echo "================================================"
- # Adding BROKEN ports to duds causes this to remove everything from failure list
- #lockf -k ${pb}/${arch}/${branch}/failure.lock ${scripts}/prunefailure ${arch} ${branch}
+ if [ "$trybroken" = 1 ]; then
+ echo "================================================"
+ echo "pruning stale entries from the failed ports list"
+ echo "================================================"
+ cp ${pb}/${arch}/${branch}/failure ${pb}/${arch}/${branch}/newfailure ${pb}/${arch}/${branch}/bak
+ lockf -k ${pb}/${arch}/${branch}/failure.lock ${scripts}/prunefailure ${arch} ${branch}
+ fi
if [ "$noindex" = 0 ]; then
makeindex ${pb} ${arch} ${scripts} ${branch}
@@ -346,27 +351,58 @@
cdromlist ${pb} ${arch} ${scripts} ${branch} &
fi
- ${scripts}/makeparallel ${arch} ${branch}
+ ${scripts}/makeparallel ${arch} ${branch} &
- cd ${pb}/${arch}
- mkdir -p ${pb}/${arch}/${branch}/bak
- cd ${pb}/${arch}/${branch}/bak
- rm -rf errors logs packages old-errors
cd ${pb}/${arch}/${branch}
- mv make.* tarballs/ports.tar.gz bak
+ mkdir -p bak
+ rm -rf bak/packages bak/old-errors
+ mv make.* bak
+
+ olderrors=$(readlink ${pb}/${arch}/${branch}/errors)
+ oldlogs=$(readlink ${pb}/${arch}/${branch}/logs)
+
+ newerrors=${pb}/${arch}/archive/errorlogs/e.${branch}.${date}
+ newlogs=${pb}/${arch}/archive/errorlogs/a.${branch}.${date}
- cd ${pb}/${arch}/${branch}
- cp -rp errors logs old-errors bak
+ # Cycle out the previous symlinks
+ # For now the bak/errors may be a directory, so fall back to removing it if we fail to
+ # remove it as a symlink
+ rm -f bak/errors || rm -rf bak/errors
+ rm -f bak/logs || rm -rf bak/logs
+ mv errors logs bak
- shortdate=$(echo ${date} | sed -e 's/..$//')
+ # Create new log directories for archival
+ rm -rf ${newerrors}
+ mkdir -p ${newerrors}/old-errors
+ ln -sf ${newerrors} ${pb}/${arch}/${branch}/errors
+ rm -rf ${newlogs}
+ mkdir -p ${newlogs}
+ ln -sf ${newlogs} ${pb}/${arch}/${branch}/logs
+
+ echo "error logs in ${newerrors}"
+ cp -p ${pb}/${arch}/${branch}/cvsdone ${newerrors}/cvsdone
+ cp -p ${pb}/${arch}/${branch}/cvsdone ${newlogs}/cvsdone
+ cp -p ${pb}/${arch}/${branch}/ports/${INDEXFILE} ${newerrors}/INDEX
+ cp -p ${pb}/${arch}/${branch}/ports/${INDEXFILE} ${newlogs}/INDEX
if [ "$incremental" = 1 ]; then
- # need to preserve symlinks for packages
+ # XXX Don't do this for space reasons
+ # XXX Could be replaced by hardlinks?
#tar cf - packages | tar xfC - bak
- cd ${PORTSDIR}
+ # Copy back in the restricted ports that were saved after the previous build
+ cd ${pb}/${arch}/${branch}
+ if [ -d bak/restricted/ ]; then
+ tar cfC - bak/restricted/ packages/ | tar xfpP -
+ fi
+
+ # Create hardlinks to previous set of logs
+ cd ${oldlogs} && find . | cpio -dumpl ${newlogs}
+ cd ${olderrors} && find . | cpio -dumpl ${newerrors}
# Identify the ports that have changed and need to be removed before rebuilding
+ # XXX Need to also remove stale distfiles
+ cd ${PORTSDIR}
cut -f 1,2,3,8,9,11,12,13 -d \| ${INDEXFILE}.old | sort > ${INDEXFILE}.old1
cut -f 1,2,3,8,9,11,12,13 -d \| ${INDEXFILE} | sort > ${INDEXFILE}.1
comm -2 -3 ${INDEXFILE}.old1 ${INDEXFILE}.1 | cut -f 1 -d \| > ${pb}/${arch}/${branch}/.oldports
@@ -381,42 +417,20 @@
cd ${pb}/${arch}/${branch}/errors/
sed "s,\$,.log," ${pb}/${arch}/${branch}/.oldports | xargs rm -f
sed "s,\$,.log.bz2," ${pb}/${arch}/${branch}/.oldports | xargs rm -f
- find . -name \*.log.bz2 | xargs bunzip2 -f
cd ${pb}/${arch}/${branch}/logs/
sed 's,$,.log,' ${pb}/${arch}/${branch}/.oldports | xargs rm -f
sed 's,$,.log.bz2,' ${pb}/${arch}/${branch}/.oldports | xargs rm -f
- find . -name \*.log.bz2 | xargs bunzip2 -f
else
- # need to preserve symlinks for packages
+ cd ${pb}/${arch}/${branch}
+
+ # XXX Don't do this for space reasons
#mv -f packages bak
-
- # Already copied the logs above
- rm -rf errors logs old-errors
-
- cd ${pb}/${arch}/${branch}
+ rm -rf packages
mkdir -p packages/All
rm -rf distfiles/
mkdir -p distfiles/
-
- mkdir -p ${pb}/${arch}/archive/errorlogs
- rm -rf ${pb}/${arch}/archive/errorlogs/e.${branch}.${date} ${pb}/${arch}/archive/errorlogs/e.${branch}.${shortdate}
- mkdir -p ${pb}/${arch}/archive/errorlogs/e.${branch}.${date}
- ln -sf ${pb}/${arch}/archive/errorlogs/e.${branch}.${date} ${pb}/${arch}/${branch}/errors
- ln -sf e.${branch}.${date} ${pb}/${arch}/archive/errorlogs/e.${branch}.${shortdate}
- mkdir -p ${pb}/${arch}/${branch}/errors/old-errors
- rm -rf ${pb}/${arch}/archive/errorlogs/a.${branch}.${date} ${pb}/${arch}/archive/errorlogs/a.${branch}.${shortdate}
- mkdir -p ${pb}/${arch}/archive/errorlogs/a.${branch}.${date}
- ln -sf ${pb}/${arch}/archive/errorlogs/a.${branch}.${date} ${pb}/${arch}/${branch}/logs
- ln -sf a.${branch}.${date} ${pb}/${arch}/archive/errorlogs/a.${branch}.${shortdate}
-
- echo "error logs in ${pb}/${arch}/archive/errorlogs/e.${branch}.${date}"
- cp -p ${pb}/${arch}/${branch}/cvsdone ${pb}/${arch}/archive/errorlogs/e.${branch}.${date}/cvsdone
- cp -p ${pb}/${arch}/${branch}/cvsdone ${pb}/${arch}/archive/errorlogs/a.${branch}.${date}/cvsdone
- cp -p ${pb}/${arch}/${branch}/ports/${INDEXFILE} ${pb}/${arch}/archive/errorlogs/e.${branch}.${date}/INDEX
- cp -p ${pb}/${arch}/${branch}/ports/${INDEXFILE} ${pb}/${arch}/archive/errorlogs/a.${branch}.${date}/INDEX
-
fi
fi
@@ -461,10 +475,15 @@
grep -E '(ptimeout|pnohang): killing' make.0 | sed -e 's/^.*ptimeout:/ptimeout:/' -e 's/^.*pnohang:/pnohang:/'
fi
- ls -asFlrt ${pb}/${arch}/${branch}/packages/All > ${pb}/${arch}/${branch}/logs/ls-lrt-1
- cp -rp errors old-errors
- cd ${pb}/${arch}/${branch}/old-errors
- ${scripts}/processlogs
+ ls -asFlrt ${pb}/${arch}/${branch}/packages/All > ${pb}/${arch}/${branch}/logs/ls-lrt
+
+ # XXX Is there any point in keeping a second copy of the phase 1 errors?
+ cd ${pb}/${arch}/${branch}/errors/
+ find . -name '*.log' | cpio -dumpl ${pb}/${arch}/${branch}/errors/old-errors
+
+# XXX What is the point of the old-errors/ directory (not errors/old-errors/)?
+# cd ${pb}/${arch}/${branch}/old-errors
+# ${scripts}/processlogs
echo "================================================"
echo "setting up nodes"
@@ -516,6 +535,13 @@
if [ "$nofinish" = 0 ]; then
rm -f Makefile
+ if [ "$norestr" = 0 ]; then
+ # Before deleting restricted packages, save a copy so we don't have to rebuild them next time
+ ${pb}/scripts/keeprestr ${arch} ${branch}
+ else
+ rm -rf ${pb}/${arch}/${branch}/bak/restricted/
+ fi
+
# Always delete restricted packages/distfiles since they're published on the
# website
echo "deleting restricted ports"
@@ -530,6 +556,7 @@
${scripts}/prunepkgs ${pb}/${arch}/${branch}/ports/${INDEXFILE} ${pb}/${arch}/${branch}/packages
fi
+# XXX Checking for bad packages should be done after the package is uploaded
#rm -rf ${pb}/${arch}/${branch}/bad
#mkdir -p ${pb}/${arch}/${branch}/bad
#echo "checking packages"
@@ -543,18 +570,11 @@
#done
if [ "$nofinish" = 0 ]; then
+ generatemd5 ${pb} ${arch} ${branch} &
+
# Remove INDEX entries for packages that do not exist
${scripts}/chopindex ${pb}/${arch}/${branch}/ports/${INDEXFILE} ${pb}/${arch}/${branch}/packages > ${pb}/${arch}/${branch}/packages/INDEX
- cd ${pb}/${arch}/${branch}/old-errors
- for i in *.log; do
- cp -p ${i} ${pb}/${arch}/${branch}/errors/old-errors;
- done
-
- #archiveports ${pb} ${arch} ${branch} &
- generatemd5 ${pb} ${arch} ${branch} &
- wait
-
ls -asFlrt ${pb}/${arch}/${branch}/packages/All > ${pb}/${arch}/${branch}/logs/ls-lrt
cp -p ${pb}/${arch}/${branch}/make.[01] ${pb}/${arch}/${branch}/logs
@@ -576,6 +596,8 @@
sh ${pb}/${arch}/${branch}/cdrom.sh
fi
+ wait
+
if [ "$branch" != "4-exp" ]; then
# Currently broken - kk
#su ${user} -c "${scripts}/cpdistfiles ${branch} > ${pb}/${arch}/${branch}/cpdistfiles.log 2>&1 </dev/null" &
==== //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/makeworld#2 (text+ko) ====
@@ -35,12 +35,13 @@
done
if [ "$client" = "1" ]; then
- cd ${pb}/${arch}/src-client
+ SRCBASE=${pb}/${arch}/src-client
shift 1
else
- cd ${pb}/${arch}/${branch}/src
+ SRCBASE=${pb}/${arch}/${branch}/src
export __MAKE_CONF=/dev/null
fi
+cd ${SRCBASE}
if [ "$nocvs" = "0" ]; then
echo "==> Updating source tree"
@@ -76,10 +77,15 @@
fi
echo "==> Starting make distribute"
- cd etc
- make obj
- make all
- make distribute DISTRIBUTION=/var/chroot/
+ if [ "$branch" = "5" ]; then
+ cd etc
+ make obj
+ make all
+ make distribute DISTRIBUTION=/var/chroot/
+ else
+ make DESTDIR=/var/chroot distrib-dirs && \
+ make DESTDIR=/var/chroot distribution
+ fi
error=$?
if [ "$error" != "0" ]; then
exit $error
==== //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/mkbindist#2 (text+ko) ====
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list