PERFORCE change 102919 for review
Gabor Kovesdan
gabor at FreeBSD.org
Tue Aug 1 13:08:25 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=102919
Change 102919 by gabor at gabor_spitfire on 2006/08/01 13:07:43
IFC
Affected files ...
.. //depot/projects/soc2006/gabor_ports/LEGAL#3 integrate
.. //depot/projects/soc2006/gabor_ports/Mk/bsd.gstreamer.mk#3 integrate
.. //depot/projects/soc2006/gabor_ports/Mk/bsd.linux-rpm.mk#3 integrate
.. //depot/projects/soc2006/gabor_ports/Mk/bsd.sites.mk#6 integrate
.. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/dopackages.wrapper#2 integrate
.. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/processonelog#4 integrate
.. //depot/projects/soc2006/gabor_ports/UPDATING#11 integrate
Differences ...
==== //depot/projects/soc2006/gabor_ports/LEGAL#3 (text+ko) ====
@@ -1,5 +1,5 @@
# Creator: Jordan Hubbard
-# $FreeBSD: ports/LEGAL,v 1.483 2006/07/21 23:13:13 sat Exp $
+# $FreeBSD: ports/LEGAL,v 1.486 2006/07/30 21:12:29 sat Exp $
**********************************************************************
*** NOTE TO COMMITTERS ***
@@ -66,6 +66,7 @@
asWedit-* www/aswedit Commercial software
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
@@ -378,6 +379,8 @@
libots-*.alpha.rpm lang/compaq-cc Distribution not allowed
libSDLx11.so.tar.gz multimedia/mtv No redistribution
LimeWireLinux.tgz net-p2p/limewire No redistribution allowed
+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
@@ -453,8 +456,7 @@
openssl-* security/openssl Crypto; export/import-controlled
opera-* www/linux-opera No redistribution, commercial
software
-optimfrog-* audio/optimfrog No commercial use, no distribution
- of a modified package
+optimfrog-* audio/optimfrog No commercial use
oracle/* databases/jdbc-oracle* This software is under license
and export controls
otojiro*.txt japanese/otojiro-fpw The original dictionary is not free
==== //depot/projects/soc2006/gabor_ports/Mk/bsd.gstreamer.mk#3 (text+ko) ====
@@ -6,7 +6,7 @@
# Created by: Michael Johnson <ahze at FreeBSD.org>
# Date: 4 Oct 2004
#
-# $FreeBSD: ports/Mk/bsd.gstreamer.mk,v 1.21 2006/07/05 02:18:08 linimon Exp $
+# $FreeBSD: ports/Mk/bsd.gstreamer.mk,v 1.22 2006/08/01 04:52:35 ahze Exp $
# $MCom: ports/Mk/bsd.gstreamer.mk,v 1.24 2006/04/25 14:45:31 ahze Exp $
.if !defined(_POSTMKINCLUDED) && !defined(Gstreamer_Pre_Include)
@@ -64,7 +64,7 @@
dv dvd esound faac faad ffmpeg flac gconf gnomevfs \
gnonlin good gsm ivorbis jpeg ladspa lame libcaca \
libmms libpng libvisual mad mpeg2dec \
- musepack ogg pango sdl shout2 sidplay \
+ musepack ogg pango python sdl shout2 sidplay \
speex theora ugly vorbis wavpack xvid
_USE_GSTREAMER80_ALL= a52dec aalib artsd audiofile cairo cdaudio cdio cdparanoia \
dirac dts dv dvd esound faac faad ffmpeg flac \
@@ -72,7 +72,7 @@
jpeg-mmx ladspa lame libcaca libfame libmms libmng \
libpng libvisual mad mikmod mpeg2dec mpeg2enc mplex \
musepack musicbrainz nas sdl shout shout2 sidplay \
- smoothwave sndfile speex theora ogg pango polyp \
+ smoothwave sndfile speex theora ogg pango polyp python \
swfdec vorbis wavpack x264 xvid
# other plugins
OTHER_GSTREAMER_PLUGINS+= core yes
@@ -210,6 +210,15 @@
mplex_DEPENDS= multimedia/gstreamer-plugins-mplex
+python_DEPENDS= multimedia/py-gstreamer
+python_NAME= gstreamer
+python_GST80_SUFX= 80
+python_GST80_PREFIX= ${PYTHON_PKGNAMEPREFIX}
+python_GST_PREFIX= ${PYTHON_PKGNAMEPREFIX}
+python_GST_SUFX= # empty
+python_GST80_VERSION= 0.8.2
+python_GST_VERSION= 0.10.4
+
theora_DEPENDS= multimedia/gstreamer-plugins-theora
ugly_DEPENDS= multimedia/gstreamer-plugins-ugly
==== //depot/projects/soc2006/gabor_ports/Mk/bsd.linux-rpm.mk#3 (text+ko) ====
@@ -1,7 +1,7 @@
#-*- mode: Makefile; tab-width: 4; -*-
# ex:ts=4
#
-# $FreeBSD: ports/Mk/bsd.linux-rpm.mk,v 1.8 2006/07/13 12:35:12 bsam Exp $
+# $FreeBSD: ports/Mk/bsd.linux-rpm.mk,v 1.9 2006/07/30 22:34:30 sat Exp $
#
# Variables:
@@ -65,11 +65,13 @@
DIST_SUBDIR?= rpm/${LINUX_RPM_ARCH}/${LINUX_DIST}/${LINUX_DIST_VER}
. if ${LINUX_DIST} == "fedora"
+. ifndef MASTER_SITES
MASTER_SITES?= ${MASTER_SITE_FEDORA_LINUX}
MASTER_SITE_SUBDIR?= ${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/os/Fedora/RPMS \
updates/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}
MASTER_SITE_SRC_SUBDIR?= ${LINUX_DIST_VER}/SRPMS \
updates/${LINUX_DIST_VER}/SRPMS
+. endif
. else
IGNORE= unknown LINUX_DIST in port Makefile
. endif
==== //depot/projects/soc2006/gabor_ports/Mk/bsd.sites.mk#6 (text+ko) ====
@@ -20,7 +20,7 @@
#
# Note: all entries should terminate with a slash.
#
-# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.390 2006/07/25 16:11:37 jmelo Exp $
+# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.392 2006/07/30 22:22:50 sat Exp $
#
# Where to put distfiles that don't have any other master site
@@ -115,6 +115,13 @@
ftp://ftp.uu.net/usenet/comp.sources.%SUBDIR%/
.endif
+.if !defined(IGNORE_MASTER_SITE_CSME)
+MASTER_SITE_CSME+= \
+ http://bsd1.csme.ru/%SUBDIR%/ \
+ http://bsd2.csme.ru/%SUBDIR%/ \
+ http://bsd3.csme.ru/%SUBDIR%/
+.endif
+
.if !defined(IGNORE_MASTER_SITE_DEBIAN)
MASTER_SITE_DEBIAN+= \
http://www.gtlib.cc.gatech.edu/pub/debian/%SUBDIR%/ \
@@ -1217,3 +1224,53 @@
http://xorg.freedesktop.org/%SUBDIR%/ \
ftp://ftp.x.org/pub/%SUBDIR%/
.endif
+
+# Macro magic
+
+MASTER_SITES_ABBREVS= CPAN:PERL_CPAN SF:SOURCEFORGE SFE:SOURCEFORGE_EXTENDED
+MASTER_SITES_SUBDIRS= \
+ APACHE_JAKARTA:${PORTNAME:S,-,/,}/source \
+ BERLIOS:${PORTNAME:L} \
+ CSME:myports \
+ DEBIAN:pool/main/${PORTNAME:C/^((lib)?.).*$/\1/}/${PORTNAME} \
+ GCC:releases/${DISTNAME} \
+ GNOME:sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} \
+ MOZDEV:${PORTNAME:L} \
+ PERL_CPAN:${PORTNAME:C/-.*//} \
+ PNET:${PNET_MASTER_SITE_SUBDIR} \
+ PYTHON:${PYTHON_MASTER_SITE_SUBDIR} \
+ RUBY_DBI:${RUBY_DBI_MASTER_SITE_SUBDIR} \
+ RUBY_GNOME:${RUBY_GNOME_MASTER_SITE_SUBDIR} \
+ SAVANNAH:${PORTNAME:L} \
+ SOURCEFORGE:${PORTNAME:L} \
+ SOURCEFORGE_EXTENDED:${PORTNAME:L}
+
+.if defined(MASTER_SITES) && ${MASTER_SITES:N*/*}
+
+.for _site__ in ${MASTER_SITES}
+_site_=${_site__}
+. if ${_site_:M*/*}
+MASTER_SITES_EXP+= ${_site_}
+MASTER_SITES_EXP:= ${MASTER_SITES_EXP}
+. else
+_site_url_= ${_site_:C@^(.*):[^/:]+$@\1@}
+_site_group_= ${_site_:S/^${_site_:C@^(.*):[^/:]+$@\1@}//:S/^://}
+. for _abbrev_ in ${MASTER_SITES_ABBREVS}
+. if ${_site_url_} == ${_abbrev_:C/:.*//}
+_site_url_= ${_abbrev_:C/.*://}
+. endif
+. endfor
+. for _subdir_ in ${MASTER_SITES_SUBDIRS}
+. if ${_site_url_} == ${_subdir_:C/:.*//}
+MASTER_SITE_SUBDIR?= ${_subdir_:C/.*://}
+. endif
+. endfor
+. ifdef MASTER_SITE_${_site_url_}
+MASTER_SITES_EXP+= ${MASTER_SITE_${_site_url_}:S/$/:${_site_group_}/:S/:$//}
+MASTER_SITES_EXP:= ${MASTER_SITES_EXP}
+. endif
+. endif
+.endfor
+MASTER_SITES= ${MASTER_SITES_EXP}
+
+.endif
==== //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/dopackages.wrapper#2 (text+ko) ====
@@ -17,12 +17,13 @@
. ${pb}/${arch}/portbuild.conf
-lock=${pb}/${arch}/lock
+lock=${pb}/${arch}/${branch}/lock
status=${pb}/${arch}/status
date=$(date '+%Y%m%d%H')
shortdate=$(date '+%Y%m%d')
if [ -e ${lock} ]; then
+ echo "Already locked."
exit 1
fi
==== //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/processonelog#4 (text+ko) ====
@@ -1,5 +1,5 @@
#!/bin/sh
-# $FreeBSD: ports/Tools/portbuild/scripts/processonelog,v 1.8 2006/07/08 21:38:55 linimon Exp $
+# $FreeBSD: ports/Tools/portbuild/scripts/processonelog,v 1.9 2006/07/31 20:05:12 linimon Exp $
#
# Read a single errorlogfile and output a line of the format
# $filename|$portname|$affected|$logsize|$dir|$maintainer|\
@@ -90,7 +90,7 @@
reason="runaway_process"; tag="runaway"
elif grep -q "pnohang: killing make package" $1; then
reason="runaway_process"; tag="runaway"
-elif grep -qE "pkg_add:.*(can't find enough temporary space|projected size of .* exceeds available free space)" $1; then
+elif grep -qE "pkg_(add|create):.*(can't find enough temporary space|projected size of .* exceeds available free space)" $1; then
reason="disk_full"; tag="df"
elif grep -qE '(parse error|too (many|few) arguments to|argument.*doesn.*prototype|incompatible type for argument|conflicting types for|undeclared \(first use (in |)this function\)|incorrect number of parameters|has incomplete type and cannot be initialized|error: storage size.* isn.t known)' $1; then
reason="compiler_error"; tag="cc"
==== //depot/projects/soc2006/gabor_ports/UPDATING#11 (text+ko) ====
@@ -6,6 +6,36 @@
time you update your ports collection, before attempting any port
upgrades.
+20060801:
+ AFFECTS: users of audio/libtunepimp and any port that depends on it
+ AUTHOR: clsung at FreeBSD.org
+
+ libtunepimp has been updated to 0.5. But it breaks some ports depend
+ on it such as audio/juk and audio/amarok. To fix this kind of problem,
+ try to install audio/libtunepimp-old, which is previous version of
+ audio/libtunepimp.
+
+20060731:
+ AFFECTS: users of graphics/GraphicsMagick
+ AUTHOR: mat at FreeBSD.org
+
+ In order to fix a symbol collision between GraphicsMagick and libtidy,
+ GraphicsMagick has been updated so that all its symbols are now prefixed with
+ 'Gm'. Consequently, all dependencies should be upgraded when you perform this
+ upgrade with this command :
+
+ portupgrade -rf graphics/GraphicsMagick
+
+20060729:
+ AFFECTS: users of net/nss_ldap
+ AUTHOR: tmclaugh at sdf.lonestar.org
+
+ The krb5_ccname option in ldap.conf has been fixed in the port so that it
+ now works. Please be aware of this when updating if you have it in your
+ config and are using GSSAPI when use_sasl is enabled. Using GSSAPI with a
+ misconfigured krb5_ccname combined with one of the 'hard' bind_policy
+ options can effectivly lockout users.
+
20060728:
AFFECTS: users of polish/ekg and polish/ibgadu
AUTHOR: mwisnicki+freebsd at gmail.com
@@ -260,6 +290,12 @@
portupgrade -f -o emulators/linux_base-fc4 linux_base\*
portupgrade -f -o x11/linux-xorg-libs linux-XFree86-libs
+ You need to make sure that you have not changed the sysctl
+ compat.linux.osrelease. FC4 behaves differently depending on the
+ content of this sysctl. Only the default value of this sysctl is
+ supported. In case of problems also revert to the default of the
+ compat.linux.osname if changed.
+
In case "printenv | grep LD_" prints something, e.g., LD_LIBRARY_PATH
or LD_PRELOAD, you have to make sure it is not set when starting
linux programs, else FreeBSD libraries will be picked up and the
@@ -3914,4 +3950,4 @@
2) Update all p5-* modules.
portupgrade -f p5-\*
-$FreeBSD: ports/UPDATING,v 1.371 2006/07/28 17:19:34 itetcu Exp $
+$FreeBSD: ports/UPDATING,v 1.375 2006/08/01 01:51:47 clsung Exp $
More information about the p4-projects
mailing list