PERFORCE change 124952 for review
Gabor Kovesdan
gabor at FreeBSD.org
Thu Aug 9 07:22:57 PDT 2007
http://perforce.freebsd.org/chv.cgi?CH=124952
Change 124952 by gabor at gabor_server on 2007/08/09 14:22:49
IFC
Affected files ...
.. //depot/projects/soc2006/gabor_destdir/MOVED#17 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.database.mk#5 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.java.mk#5 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.openssl.mk#4 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#40 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.subdir.mk#12 integrate
.. //depot/projects/soc2006/gabor_ports/MOVED#18 integrate
.. //depot/projects/soc2006/gabor_ports/Mk/bsd.database.mk#7 integrate
.. //depot/projects/soc2006/gabor_ports/Mk/bsd.java.mk#6 integrate
.. //depot/projects/soc2006/gabor_ports/Mk/bsd.openssl.mk#8 integrate
.. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#88 integrate
.. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.subdir.mk#6 integrate
Differences ...
==== //depot/projects/soc2006/gabor_destdir/MOVED#17 (text+ko) ====
@@ -1,7 +1,7 @@
#
# MOVED - a list of (recently) moved or removed ports
#
-# $FreeBSD: ports/MOVED,v 1.1442 2007/08/03 07:24:48 clsung Exp $
+# $FreeBSD: ports/MOVED,v 1.1445 2007/08/08 19:30:35 sat Exp $
#
# Each entry consists of a single line containing the following four
# fields in the order named, separated with the pipe (`|') character:
@@ -22,7 +22,6 @@
# (e.g. upgraded to a later version), don't record it here.
#
# Port|Moved to|Date|Why
-lang/tcl-tk-wrapper||2007-05-31|Replaced by tcl-wrapper and tk-wrapper
net/ratoolset|net/irrtoolset|2002-11-16|software was renamed
chinese/linux-netscape47-communicator||2002-11-17|security vulnerability
chinese/linux-netscape47-navigator||2002-11-17|security vulnerability
@@ -2957,6 +2956,7 @@
games/marathon-evil||2007-05-28|Has expired: Installed by games/alephone-scenarios with wrapper script
games/marathon2-data||2007-05-28|Has expired: Installed by games/alephone-data with wrapper script
net-im/tik||2007-05-28|Has expired: uses the old and unsupported TOC protocol, use net-im/aim or net-im/gaim instead
+lang/tcl-tk-wrapper||2007-05-31|Replaced by tcl-wrapper and tk-wrapper
audio/gstreamer-plugins-a52dec80|audio/gstreamer-plugins-a52dec|2007-06-01|Gstreamer 0.8 has been removed
audio/gstreamer-plugins-artsd80||2007-06-01|Gstreamer 0.8 has been removed
audio/gstreamer-plugins-audiofile80||2007-06-01|Gstreamer 0.8 has been removed
@@ -3139,3 +3139,6 @@
security/p5-openxpki-client-soap-lite||2007-08-01|Has expired: No longer maintained by Developers.
net-mgmt/aircrack|net-mgmt/aircrack-ng|2007-08-01|Has expired: Please use net-mgmt/aircrack-ng
databases/ruby-postgres|databases/rubygem-postgres|2007-08-03|Port updated in rubygem version
+editors/flim113||2007-08-05|Expired: distfile no longer available
+editors/semi113||2007-08-05|Expired: distfile no longer available
+deskutils/intclock|x11-clocks/intclock|2007-08-08|Moved to a more appropriate category
==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.database.mk#5 (text+ko) ====
@@ -1,7 +1,7 @@
# -*- mode: Makefile; tab-width: 4; -*-
# ex: ts=4
#
-# $FreeBSD: ports/Mk/bsd.database.mk,v 1.19 2007/08/02 05:42:21 delphij Exp $
+# $FreeBSD: ports/Mk/bsd.database.mk,v 1.20 2007/08/06 09:23:13 delphij Exp $
#
.if defined(_POSTMKINCLUDED) && !defined(Database_Post_Include)
@@ -196,7 +196,7 @@
.if defined(USE_BDB)
-_DB_PORTS= 2 3 40 41 42 43 44 45 3+ 40+ 41+ 42+ 43+ 44+ 45+
+_DB_PORTS= 2 3 40 41 42 43 44 45 46 3+ 40+ 41+ 42+ 43+ 44+ 45+ 46+
# Dependence lines for different db versions
db2_DEPENDS= db2.0:${PORTSDIR}/databases/db2
db3_DEPENDS= db3.3:${PORTSDIR}/databases/db3
@@ -206,6 +206,7 @@
db43_DEPENDS= db-4.3.0:${PORTSDIR}/databases/db43
db44_DEPENDS= db-4.4.0:${PORTSDIR}/databases/db44
db45_DEPENDS= db-4.5.0:${PORTSDIR}/databases/db45
+db46_DEPENDS= db-4.6.0:${PORTSDIR}/databases/db46
# Detect db versions by finding some files
db3_FIND= ${LOCALBASE}/include/db3/db.h
db40_FIND= ${LOCALBASE}/include/db4/db.h
@@ -214,6 +215,7 @@
db43_FIND= ${LOCALBASE}/include/db43/db.h
db44_FIND= ${LOCALBASE}/include/db44/db.h
db45_FIND= ${LOCALBASE}/include/db45/db.h
+db46_FIND= ${LOCALBASE}/include/db46/db.h
# For specifying [3, 40, 41, ..]+
_DB_3P= 3 ${_DB_40P}
@@ -222,7 +224,8 @@
_DB_42P= 42 ${_DB_43P}
_DB_43P= 43 ${_DB_44P}
_DB_44P= 44 ${_DB_45P}
-_DB_45P= 45
+_DB_45P= 45 ${_DB_46P}
+_DB_46P= 46
# Override the global WITH_BDB_VER with the
# port specific <UNIQUENAME>_WITH_BDB_VER
@@ -350,6 +353,10 @@
BDB_LIB_NAME= db-4.5
BDB_LIB_CXX_NAME= db_cxx-4.5
BDB_LIB_DIR= ${LOCALBASE}/lib/db45
+. elif ${_BDB_VER} == 46
+BDB_LIB_NAME= db-4.6
+BDB_LIB_CXX_NAME= db_cxx-4.6
+BDB_LIB_DIR= ${LOCALBASE}/lib/db46
. endif
BDB_LIB_NAME?= db${_BDB_VER}
BDB_LIB_CXX_NAME?= db${_BDB_VER}_cxx
==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.java.mk#5 (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.78 2007/06/06 15:38:54 glewis Exp $
+# $FreeBSD: ports/Mk/bsd.java.mk,v 1.80 2007/08/05 21:19:47 glewis Exp $
#
.if !defined(Java_Include)
@@ -166,7 +166,7 @@
. endif
# The complete list of Java versions, os and vendors supported.
-__JAVA_VERSION_LIST= 1.1 1.2 1.3 1.4 1.5
+__JAVA_VERSION_LIST= 1.1 1.2 1.3 1.4 1.5 1.6
_JAVA_VERSION_LIST= ${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/}
_JAVA_OS_LIST= native linux
_JAVA_VENDOR_LIST= freebsd bsdjava sun blackdown
@@ -185,6 +185,8 @@
VERSION=1.4.2 OS=native VENDOR=bsdjava
_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5_INFO= PORT=java/jdk15 HOME=${LOCALBASE}/jdk1.5.0 \
VERSION=1.5.0 OS=native VENDOR=bsdjava
+_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_6_INFO= PORT=java/jdk16 HOME=${LOCALBASE}/jdk1.6.0 \
+ VERSION=1.6.0 OS=native VENDOR=bsdjava
_JAVA_PORT_LINUX_BLACKDOWN_JDK_1_2_INFO= PORT=java/linux-blackdown-jdk12 HOME=${LOCALBASE}/linux-blackdown-jdk1.2.2 \
VERSION=1.2.2 OS=linux VENDOR=blackdown
_JAVA_PORT_LINUX_BLACKDOWN_JDK_1_4_INFO= PORT=java/linux-blackdown-jdk14 HOME=${LOCALBASE}/linux-blackdown-jdk1.4.2 \
@@ -197,6 +199,8 @@
VERSION=1.4.2 OS=linux VENDOR=sun
_JAVA_PORT_LINUX_SUN_JDK_1_5_INFO= PORT=java/linux-sun-jdk15 HOME=${LOCALBASE}/linux-sun-jdk1.5.0 \
VERSION=1.5.0 OS=linux VENDOR=sun
+_JAVA_PORT_LINUX_SUN_JDK_1_6_INFO= PORT=java/linux-sun-jdk16 HOME=${LOCALBASE}/linux-sun-jdk1.6.0 \
+ VERSION=1.6.0 OS=linux VENDOR=sun
# Verbose description for each VENDOR
_JAVA_VENDOR_freebsd= "FreeBSD Foundation"
@@ -218,11 +222,13 @@
# List all JDK ports
__JAVA_PORTS_ALL= JAVA_PORT_NATIVE_FREEBSD_JDK_1_5 \
+ JAVA_PORT_NATIVE_BSDJAVA_JDK_1_6 \
JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5 \
JAVA_PORT_NATIVE_BSDJAVA_JDK_1_4 \
JAVA_PORT_NATIVE_BSDJAVA_JDK_1_3 \
JAVA_PORT_NATIVE_BSDJAVA_JDK_1_2 \
JAVA_PORT_NATIVE_BSDJAVA_JDK_1_1 \
+ JAVA_PORT_LINUX_SUN_JDK_1_6 \
JAVA_PORT_LINUX_SUN_JDK_1_5 \
JAVA_PORT_LINUX_SUN_JDK_1_4 \
JAVA_PORT_LINUX_SUN_JDK_1_3 \
@@ -302,7 +308,7 @@
. undef _JAVA_PORTS_INSTALLED
. undef _JAVA_PORTS_POSSIBLE
. if defined(JAVA_VERSION)
-_JAVA_VERSION= ${JAVA_VERSION:S/1.1+/1.1 1.2 1.3 1.4 1.5/:S/1.2+/1.2 1.3 1.4 1.5/:S/1.3+/1.3 1.4 1.5/:S/1.4+/1.4 1.5/:S/1.5+/1.5/}
+_JAVA_VERSION= ${JAVA_VERSION:S/1.1+/1.1 1.2 1.3 1.4 1.5 1.6/:S/1.2+/1.2 1.3 1.4 1.5 1.6/:S/1.3+/1.3 1.4 1.5 1.6/:S/1.4+/1.4 1.5 1.6/:S/1.5+/1.5 1.6/:S/1.6+/1.6/}
. else
_JAVA_VERSION= ${__JAVA_VERSION_LIST}
. endif
@@ -388,9 +394,10 @@
. undef HAVE_JIKES
-# Enforce USE_JIKES=NO if not defined and using Java 1.5
+# Enforce USE_JIKES=NO if not defined and using Java 1.5+
# XXX: This is a temporary fix to be removed when Jikes supports Java 1.5
-. if ${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1.\2/} == "1.5"
+. if (${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1.\2/} == "1.5") || \
+ (${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1.\2/} == "1.6")
USE_JIKES?= NO
. endif
# First test if USE_JIKES has a valid value
==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.openssl.mk#4 (text+ko) ====
@@ -2,7 +2,7 @@
# Date created: 31 May 2002
# Whom: dinoex
#
-# $FreeBSD: ports/Mk/bsd.openssl.mk,v 1.35 2007/08/04 11:37:23 gabor Exp $
+# $FreeBSD: ports/Mk/bsd.openssl.mk,v 1.36 2007/08/06 10:39:24 dinoex Exp $
#
# Use of 'USE_OPENSSL=yes' includes this Makefile after bsd.ports.pre.mk
#
@@ -62,7 +62,7 @@
OPENSSLBASE= /usr
OPENSSLDIR= /etc/ssl
-.if !exists(/usr/lib/libcrypto.so)
+.if !exists(${DESTDIR}/usr/lib/libcrypto.so)
check-depends::
@${ECHO_CMD} "Dependency error: this port requires the OpenSSL library, which is part of"
@${ECHO_CMD} "the FreeBSD crypto distribution but not installed on your"
@@ -121,7 +121,7 @@
.if !defined(OPENSSL_PORT) && \
exists(${LOCALBASE}/lib/libcrypto.so)
# find installed port and use it for dependency
-PKG_DBDIR?= /var/db/pkg
+PKG_DBDIR?= ${DESTDIR}/var/db/pkg
OPENSSL_INSTALLED!= grep -l -r "^lib/libssl.so." "${PKG_DBDIR}" | \
while read contents; do \
sslprefix=`grep "^@cwd " "$${contents}" | ${HEAD} -n 1`; \
==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#40 (text+ko) ====
@@ -1,7 +1,7 @@
#-*- mode: makefile; tab-width: 4; -*-
# ex:ts=4
#
-# $FreeBSD: ports/Mk/bsd.port.mk,v 1.579 2007/08/04 19:48:34 pav Exp $
+# $FreeBSD: ports/Mk/bsd.port.mk,v 1.580 2007/08/08 03:46:04 kris Exp $
# $NetBSD: $
#
# bsd.port.mk - 940820 Jordan K. Hubbard.
@@ -1089,6 +1089,17 @@
# Most port authors should not need to understand anything after this point.
#
+# These need to be absolute since we don't know how deep in the ports
+# tree we are and thus can't go relative. They can, of course, be overridden
+# by individual Makefiles or local system make configuration.
+PORTSDIR?= /usr/ports
+LOCALBASE?= /usr/local
+X11BASE?= ${LOCALBASE}
+LINUXBASE?= /compat/linux
+DISTDIR?= ${PORTSDIR}/distfiles
+_DISTDIR?= ${DISTDIR}/${DIST_SUBDIR}
+INDEXDIR?= ${PORTSDIR}
+
.include "${PORTSDIR}/Mk/bsd.commands.mk"
#
@@ -1294,16 +1305,6 @@
PKGNAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PKGVERSION}
DISTNAME?= ${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION:C/:(.)/\1/g}${DISTVERSIONSUFFIX}
-# These need to be absolute since we don't know how deep in the ports
-# tree we are and thus can't go relative. They can, of course, be overridden
-# by individual Makefiles or local system make configuration.
-PORTSDIR?= /usr/ports
-LOCALBASE?= /usr/local
-X11BASE?= ${LOCALBASE}
-LINUXBASE?= /compat/linux
-DISTDIR?= ${PORTSDIR}/distfiles
-_DISTDIR?= ${DISTDIR}/${DIST_SUBDIR}
-INDEXDIR?= ${PORTSDIR}
INDEXFILE?= INDEX-${OSVERSION:C/([0-9]).*/\1/}
DOCSDIR?= ${PREFIX}/share/doc/${PORTNAME}
@@ -2300,7 +2301,6 @@
.undef NO_PACKAGE
.endif
-COMMENTFILE?= ${PKGDIR}/pkg-comment
DESCR?= ${PKGDIR}/pkg-descr
PLIST?= ${PKGDIR}/pkg-plist
PKGINSTALL?= ${PKGDIR}/pkg-install
==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.subdir.mk#12 (text+ko) ====
@@ -2,7 +2,7 @@
# ex:ts=4
#
# from: @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91
-# $FreeBSD: ports/Mk/bsd.port.subdir.mk,v 1.71 2007/08/04 11:37:24 gabor Exp $
+# $FreeBSD: ports/Mk/bsd.port.subdir.mk,v 1.72 2007/08/08 03:46:04 kris Exp $
#
# The include file <bsd.port.subdir.mk> contains the default targets
# for building ports subdirectories.
@@ -40,6 +40,21 @@
# Search for ports using either 'make search key=<keyword>'
# or 'make search name=<keyword>'.
+PORTSDIR?= /usr/ports
+TEMPLATES?= ${PORTSDIR}/Templates
+.if defined(PORTSTOP)
+README= ${TEMPLATES}/README.top
+.else
+README= ${TEMPLATES}/README.category
+.endif
+MOVEDDIR?= ${PORTSDIR}
+MOVEDFILE?= MOVED
+
+# XXX Are these needed here? DESCR was set wrong for a few years
+MASTERDIR?= ${.CURDIR}
+PKGDIR?= ${MASTERDIR}
+DESCR?= ${PKGDIR}/pkg-descr
+
.include "${PORTSDIR}/Mk/bsd.commands.mk"
.MAIN: all
@@ -66,6 +81,9 @@
.endif
.endif
+INDEXDIR?= ${PORTSDIR}
+INDEXFILE?= INDEX-${OSVERSION:C/([0-9]).*/\1/}
+
UID!= ${ID} -u
.if exists(${LOCALBASE}/sbin/pkg_info)
PKG_INFO?= ${LOCALBASE}/sbin/pkg_info
@@ -249,28 +267,6 @@
@${MAKE} README.html
.endif
-.if (${OPSYS} == "NetBSD")
-PORTSDIR ?= /usr/opt
-.else
-PORTSDIR ?= /usr/ports
-.endif
-TEMPLATES ?= ${PORTSDIR}/Templates
-.if defined(PORTSTOP)
-README= ${TEMPLATES}/README.top
-.else
-README= ${TEMPLATES}/README.category
-.endif
-COMMENTFILE?= ${.CURDIR}/pkg/COMMENT
-DESCR?= ${.CURDIR}/pkg/DESCR
-INDEXDIR?= ${PORTSDIR}
-.if ${OSVERSION} >= 500036
-INDEXFILE?= INDEX-${OSVERSION:C/([0-9]).*/\1/}
-.else
-INDEXFILE?= INDEX
-.endif
-MOVEDDIR?= ${PORTSDIR}
-MOVEDFILE?= MOVED
-
HTMLIFY= ${SED} -e 's/&/\&/g' -e 's/>/\>/g' -e 's/</\</g'
package-name:
@@ -298,12 +294,8 @@
.if defined(COMMENT)
@${ECHO_CMD} "${COMMENT}" | ${HTMLIFY} > $@.tmp4
.else
-.if exists(${COMMENTFILE})
- @${HTMLIFY} ${COMMENTFILE} > $@.tmp4
-.else
@> $@.tmp4
.endif
-.endif
@${CAT} ${README} | \
${SED} -e 's/%%CATEGORY%%/'"`basename ${.CURDIR}`"'/g' \
-e '/%%COMMENT%%/r$@.tmp4' \
@@ -415,7 +407,7 @@
break; \
}\
} \
- if (toprint == 1 ) disp[fields[d[i]]] = 1; \
+ if (toprint == 1 ) disp[fields[d[i]]] = 1; \
} \
} \
{ \
==== //depot/projects/soc2006/gabor_ports/MOVED#18 (text+ko) ====
@@ -1,7 +1,7 @@
#
# MOVED - a list of (recently) moved or removed ports
#
-# $FreeBSD: ports/MOVED,v 1.1442 2007/08/03 07:24:48 clsung Exp $
+# $FreeBSD: ports/MOVED,v 1.1445 2007/08/08 19:30:35 sat Exp $
#
# Each entry consists of a single line containing the following four
# fields in the order named, separated with the pipe (`|') character:
@@ -22,7 +22,6 @@
# (e.g. upgraded to a later version), don't record it here.
#
# Port|Moved to|Date|Why
-lang/tcl-tk-wrapper||2007-05-31|Replaced by tcl-wrapper and tk-wrapper
net/ratoolset|net/irrtoolset|2002-11-16|software was renamed
chinese/linux-netscape47-communicator||2002-11-17|security vulnerability
chinese/linux-netscape47-navigator||2002-11-17|security vulnerability
@@ -2957,6 +2956,7 @@
games/marathon-evil||2007-05-28|Has expired: Installed by games/alephone-scenarios with wrapper script
games/marathon2-data||2007-05-28|Has expired: Installed by games/alephone-data with wrapper script
net-im/tik||2007-05-28|Has expired: uses the old and unsupported TOC protocol, use net-im/aim or net-im/gaim instead
+lang/tcl-tk-wrapper||2007-05-31|Replaced by tcl-wrapper and tk-wrapper
audio/gstreamer-plugins-a52dec80|audio/gstreamer-plugins-a52dec|2007-06-01|Gstreamer 0.8 has been removed
audio/gstreamer-plugins-artsd80||2007-06-01|Gstreamer 0.8 has been removed
audio/gstreamer-plugins-audiofile80||2007-06-01|Gstreamer 0.8 has been removed
@@ -3139,3 +3139,6 @@
security/p5-openxpki-client-soap-lite||2007-08-01|Has expired: No longer maintained by Developers.
net-mgmt/aircrack|net-mgmt/aircrack-ng|2007-08-01|Has expired: Please use net-mgmt/aircrack-ng
databases/ruby-postgres|databases/rubygem-postgres|2007-08-03|Port updated in rubygem version
+editors/flim113||2007-08-05|Expired: distfile no longer available
+editors/semi113||2007-08-05|Expired: distfile no longer available
+deskutils/intclock|x11-clocks/intclock|2007-08-08|Moved to a more appropriate category
==== //depot/projects/soc2006/gabor_ports/Mk/bsd.database.mk#7 (text+ko) ====
@@ -1,7 +1,7 @@
# -*- mode: Makefile; tab-width: 4; -*-
# ex: ts=4
#
-# $FreeBSD: ports/Mk/bsd.database.mk,v 1.19 2007/08/02 05:42:21 delphij Exp $
+# $FreeBSD: ports/Mk/bsd.database.mk,v 1.20 2007/08/06 09:23:13 delphij Exp $
#
.if defined(_POSTMKINCLUDED) && !defined(Database_Post_Include)
@@ -196,7 +196,7 @@
.if defined(USE_BDB)
-_DB_PORTS= 2 3 40 41 42 43 44 45 3+ 40+ 41+ 42+ 43+ 44+ 45+
+_DB_PORTS= 2 3 40 41 42 43 44 45 46 3+ 40+ 41+ 42+ 43+ 44+ 45+ 46+
# Dependence lines for different db versions
db2_DEPENDS= db2.0:${PORTSDIR}/databases/db2
db3_DEPENDS= db3.3:${PORTSDIR}/databases/db3
@@ -206,6 +206,7 @@
db43_DEPENDS= db-4.3.0:${PORTSDIR}/databases/db43
db44_DEPENDS= db-4.4.0:${PORTSDIR}/databases/db44
db45_DEPENDS= db-4.5.0:${PORTSDIR}/databases/db45
+db46_DEPENDS= db-4.6.0:${PORTSDIR}/databases/db46
# Detect db versions by finding some files
db3_FIND= ${LOCALBASE}/include/db3/db.h
db40_FIND= ${LOCALBASE}/include/db4/db.h
@@ -214,6 +215,7 @@
db43_FIND= ${LOCALBASE}/include/db43/db.h
db44_FIND= ${LOCALBASE}/include/db44/db.h
db45_FIND= ${LOCALBASE}/include/db45/db.h
+db46_FIND= ${LOCALBASE}/include/db46/db.h
# For specifying [3, 40, 41, ..]+
_DB_3P= 3 ${_DB_40P}
@@ -222,7 +224,8 @@
_DB_42P= 42 ${_DB_43P}
_DB_43P= 43 ${_DB_44P}
_DB_44P= 44 ${_DB_45P}
-_DB_45P= 45
+_DB_45P= 45 ${_DB_46P}
+_DB_46P= 46
# Override the global WITH_BDB_VER with the
# port specific <UNIQUENAME>_WITH_BDB_VER
@@ -350,6 +353,10 @@
BDB_LIB_NAME= db-4.5
BDB_LIB_CXX_NAME= db_cxx-4.5
BDB_LIB_DIR= ${LOCALBASE}/lib/db45
+. elif ${_BDB_VER} == 46
+BDB_LIB_NAME= db-4.6
+BDB_LIB_CXX_NAME= db_cxx-4.6
+BDB_LIB_DIR= ${LOCALBASE}/lib/db46
. endif
BDB_LIB_NAME?= db${_BDB_VER}
BDB_LIB_CXX_NAME?= db${_BDB_VER}_cxx
==== //depot/projects/soc2006/gabor_ports/Mk/bsd.java.mk#6 (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.78 2007/06/06 15:38:54 glewis Exp $
+# $FreeBSD: ports/Mk/bsd.java.mk,v 1.80 2007/08/05 21:19:47 glewis Exp $
#
.if !defined(Java_Include)
@@ -166,7 +166,7 @@
. endif
# The complete list of Java versions, os and vendors supported.
-__JAVA_VERSION_LIST= 1.1 1.2 1.3 1.4 1.5
+__JAVA_VERSION_LIST= 1.1 1.2 1.3 1.4 1.5 1.6
_JAVA_VERSION_LIST= ${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/}
_JAVA_OS_LIST= native linux
_JAVA_VENDOR_LIST= freebsd bsdjava sun blackdown
@@ -185,6 +185,8 @@
VERSION=1.4.2 OS=native VENDOR=bsdjava
_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5_INFO= PORT=java/jdk15 HOME=${LOCALBASE}/jdk1.5.0 \
VERSION=1.5.0 OS=native VENDOR=bsdjava
+_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_6_INFO= PORT=java/jdk16 HOME=${LOCALBASE}/jdk1.6.0 \
+ VERSION=1.6.0 OS=native VENDOR=bsdjava
_JAVA_PORT_LINUX_BLACKDOWN_JDK_1_2_INFO= PORT=java/linux-blackdown-jdk12 HOME=${LOCALBASE}/linux-blackdown-jdk1.2.2 \
VERSION=1.2.2 OS=linux VENDOR=blackdown
_JAVA_PORT_LINUX_BLACKDOWN_JDK_1_4_INFO= PORT=java/linux-blackdown-jdk14 HOME=${LOCALBASE}/linux-blackdown-jdk1.4.2 \
@@ -197,6 +199,8 @@
VERSION=1.4.2 OS=linux VENDOR=sun
_JAVA_PORT_LINUX_SUN_JDK_1_5_INFO= PORT=java/linux-sun-jdk15 HOME=${LOCALBASE}/linux-sun-jdk1.5.0 \
VERSION=1.5.0 OS=linux VENDOR=sun
+_JAVA_PORT_LINUX_SUN_JDK_1_6_INFO= PORT=java/linux-sun-jdk16 HOME=${LOCALBASE}/linux-sun-jdk1.6.0 \
+ VERSION=1.6.0 OS=linux VENDOR=sun
# Verbose description for each VENDOR
_JAVA_VENDOR_freebsd= "FreeBSD Foundation"
@@ -218,11 +222,13 @@
# List all JDK ports
__JAVA_PORTS_ALL= JAVA_PORT_NATIVE_FREEBSD_JDK_1_5 \
+ JAVA_PORT_NATIVE_BSDJAVA_JDK_1_6 \
JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5 \
JAVA_PORT_NATIVE_BSDJAVA_JDK_1_4 \
JAVA_PORT_NATIVE_BSDJAVA_JDK_1_3 \
JAVA_PORT_NATIVE_BSDJAVA_JDK_1_2 \
JAVA_PORT_NATIVE_BSDJAVA_JDK_1_1 \
+ JAVA_PORT_LINUX_SUN_JDK_1_6 \
JAVA_PORT_LINUX_SUN_JDK_1_5 \
JAVA_PORT_LINUX_SUN_JDK_1_4 \
JAVA_PORT_LINUX_SUN_JDK_1_3 \
@@ -302,7 +308,7 @@
. undef _JAVA_PORTS_INSTALLED
. undef _JAVA_PORTS_POSSIBLE
. if defined(JAVA_VERSION)
-_JAVA_VERSION= ${JAVA_VERSION:S/1.1+/1.1 1.2 1.3 1.4 1.5/:S/1.2+/1.2 1.3 1.4 1.5/:S/1.3+/1.3 1.4 1.5/:S/1.4+/1.4 1.5/:S/1.5+/1.5/}
+_JAVA_VERSION= ${JAVA_VERSION:S/1.1+/1.1 1.2 1.3 1.4 1.5 1.6/:S/1.2+/1.2 1.3 1.4 1.5 1.6/:S/1.3+/1.3 1.4 1.5 1.6/:S/1.4+/1.4 1.5 1.6/:S/1.5+/1.5 1.6/:S/1.6+/1.6/}
. else
_JAVA_VERSION= ${__JAVA_VERSION_LIST}
. endif
@@ -388,9 +394,10 @@
. undef HAVE_JIKES
-# Enforce USE_JIKES=NO if not defined and using Java 1.5
+# Enforce USE_JIKES=NO if not defined and using Java 1.5+
# XXX: This is a temporary fix to be removed when Jikes supports Java 1.5
-. if ${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1.\2/} == "1.5"
+. if (${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1.\2/} == "1.5") || \
+ (${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1.\2/} == "1.6")
USE_JIKES?= NO
. endif
# First test if USE_JIKES has a valid value
==== //depot/projects/soc2006/gabor_ports/Mk/bsd.openssl.mk#8 (text+ko) ====
@@ -2,7 +2,7 @@
# Date created: 31 May 2002
# Whom: dinoex
#
-# $FreeBSD: ports/Mk/bsd.openssl.mk,v 1.35 2007/08/04 11:37:23 gabor Exp $
+# $FreeBSD: ports/Mk/bsd.openssl.mk,v 1.36 2007/08/06 10:39:24 dinoex Exp $
#
# Use of 'USE_OPENSSL=yes' includes this Makefile after bsd.ports.pre.mk
#
@@ -62,7 +62,7 @@
OPENSSLBASE= /usr
OPENSSLDIR= /etc/ssl
-.if !exists(/usr/lib/libcrypto.so)
+.if !exists(${DESTDIR}/usr/lib/libcrypto.so)
check-depends::
@${ECHO_CMD} "Dependency error: this port requires the OpenSSL library, which is part of"
@${ECHO_CMD} "the FreeBSD crypto distribution but not installed on your"
@@ -121,7 +121,7 @@
.if !defined(OPENSSL_PORT) && \
exists(${LOCALBASE}/lib/libcrypto.so)
# find installed port and use it for dependency
-PKG_DBDIR?= /var/db/pkg
+PKG_DBDIR?= ${DESTDIR}/var/db/pkg
OPENSSL_INSTALLED!= grep -l -r "^lib/libssl.so." "${PKG_DBDIR}" | \
while read contents; do \
sslprefix=`grep "^@cwd " "$${contents}" | ${HEAD} -n 1`; \
==== //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#88 (text+ko) ====
@@ -1,7 +1,7 @@
#-*- mode: makefile; tab-width: 4; -*-
# ex:ts=4
#
-# $FreeBSD: ports/Mk/bsd.port.mk,v 1.579 2007/08/04 19:48:34 pav Exp $
+# $FreeBSD: ports/Mk/bsd.port.mk,v 1.580 2007/08/08 03:46:04 kris Exp $
# $NetBSD: $
#
# bsd.port.mk - 940820 Jordan K. Hubbard.
@@ -1104,6 +1104,17 @@
# Most port authors should not need to understand anything after this point.
#
+# These need to be absolute since we don't know how deep in the ports
+# tree we are and thus can't go relative. They can, of course, be overridden
+# by individual Makefiles or local system make configuration.
+PORTSDIR?= /usr/ports
+LOCALBASE?= /usr/local
+X11BASE?= ${LOCALBASE}
+LINUXBASE?= /compat/linux
+DISTDIR?= ${PORTSDIR}/distfiles
+_DISTDIR?= ${DISTDIR}/${DIST_SUBDIR}
+INDEXDIR?= ${PORTSDIR}
+
.include "${PORTSDIR}/Mk/bsd.commands.mk"
#
@@ -1317,16 +1328,6 @@
PKGNAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PKGVERSION}
DISTNAME?= ${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION:C/:(.)/\1/g}${DISTVERSIONSUFFIX}
-# These need to be absolute since we don't know how deep in the ports
-# tree we are and thus can't go relative. They can, of course, be overridden
-# by individual Makefiles or local system make configuration.
-PORTSDIR?= /usr/ports
-LOCALBASE?= /usr/local
-X11BASE?= ${LOCALBASE}
-LINUXBASE?= /compat/linux
-DISTDIR?= ${PORTSDIR}/distfiles
-_DISTDIR?= ${DISTDIR}/${DIST_SUBDIR}
-INDEXDIR?= ${PORTSDIR}
INDEXFILE?= INDEX-${OSVERSION:C/([0-9]).*/\1/}
DOCSDIR?= ${PREFIX}/share/doc/${PORTNAME}
@@ -2338,7 +2339,6 @@
.undef NO_PACKAGE
.endif
-COMMENTFILE?= ${PKGDIR}/pkg-comment
DESCR?= ${PKGDIR}/pkg-descr
PLIST?= ${PKGDIR}/pkg-plist
PKGINSTALL?= ${PKGDIR}/pkg-install
==== //depot/projects/soc2006/gabor_ports/Mk/bsd.port.subdir.mk#6 (text+ko) ====
@@ -2,7 +2,7 @@
# ex:ts=4
#
# from: @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91
-# $FreeBSD: ports/Mk/bsd.port.subdir.mk,v 1.71 2007/08/04 11:37:24 gabor Exp $
+# $FreeBSD: ports/Mk/bsd.port.subdir.mk,v 1.72 2007/08/08 03:46:04 kris Exp $
#
# The include file <bsd.port.subdir.mk> contains the default targets
# for building ports subdirectories.
@@ -40,6 +40,21 @@
# Search for ports using either 'make search key=<keyword>'
# or 'make search name=<keyword>'.
+PORTSDIR?= /usr/ports
+TEMPLATES?= ${PORTSDIR}/Templates
+.if defined(PORTSTOP)
+README= ${TEMPLATES}/README.top
+.else
+README= ${TEMPLATES}/README.category
+.endif
+MOVEDDIR?= ${PORTSDIR}
+MOVEDFILE?= MOVED
+
+# XXX Are these needed here? DESCR was set wrong for a few years
+MASTERDIR?= ${.CURDIR}
+PKGDIR?= ${MASTERDIR}
+DESCR?= ${PKGDIR}/pkg-descr
+
.include "${PORTSDIR}/Mk/bsd.commands.mk"
.MAIN: all
@@ -66,6 +81,9 @@
.endif
.endif
+INDEXDIR?= ${PORTSDIR}
+INDEXFILE?= INDEX-${OSVERSION:C/([0-9]).*/\1/}
+
UID!= ${ID} -u
.if exists(${LOCALBASE}/sbin/pkg_info)
PKG_INFO?= ${LOCALBASE}/sbin/pkg_info
@@ -249,28 +267,6 @@
@${MAKE} README.html
.endif
-.if (${OPSYS} == "NetBSD")
-PORTSDIR ?= /usr/opt
-.else
-PORTSDIR ?= /usr/ports
-.endif
-TEMPLATES ?= ${PORTSDIR}/Templates
-.if defined(PORTSTOP)
-README= ${TEMPLATES}/README.top
-.else
-README= ${TEMPLATES}/README.category
-.endif
-COMMENTFILE?= ${.CURDIR}/pkg/COMMENT
-DESCR?= ${.CURDIR}/pkg/DESCR
-INDEXDIR?= ${PORTSDIR}
-.if ${OSVERSION} >= 500036
-INDEXFILE?= INDEX-${OSVERSION:C/([0-9]).*/\1/}
-.else
-INDEXFILE?= INDEX
-.endif
-MOVEDDIR?= ${PORTSDIR}
-MOVEDFILE?= MOVED
-
HTMLIFY= ${SED} -e 's/&/\&/g' -e 's/>/\>/g' -e 's/</\</g'
package-name:
@@ -298,12 +294,8 @@
.if defined(COMMENT)
@${ECHO_CMD} "${COMMENT}" | ${HTMLIFY} > $@.tmp4
.else
-.if exists(${COMMENTFILE})
- @${HTMLIFY} ${COMMENTFILE} > $@.tmp4
-.else
@> $@.tmp4
.endif
-.endif
@${CAT} ${README} | \
${SED} -e 's/%%CATEGORY%%/'"`basename ${.CURDIR}`"'/g' \
-e '/%%COMMENT%%/r$@.tmp4' \
@@ -415,7 +407,7 @@
break; \
}\
} \
- if (toprint == 1 ) disp[fields[d[i]]] = 1; \
+ if (toprint == 1 ) disp[fields[d[i]]] = 1; \
} \
} \
{ \
More information about the p4-projects
mailing list