Date: Tue, 18 Jul 2006 15:41:18 GMT From: Gabor Kovesdan <gabor@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 101854 for review Message-ID: <200607181541.k6IFfIr1069294@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=101854 Change 101854 by gabor@gabor_spitfire on 2006/07/18 15:41:12 IFC Affected files ... .. //depot/projects/soc2006/gabor_ports/CHANGES#4 integrate .. //depot/projects/soc2006/gabor_ports/MOVED#7 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#37 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.scons.mk#4 integrate .. //depot/projects/soc2006/gabor_ports/Tools/scripts/addport#3 integrate .. //depot/projects/soc2006/gabor_ports/UPDATING#7 integrate Differences ... ==== //depot/projects/soc2006/gabor_ports/CHANGES#4 (text+ko) ==== @@ -10,6 +10,18 @@ All ports committers are allowed to commit to this file. +20070717: +AUTHOR: portmgr@FreeBSD.org +The following functional changes were made to bsd.port.mk: + + * Introduces IA32_BINARY_PORT for certain cases where a given port fetches + and installs compiled i386 binaries. + + * Adds some infrastructure for support of 32-bit i386 apps on amd64. + + * Again fix USE_LDCONFIG logic to make it work with non-default PREFIX to + fix bug introduced in previous revision. + 20070705: AUTHOR: portmgr@FreeBSD.org The following functional changes were made to bsd.port.mk: @@ -1103,4 +1115,4 @@ Contact Erwin Lansing if you have any questions about your use of this document. -$FreeBSD: ports/CHANGES,v 1.54 2006/07/05 02:18:27 linimon Exp $ +$FreeBSD: ports/CHANGES,v 1.55 2006/07/18 04:13:11 linimon Exp $ ==== //depot/projects/soc2006/gabor_ports/MOVED#7 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1094 2006/07/12 14:15:55 rafan Exp $ +# $FreeBSD: ports/MOVED,v 1.1099 2006/07/18 05:05:37 marcus Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -2411,3 +2411,13 @@ japanese/phpgroupware||2006-04-10|removed at mainter request (because broken and vulnerabilities) www/p5-Catalyst|www/p5-Catalyst-Runtime|2006-07-10|follow CPAN split of package textproc/p5-JSON-Syck|textproc/p5-YAML-Syck|2006-07-12|The textproc/p5-YAML-Syck port now includes JSON functionality +sysutils/ledit||2006-07-14|Has expired: Does not build +x11/settitle||2006-07-14|Has expired: Download unavailable anymore +net-im/simicq|net-im/sim-im|2006-07-15|renamed +cad/gschem|cad/geda-gschem|2006-07-16|renamed +cad/gnetlist|cad/geda-netlist|2006-07-16|renamed +misc/matrix-kmod||2006-07-17|Has expired: Unfetchable +net/ethereal|net/wireshark|2006-07-17|Project name has changed +net/ethereal-lite|net/wireshark-lite|2006-07-17|Project name has changed +net/tethereal|net/tshark|2006-07-17|Project name has changed +net/tethereal-lite|net/tshark-lite|2006-07-17|Project name has changed ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#37 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.port.mk,v 1.537 2006/07/06 17:56:45 linimon Exp $ +# $FreeBSD: ports/Mk/bsd.port.mk,v 1.538 2006/07/18 04:12:51 linimon Exp $ # $NetBSD: $ # # bsd.port.mk - 940820 Jordan K. Hubbard. @@ -1152,7 +1152,7 @@ .elif exists(${DESTDIR}/usr/src/sys/sys/param.h) OSVERSION!= ${AWK} '/^\#define __FreeBSD_version/ {print $$3}' < ${DESTDIR}/usr/src/sys/sys/param.h .else -OSVERSION!= /sbin/sysctl -n kern.osreldate +OSVERSION!= ${SYSCTL} -n kern.osreldate .endif .endif @@ -1171,6 +1171,29 @@ MASTER_PORT?= .endif +# Check the compatibility layer for amd64/ia64 + +.if ${ARCH} == "amd64" || ${ARCH} =="ia64" +.if exists(/usr/lib32) +HAVE_COMPAT_IA32_LIBS?= YES +.endif +.if !defined(HAVE_COMPAT_IA32_KERN) +HAVE_COMPAT_IA32_KERN!= if ${SYSCTL} -a compat.ia32.maxvmem >/dev/null 2>&1; then echo YES; fi +.endif +.endif + +.if defined(IA32_BINARY_PORT) && ${ARCH} != "i386" +.if ${ARCH} == "amd64" || ${ARCH} == "ia64" +.if !defined(HAVE_COMPAT_IA32_KERN) +IGNORE= you need a kernel with compiled-in IA32 compatibility to use this port. +.elif !defined(HAVE_COMPAT_IA32_LIBS) +IGNORE= you need the 32-bit libraries installed under /usr/lib32 to use this port. +.endif +.else +IGNORE= you have to use i386 (or compatible) platform to use this port. +.endif +.endif + # If they exist, include Makefile.inc, then architecture/operating # system specific Makefiles, then local Makefile.local. @@ -3797,7 +3820,7 @@ .if ${USE_LDCONFIG:L} != "${PREFIX}/lib" @${ECHO_MSG} "===> Installing ldconfig configuration file" .if defined(NO_LDCONFIG_MTREE) - @${MKDIR} ${LDCONFIG_DIR} + @${MKDIR} ${PREFIX}/${LDCONFIG_DIR} .endif @${ECHO_CMD} ${USE_LDCONFIG} | ${TR} ' ' '\n' \ > ${PREFIX}/${LDCONFIG_DIR}/${UNIQUENAME} @@ -3827,7 +3850,7 @@ .endif @${ECHO_MSG} "===> Installing 32-bit ldconfig configuration file" .if defined(NO_LDCONFIG_MTREE) - @${MKDIR} ${LDCONFIG_32DIR} + @${MKDIR} ${PREFIX}/${LDCONFIG_32DIR} .endif @${ECHO_CMD} ${USE_LDCONFIG32} | ${TR} ' ' '\n' \ > ${PREFIX}/${LDCONFIG32_DIR}/${UNIQUENAME} ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.scons.mk#4 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: Makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.scons.mk,v 1.3 2006/07/05 19:53:27 linimon Exp $ +# $FreeBSD: ports/Mk/bsd.scons.mk,v 1.4 2006/07/13 22:10:39 alepulver Exp $ # # bsd.scons.mk - Python-based SCons build system interface. # Author: Alexander Botero-Lowry <alex@foxybanana.com> @@ -30,14 +30,16 @@ # Some scons projects may honor PKGCONFIGDIR, which tells them where to # look for, and install, pkgconfig files. # +# LIBPATH is the search path for libraries. Bring in some safe defaults. +# +# CPPPATH is the search path for includes, Again, bring in some safe defaults. +# CCFLAGS?= ${CFLAGS} LINKFLAGS?= ${LDFLAGS} PKGCONFIGDIR?= ${LOCALBASE}/libdata/pkgconfig +LIBPATH= ${LOCALBASE}/lib ${X11BASE}/lib +CPPPATH= ${LOCALBASE}/include ${X11BASE}/include -CCFLAGS+= -I${LOCALBASE}/include -CXXFLAGS+= -I${LOCALBASE}/include -LINKFLAGS+= -L${LOCALBASE}/lib - # # SCONS_ENV is where we pass all the stuff that should be the # same for any scons port to scons. Things like CCFLAGS, and LINKFLAGS @@ -53,8 +55,9 @@ # argument to scons. # SCONS_ENV?= CCFLAGS="${CCFLAGS}" CXXFLAGS="${CXXFLAGS}" \ - LINKFLAGS="${LINKFLAGS}" PKGCONFIGDIR="${PKGCONFIGDIR}" \ - PREFIX="${DESTDIR}${PREFIX}" CC="${CC}" CXX="${CXX}" + LINKFLAGS="${LINKFLAGS}" PKGCONFIGDIR="${PKGCONFIGDIR}" \ + CPPPATH="${CPPPATH}" LIBPATH="${LIBPATH}" PREFIX="${PREFIX}" \ + DESTDIR="${DESTDIR}" CC="${CC}" CXX="${CXX}" SCONS_ARGS?= SCONS_BUILDENV?= SCONS_TARGET?= ==== //depot/projects/soc2006/gabor_ports/Tools/scripts/addport#3 (text+ko) ==== @@ -32,7 +32,7 @@ # # Id: addport,v 1.2 2000/04/02 06:21:13 will Exp (original shell script) # Id: addport,v 1.5 2000/04/22 22:19:43 mharo Exp (perl conversion) -# $FreeBSD: ports/Tools/scripts/addport,v 1.49 2006/07/04 23:12:10 garga Exp $ +# $FreeBSD: ports/Tools/scripts/addport,v 1.50 2006/07/14 01:49:35 shaun Exp $ # # MAINTAINER= garga@FreeBSD.org # @@ -57,12 +57,13 @@ my %opts; -getopts('ac:d:fgh:il:L:M:mns:tu:', \%opts); +getopts('abc:d:fgh:il:L:M:mns:tu:', \%opts); my $autofill_l = $opts{'l'}; my $autofill_L = $opts{'L'}; my $autofill = ($autofill_l ? $autofill_l : $autofill_L); my $c = $opts{'c'} if ($opts{'c'} ne ""); +my $binfiles = $opts{'b'}; my $nomodules = $opts{'g'}; my $distdir = $opts{'s'} if ($opts{'s'} ne ""); my $dir = $opts{'d'}; @@ -321,7 +322,23 @@ chdir $category or err(1,"$category"); system("$cp -PRp $thisdir ."); system("$cvs $n add `find $portname -type d | grep -v CVS`") && errx(1, "cvs add for dirs failed, aborting."); - system("$cvs $n add `find $portname -type f | grep -v CVS`") && errx(1, "cvs add for files failed, aborting."); + + my $gotfiles = 0; + if ($binfiles) { + if (-d "$portname/files") { + my (@pf, $fd); + opendir($fd, "$portname/files") and + @pf = grep { /^.*patch-.*$/ } readdir($fd); + $gotfiles = ++$#pf; + } + } + + if ($binfiles && $gotfiles > 0) { + system("$cvs $n add `find $portname -type f | grep -v CVS | grep -v '^$portname/files/.*patch-.*'`") && errx(1, "cvs add for files failed, aborting."); + system("$cvs $n add -ko `find $portname -type f | grep -v CVS | grep '^$portname/files/.*patch-.*'`") && errx(1, "cvs add for files failed, aborting."); + } else { + system("$cvs $n add `find $portname -type f | grep -v CVS`") && errx(1, "cvs add for files failed, aborting."); + } # figure out where the port name belongs in category Makefile my @ports = &lsports; @@ -417,7 +434,7 @@ SYNOPSIS $0 [-c commitfile] [-h host] [-l PR number] [-s distdir] [-u user] - [-afgimnt] -d directory + [-abfgimnt] -d directory Where "directory" contains the comma-delimited list of root directories of new ports that you wish to @@ -427,6 +444,8 @@ OPTIONS -a Perform checks on the port to make sure there are no problems. Recommended. + -b Add all patch-* files in \${FILESDIR} as binary + files (i.e. don't expand CVS tags) -c file Use file in place of normal log message. -f Do not fetch the distfile. -g Do not commit to CVSROOT/modules. ==== //depot/projects/soc2006/gabor_ports/UPDATING#7 (text+ko) ==== @@ -6,6 +6,40 @@ time you update your ports collection, before attempting any port upgrades. +20060715: + AFFECTS: users of Aspell or its versions bundled with dictionaries + AUTHOR: thierry@FreeBSD.org + + Since aspell-0.60.4_4, all dictionaries can be installed separately: + + - by default, textproc/aspell installs the English dictionaries (no + change); + - thereafter you can install any foreign dictionary; + - when you install a foreign dictionary, i.e. french/aspell or + textproc/da-aspell, it installs only the dictionaries, and depends + upon textproc/aspell for the programs; + - if you don't need the English dictionaries, you can define + WITHOUT_DICTEN or install textproc/aspell-without-dicten. + +20060714: + AFFECTS: users of security/krb5 + AUTHOR: cy@FreeBSD.org + + As of MIT KRB5 1.5, Kerberos no longer supports static linking nor + do the static libraries build. The reason for this is that KRB5 1.5 + implements plugins to implement functions. GSS-API is now implemented + as a function. As such, the MIT Kerberos team has yet to implement + plugins using static libraries. Users requiring static libraries or + statically linked binaries are advised not to upgrade to this release + until MIT provides a solution for statically linked binaries. + +20060714: + AFFECTS: users of www/mediawiki + AUTHOR: clsung@FreeBSD.org + + www/mediawiki version is 1.7 now. 1.6 version was preserved on + www/mediawiki16 port. + 20060713: AFFECTS: users of x11-fonts/terminus-font AUTHOR: garga@FreeBSD.org @@ -3816,4 +3850,4 @@ 2) Update all p5-* modules. portupgrade -f p5-\* -$FreeBSD: ports/UPDATING,v 1.361 2006/07/13 12:03:50 garga Exp $ +$FreeBSD: ports/UPDATING,v 1.364 2006/07/15 14:28:26 thierry Exp $
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607181541.k6IFfIr1069294>