PERFORCE change 124697 for review
Gabor Kovesdan
gabor at FreeBSD.org
Sat Aug 4 15:29:31 PDT 2007
http://perforce.freebsd.org/chv.cgi?CH=124697
Change 124697 by gabor at gabor_server on 2007/08/04 22:29:12
IFC
Affected files ...
.. //depot/projects/soc2007/gabor_perlmk/CHANGES#2 integrate
.. //depot/projects/soc2007/gabor_perlmk/MOVED#2 integrate
.. //depot/projects/soc2007/gabor_perlmk/Mk/bsd.database.mk#2 integrate
.. //depot/projects/soc2007/gabor_perlmk/Mk/bsd.destdir.mk#2 integrate
.. //depot/projects/soc2007/gabor_perlmk/Mk/bsd.emacs.mk#2 integrate
.. //depot/projects/soc2007/gabor_perlmk/Mk/bsd.gnome.mk#2 integrate
.. //depot/projects/soc2007/gabor_perlmk/Mk/bsd.mail.mk#2 integrate
.. //depot/projects/soc2007/gabor_perlmk/Mk/bsd.openssl.mk#2 integrate
.. //depot/projects/soc2007/gabor_perlmk/Mk/bsd.port.mk#6 integrate
.. //depot/projects/soc2007/gabor_perlmk/Mk/bsd.port.subdir.mk#2 integrate
.. //depot/projects/soc2007/gabor_perlmk/Mk/bsd.python.mk#2 integrate
.. //depot/projects/soc2007/gabor_perlmk/Mk/bsd.qt.mk#2 integrate
.. //depot/projects/soc2007/gabor_perlmk/Mk/bsd.ruby.mk#2 integrate
.. //depot/projects/soc2007/gabor_perlmk/Tools/scripts/security-check.awk#2 integrate
.. //depot/projects/soc2007/gabor_perlmk/UPDATING#2 integrate
Differences ...
==== //depot/projects/soc2007/gabor_perlmk/CHANGES#2 (text+ko) ====
@@ -10,6 +10,22 @@
All ports committers are allowed to commit to this file.
+20070804:
+AUTHOR: gabor at FreeBSD.org
+The following functional changes were made to bsd.*.mk and to
+Tools/scripts/security-check.awk:
+
+ * The variable definitions that cover command line tools, e.g. MKDIR, were
+ extracted from bsd.port.mk into bsd.commands.mk, so that we can
+ reuse them within the infrastructure later.
+
+ * The old DESTDIR implementation was removed both from the infrastructure,
+ and from the individual ports. Variables like TARGETDIR should not longer
+ be used.
+
+ * A new DESTDIR implementation has been added, implemented in bsd.destdir.mk.
+ The new implementation puts no requirements on the individual ports.
+
20070730:
AUTHOR: python at FreeBSD.org
@@ -1385,4 +1401,4 @@
Contact Erwin Lansing if you have any questions about your use of
this document.
-$FreeBSD: ports/CHANGES,v 1.76 2007/07/30 09:40:55 alexbl Exp $
+$FreeBSD: ports/CHANGES,v 1.77 2007/08/04 11:37:23 gabor Exp $
==== //depot/projects/soc2007/gabor_perlmk/MOVED#2 (text+ko) ====
@@ -1,7 +1,7 @@
#
# MOVED - a list of (recently) moved or removed ports
#
-# $FreeBSD: ports/MOVED,v 1.1436 2007/07/28 16:41:27 chinsan Exp $
+# $FreeBSD: ports/MOVED,v 1.1442 2007/08/03 07:24:48 clsung Exp $
#
# Each entry consists of a single line containing the following four
# fields in the order named, separated with the pipe (`|') character:
@@ -3112,3 +3112,30 @@
games/freeciv-gtk|games/freeciv|2007-07-28|Dropped gtk1 support
games/freeciv-gtk2|games/freeciv|2007-07-28|Gtk2 is supported by default now
math/cvcl||2007-07-28|Has expired: CVC Lite is no longer supported. Please use CVC3 (math/cvc3) for all your validity checking needs!
+www/p5-Kwiki-Archive-Rcs||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or later)
+www/p5-Kwiki-Archive-SVK||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or later)
+www/p5-Kwiki-Atom||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or later)
+www/p5-Kwiki-Cache||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or later)
+www/p5-Kwiki-Diff||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or later)
+www/p5-Kwiki-Edit-RequireUserName||2007-08-01|Has expired: Already bundled in www/p5-Kwiki (0.39 or later)
+www/p5-Kwiki-GDGraphGenerator||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or later)
+www/p5-Kwiki-Infobox||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or later)
+www/p5-Kwiki-ModPerl||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or later)
+www/p5-Kwiki-NavigationToolbar||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or later)
+www/p5-Kwiki-NewPage||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or later)
+www/p5-Kwiki-Notify-Mail||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or later)
+www/p5-Kwiki-PagePrivacy||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or later)
+www/p5-Kwiki-RecentChanges||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or later)
+www/p5-Kwiki-RecentChangesRSS||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or later)
+www/p5-Kwiki-Revisions||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or later)
+www/p5-Kwiki-Search||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or later)
+www/p5-Kwiki-Theme-ColumnLayout||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or later)
+www/p5-Kwiki-UserName||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or later)
+www/p5-Kwiki-UserPreferences||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or later)
+www/p5-Kwiki-VimMode||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or later)
+www/p5-Kwiki-plugins||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or later)
+www/p5-Kwiki-Icons-Gnome||2007-08-01|Has expired: already bundled in www/p5-Kwiki (0.39 or later)
+x11-fm/endeavour||2007-08-01|Has expired: Development ceased, this port should be updated to Endeavour Mark II
+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
==== //depot/projects/soc2007/gabor_perlmk/Mk/bsd.database.mk#2 (text+ko) ====
@@ -1,7 +1,7 @@
# -*- mode: Makefile; tab-width: 4; -*-
# ex: ts=4
#
-# $FreeBSD: ports/Mk/bsd.database.mk,v 1.18 2007/07/18 21:56:10 edwin Exp $
+# $FreeBSD: ports/Mk/bsd.database.mk,v 1.19 2007/08/02 05:42:21 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 3+ 40+ 41+ 42+ 43+ 44+
+_DB_PORTS= 2 3 40 41 42 43 44 45 3+ 40+ 41+ 42+ 43+ 44+ 45+
# Dependence lines for different db versions
db2_DEPENDS= db2.0:${PORTSDIR}/databases/db2
db3_DEPENDS= db3.3:${PORTSDIR}/databases/db3
@@ -205,6 +205,7 @@
db42_DEPENDS= db-4.2.2:${PORTSDIR}/databases/db42
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
# Detect db versions by finding some files
db3_FIND= ${LOCALBASE}/include/db3/db.h
db40_FIND= ${LOCALBASE}/include/db4/db.h
@@ -212,13 +213,16 @@
db42_FIND= ${LOCALBASE}/include/db42/db.h
db43_FIND= ${LOCALBASE}/include/db43/db.h
db44_FIND= ${LOCALBASE}/include/db44/db.h
+db45_FIND= ${LOCALBASE}/include/db45/db.h
# For specifying [3, 40, 41, ..]+
-_DB_3P= 3 40 41 42 43 44
-_DB_40P= 40 41 42 43 44
-_DB_41P= 41 42 43 44
-_DB_42P= 42 43 44
-_DB_43P= 43 44
+_DB_3P= 3 ${_DB_40P}
+_DB_40P= 40 ${_DB_41P}
+_DB_41P= 41 ${_DB_42P}
+_DB_42P= 42 ${_DB_43P}
+_DB_43P= 43 ${_DB_44P}
+_DB_44P= 44 ${_DB_45P}
+_DB_45P= 45
# Override the global WITH_BDB_VER with the
# port specific <UNIQUENAME>_WITH_BDB_VER
@@ -342,6 +346,10 @@
BDB_LIB_NAME= db-4.4
BDB_LIB_CXX_NAME= db_cxx-4.4
BDB_LIB_DIR= ${LOCALBASE}/lib/db44
+. elif ${_BDB_VER} == 45
+BDB_LIB_NAME= db-4.5
+BDB_LIB_CXX_NAME= db_cxx-4.5
+BDB_LIB_DIR= ${LOCALBASE}/lib/db45
. endif
BDB_LIB_NAME?= db${_BDB_VER}
BDB_LIB_CXX_NAME?= db${_BDB_VER}_cxx
==== //depot/projects/soc2007/gabor_perlmk/Mk/bsd.destdir.mk#2 (text+ko) ====
@@ -69,20 +69,23 @@
_DESTDIRMKINCLUDED= yes
+.if defined(WITH_DESTDIR_DEBUG)
+DEBUG_MSG= ${ECHO_MSG} "DEBUG:"
+.else
+DEBUG_MSG= ${TRUE}
+.endif
+
DESTDIR_ENV_LIST?=
DESTDIR_ENV= CHROOTED=yes
.for _var in ${DESTDIR_ENV_LIST:NDESTDIR:NCHROOTED:NPORTSDIR}
DESTDIR_ENV+= ${_var}="${${_var}}"
.endfor
-WITH_EXPERIMENTAL_DESTDIR?= no
-
# Processing DESTDIR_MOUNT_LIST into something more machine-readable
# VAR:HOST_PATH:DEST_PATH
# VAR -> VAR:${VAR}:TMP
# VAR:HOST_PATH -> VAR:HOST_PATH:TMP
DESTDIR_MOUNT_LIST?= PORTSDIR DISTDIR
-#DESTDIR_MOUNT_LIST?= PORTSDIR WRKDIR:/123 WRKSRC:/567:/789 ABC
_DESTDIR_MOUNT_LIST=
.for _entry in ${DESTDIR_MOUNT_LIST}
__entry=${_entry}
@@ -110,12 +113,7 @@
.if !target(do-chroot)
do-chroot:
- @if [ "${WITH_EXPERIMENTAL_DESTDIR}" = "no" ]; then \
- ${ECHO_CMD} "===> DESTDIR is experimental, set WITH_EXPERIMENTAL_DESTDIR"; \
- ${ECHO_CMD} "===> if you want to use it."; \
- exit 0; \
- fi; \
- if [ ! -d ${DESTDIR} ]; then \
+ @if [ ! -d ${DESTDIR} ]; then \
${ECHO_MSG} "===> Directory ${DESTDIR} does not exist"; \
${ECHO_MSG} "===> Please set DESTDIR to a valid jail environment."; \
exit 1; \
@@ -128,16 +126,16 @@
for _dir in tmp dev; do \
[ -d $${_destdir}/$${_dir} ] || \
if ${MKDIR} $${_destdir}/$${_dir}; then \
- ${ECHO_MSG} "=> /$${_dir} subdirectory has been successfully created"; \
+ ${ECHO_MSG} "===> /$${_dir} subdirectory has been successfully created"; \
_created_mountpoints_list="$${_destdir}/$${_dir} $${_created_mountpoints_list}"; \
else \
- ${ECHO_MSG} "=> /$${_dir} subdirectory could not be created"; \
+ ${ECHO_MSG} "===> /$${_dir} subdirectory could not be created"; \
exit 2; \
fi; \
done; \
- ${ECHO_MSG} "_DESTDIR_MOUNT_LIST=${_DESTDIR_MOUNT_LIST}"; \
+ ${DEBUG_MSG} "_DESTDIR_MOUNT_LIST=${_DESTDIR_MOUNT_LIST}"; \
for _entry in ${_DESTDIR_MOUNT_LIST}; do \
- ${ECHO_MSG} "===> Processing $${_entry}"; \
+ ${DEBUG_MSG} "Processing $${_entry}"; \
_mount_var=$${_entry%%:*}; \
_tp=$${_entry#*:}; \
_host_path=`${REALPATH} $${_tp%:*}`; \
@@ -145,81 +143,80 @@
_full_dest_path=`${REALPATH} $${_destdir}/$${_dest_path}`; \
_entry_was_created=0; \
_entry_should_mount=0; \
- ${ECHO_CMD} "$${_mount_var}:$${_host_path}:$${_full_dest_path}"; \
+ ${DEBUG_MSG} "$${_mount_var}:$${_host_path}:$${_full_dest_path}"; \
if [ "$${_dest_path}" = "___temp___" ]; then \
- ${ECHO_CMD} "Creating temporary mount point"; \
+ ${DEBUG_MSG} "Creating temporary mount point"; \
if _full_dest_path=`${MKTEMP} -d $${_destdir}/tmp/mountpoint.XXXXXX`; then \
- ${ECHO_CMD} "Temporary mount point $${_full_dest_path} created successfully"; \
+ ${DEBUG_MSG} "Temporary mount point $${_full_dest_path} created successfully"; \
_entry_was_created=1; \
_entry_should_mount=1; \
_dest_path=$${_full_dest_path#$${_destdir}}; \
_created_mountpoints_list="$${_full_dest_path} $${_created_mountpoints_list}"; \
else \
- ${ECHO_CMD} "Failed to create temporary mount point"; \
+ ${ECHO_MSG} "===> Failed to create temporary mount point"; \
exit 9; \
fi; \
else \
- ${ECHO_CMD} "Checking if already mounted"; \
+ ${DEBUG_MSG} "Checking if already mounted"; \
if ${MOUNT}|${GREP} -qs "^$${_host_path} on $${_full_dest_path} ("; then \
- ${ECHO_CMD} "$${_host_path} is already mounted on $${_full_dest_path}"; \
+ ${DEBUG_MSG} "$${_host_path} is already mounted on $${_full_dest_path}"; \
_var_path_list="$${_var_path_list} $${_mount_var}=$${_dest_path}"; \
else \
- ${ECHO_CMD} "$${_host_path} is not mounted on $${_full_dest_path}"; \
+ ${DEBUG_MSG} "$${_host_path} is not mounted on $${_full_dest_path}"; \
_entry_should_mount=1; \
fi; \
fi; \
[ -d $${_full_dest_path} ] || \
if ${MKDIR} $${_full_dest_path}; then \
- ${ECHO_CMD} "Mount point $${_full_dest_path} created"; \
+ ${DEBUG_MSG} "Mount point $${_full_dest_path} created"; \
_entry_was_created=1; \
_created_mountpoints_list="$${_created_mountpoints_list} ${_full_dest_path}"; \
else \
- ${ECHO_CMD} "Mount point $${_full_dest_path} could not be created"; \
+ ${ECHO_MSG} "===> Mount point $${_full_dest_path} could not be created"; \
exit 7; \
fi; \
[ "$${_entry_should_mount}" = "0" ] || \
if ${MOUNT_NULLFS} $${_host_path} $${_full_dest_path}; then \
- ${ECHO_CMD} "Dir $${_host_path} mounted"; \
+ ${DEBUG_MSG} "Directory $${_host_path} mounted"; \
_mounted_entries_list="$${_full_dest_path} $${_mounted_entries_list}"; \
_var_path_list="$${_var_path_list} $${_mount_var}=$${_dest_path}"; \
else \
- ${ECHO_CMD} "Dir $${_host_path} could not be mounted"; \
+ ${ECHO_MSG} "===> Dir $${_host_path} could not be mounted"; \
[ "$${_entry_was_created}" = "0" ] || \
${RMDIR} $${_full_dest_path} || ${TRUE}; \
exit 8; \
fi; \
done; \
- ${ECHO_CMD} "Handling devfs separately"; \
+ ${DEBUG_MSG} "Handling devfs separately"; \
_full_dest_path=$${_destdir}/dev; \
${MOUNT}|${GREP} -qs "^devfs on $${_full_dest_path} (" || \
if ${MOUNT_DEVFS} $${_full_dest_path}; then \
- ${ECHO_CMD} "devfs mounted"; \
+ ${DEBUG_MSG} "devfs mounted"; \
_mounted_entries_list="$${_full_dest_path} $${_mounted_entries_list}"; \
else \
- ${ECHO_CMD} "devfs could not be mounted"; \
+ ${ECHO_MSG} "===> devfs could not be mounted"; \
[ -n "$${_created_mountpoints_list%%* $${_destdir}/dev *}" ] || \
${RMDIR} $${_destdir}/dev || ${TRUE}; \
exit 9; \
fi; \
_var_path_list="$${_var_path_list} DEVFS=/dev"; \
- ${ECHO_CMD} "Things we mounted: $${_mounted_entries_list}"; \
- ${ECHO_CMD} "Things we created: $${_created_mountpoints_list}"; \
- ${ECHO_CMD} "_var_path_list: $${_var_path_list}"; \
- ${ECHO_CMD} "===> Starting chrooted make in ${DESTDIR}..."; \
+ ${DEBUG_MSG} "Things we mounted: $${_mounted_entries_list}"; \
+ ${DEBUG_MSG} "Things we created: $${_created_mountpoints_list}"; \
+ ${DEBUG_MSG} "_var_path_list: $${_var_path_list}"; \
+ ${ECHO_MSG} "===> Starting chrooted make in ${DESTDIR}..."; \
export $${_var_path_list}; \
${CHROOT} $${_destdir} ${SH} -c "\
cd $${PORTSDIR}${.CURDIR:S|^${PORTSDIR}||}; \
${SETENV} -i ${DESTDIR_ENV} $${_var_path_list} ${MAKE} ${.TARGETS}" && \
- ${ECHO_CMD} "===> Chrooted make in ${DESTDIR} succeeded" || \
- ${ECHO_CMD} "===> Chrooted make in ${DESTDIR} failed"; \
- ${ECHO_CMD} "===> Cleaning up..."; \
+ ${ECHO_MSG} "===> Chrooted make in ${DESTDIR} succeeded" || \
+ ${ECHO_MSG} "===> Chrooted make in ${DESTDIR} failed"; \
+ ${ECHO_MSG} "===> Cleaning up..."; \
for _entry in $${_mounted_entries_list}; do \
${UMOUNT} -f $${_entry} || ${TRUE}; \
done; \
for _entry in $${_created_mountpoints_list}; do \
${RMDIR} $${_entry} || ${TRUE}; \
done; \
- ${ECHO_CMD} "===> Congratulations!"; \
exit 0
.endif # !target(do-chroot)
.endif # !defined(_DESTDIRMKINCLUDED)
==== //depot/projects/soc2007/gabor_perlmk/Mk/bsd.emacs.mk#2 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: ports/Mk/bsd.emacs.mk,v 1.67 2007/07/16 18:05:18 nobutaka Exp $
+# $FreeBSD: ports/Mk/bsd.emacs.mk,v 1.68 2007/08/04 11:37:23 gabor Exp $
#
# bsd.emacs.mk - 19990829 Shigeyuki Fukushima.
#
==== //depot/projects/soc2007/gabor_perlmk/Mk/bsd.gnome.mk#2 (text+ko) ====
@@ -1,7 +1,7 @@
#-*- mode: Fundamental; tab-width: 4; -*-
# ex:ts=4
#
-# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.142 2007/07/23 09:35:27 rafan Exp $
+# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.143 2007/08/04 11:37:23 gabor Exp $
# $NetBSD: $
# $MCom: ports/Mk/bsd.gnome.mk,v 1.414 2007/03/13 01:24:54 marcus Exp $
#
==== //depot/projects/soc2007/gabor_perlmk/Mk/bsd.mail.mk#2 (text+ko) ====
@@ -1,7 +1,7 @@
#-*- mode: Fundamental; tab-width: 4; -*-
# ex:ts=4
#
-# $FreeBSD: ports/Mk/bsd.mail.mk,v 1.2 2006/08/04 12:34:41 erwin Exp $
+# $FreeBSD: ports/Mk/bsd.mail.mk,v 1.3 2007/08/04 11:37:23 gabor Exp $
#
# Please view me with 4 column tabs!
==== //depot/projects/soc2007/gabor_perlmk/Mk/bsd.openssl.mk#2 (text+ko) ====
@@ -2,7 +2,7 @@
# Date created: 31 May 2002
# Whom: dinoex
#
-# $FreeBSD: ports/Mk/bsd.openssl.mk,v 1.34 2006/10/08 09:38:38 dinoex Exp $
+# $FreeBSD: ports/Mk/bsd.openssl.mk,v 1.35 2007/08/04 11:37:23 gabor Exp $
#
# Use of 'USE_OPENSSL=yes' includes this Makefile after bsd.ports.pre.mk
#
==== //depot/projects/soc2007/gabor_perlmk/Mk/bsd.port.mk#6 (text+ko) ====
@@ -1,7 +1,7 @@
#-*- mode: makefile; tab-width: 4; -*-
# ex:ts=4
#
-# $FreeBSD: ports/Mk/bsd.port.mk,v 1.577 2007/07/27 21:40:11 pav Exp $
+# $FreeBSD: ports/Mk/bsd.port.mk,v 1.579 2007/08/04 19:48:34 pav Exp $
# $NetBSD: $
#
# bsd.port.mk - 940820 Jordan K. Hubbard.
@@ -604,11 +604,11 @@
# "man/mann/bar.n", set "MAN1=foo.1" and "MANN=bar.n".
# The available sections chars are "123456789LN".
# MAN<sect>_<lang>
-# - If your port does not install all man pages for all
-# languages in MANLANG, language specific pages for
+# - If your port does not install all man pages for all
+# languages in MANLANG, language specific pages for
# a language can be specified with this. For example,
# if the port installs foo.1 in English, Japanese, and
-# German, bar.1 in English only, and baz.3 in German
+# German, bar.1 in English only, and baz.3 in German
# only, set
# MANLANG= "" de ja
# MAN1= foo.1
@@ -1069,7 +1069,7 @@
# CHECKSUM_ALGORITHMS
# - Different checksum algorithms to check for verifying the
# integrity of the distfiles. The absence of the algorithm
-# in distinfo doesn't make it fail.
+# in distinfo doesn't make it fail.
# Default: md5 sha256
# NO_CHECKSUM - Don't verify the checksum. Typically used when
# when you noticed the distfile you just fetched has
@@ -1981,6 +1981,9 @@
LIB_DEPENDS+= X11.6:${X_LIBRARIES_PORT}
. endif
. endif
+.endif
+
+.if defined(USE_XLIB) || defined(USE_XORG)
# Add explicit X options to avoid problems with false positives in configure
.if defined(GNU_CONFIGURE)
CONFIGURE_ARGS+=--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
==== //depot/projects/soc2007/gabor_perlmk/Mk/bsd.port.subdir.mk#2 (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.70 2007/05/25 00:09:37 linimon Exp $
+# $FreeBSD: ports/Mk/bsd.port.subdir.mk,v 1.71 2007/08/04 11:37:24 gabor Exp $
#
# The include file <bsd.port.subdir.mk> contains the default targets
# for building ports subdirectories.
==== //depot/projects/soc2007/gabor_perlmk/Mk/bsd.python.mk#2 (text+ko) ====
@@ -1,7 +1,7 @@
# -*- mode: Makefile; tab-width: 4; -*-
# ex: ts=4
#
-# $FreeBSD: ports/Mk/bsd.python.mk,v 1.96 2007/07/30 09:40:56 alexbl Exp $
+# $FreeBSD: ports/Mk/bsd.python.mk,v 1.99 2007/08/04 11:37:24 gabor Exp $
#
.if !defined(_POSTMKINCLUDED) && !defined(Python_Pre_Include)
@@ -174,7 +174,7 @@
# - Canonical directory name for easy_install egg packages.
# default: ${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-${PYTHON_VERSION:S/thon//}${PYEASYINSTALL_OSARCH}.egg
#
-# PYEASYINSATLL_OSARCH
+# PYEASYINSTALL_OSARCH
# - Platform identifier for easy_install.
# default: -${OPSYS:L}-${_OSRELEASE}-${ARCH}
# if PYEASYINSTALL_ARCHDEP is defined.
@@ -182,11 +182,11 @@
# PYEASYINSTALL_CMD - Full file path to easy_install command.
# default: ${LOCALBASE}/bin/easy_install-${PYTHON_VER}
#
-# PYEASYINSTALL_INSTALL_ARGS
+# PYEASYINSTALL_INSTALLARGS
# - Arguments to easy_install command for egg installation.
# default: -q -N -S ${PYTHON_SITELIBDIR} ${PYDISTUTILS_PKGNAME}==${PYDISTUTILS_PKGVERSION}
#
-# PYEASYINSTALL_UNINSTALL_ARGS
+# PYEASYINSTALL_UNINSTALLARGS
# - Arguments to easy_install command for egg uninstallation.
# default: -q -m -S ${PYTHON_SITELIBDIR} ${PYDISTUTILS_PKGNAME}==${PYDISTUTILS_PKGVERSION}
#
==== //depot/projects/soc2007/gabor_perlmk/Mk/bsd.qt.mk#2 (text+ko) ====
@@ -34,7 +34,14 @@
CONFIGURE_ARGS+=-no-3dnow -no-sse -no-sse2
.endif #defined(PACKAGE_BUILDING)
-.if defined(QT_WANT_VERBOSE_CONFIGURE)
+.if !defined(WANT_QT_DEBUG)
+CONFIGURE_ARGS+=-no-separate-debug-info
+PLIST_SUB+= DEBUG="@comment "
+.else
+PLIST_SUB+= DEBUG=""
+.endif
+
+.if defined(WANT_QT_VERBOSE_CONFIGURE)
CONFIGURE_ARGS+=-v
.endif
.endif #defined(QT_DIST)
@@ -44,6 +51,11 @@
UIC?= ${QT_PREFIX}/bin/uic-qt4
QMAKE?= ${QT_PREFIX}/bin/qmake-qt4
QMAKESPEC?= ${QT_PREFIX}/share/qt4/mkspecs/freebsd-g++
+QMAKEFLAGS+= QMAKE_CC="${CC}" QMAKE_CXX="${CXX}" QMAKE_LINK_SHLIB="${CXX}" \
+ QMAKE_LINK="${CXX}" QMAKE_CFLAGS="${CFLAGS}" \
+ QMAKE_CXXFLAGS="${CXXFLAGS}" \
+ QMAKE_CFLAGS_THREAD="${PTHREAD_CFLAGS}" \
+ QMAKE_LFLAGS_THREAD="${PTHREAD_LIBS}"
.if ${OSVERSION} < 700042 && ${ARCH} == "amd64"
QTCPPFLAGS?= -fno-gcse
@@ -101,24 +113,111 @@
uic3_DEPENDS= devel/qt4-uic3
xml_DEPENDS= textproc/qt4-xml
+accessible_build_DEPENDS= ${accessible_DEPENDS}
+assistant_build_DEPENDS= ${assistant_DEPENDS}
+assistantclient_build_DEPENDS= ${assistantclient_DEPENDS}
+assistantclient_build_NAME= ${assistantclient_NAME}
+codecs-cn_build_DEPENDS= ${codecs-cn_DEPENDS}
+codecs-jp_build_DEPENDS= ${codecs-jp_DEPENDS}
+codecs-kr_build_DEPENDS= ${codecs-kr_DEPENDS}
+codecs-tw_build_DEPENDS= ${codecs-tw_DEPENDS}
+corelib_build_DEPENDS= ${corelib_DEPENDS}
+dbus_build_DEPENDS= ${dbus_DEPENDS}
+designer_build_DEPENDS= ${designer_DEPENDS}
+doc_build_DEPENDS= ${doc_DEPENDS}
+gui_build_DEPENDS= ${gui_DEPENDS}
+iconengines_build_DEPENDS= ${iconengines_DEPENDS}
+imageformats_build_DEPENDS= ${imageformats_DEPENDS}
+inputmethods_build_DEPENDS= ${inputmethods_DEPENDS}
+linguist_build_DEPENDS= ${linguist_DEPENDS}
+makeqpf_build_DEPENDS= ${makeqpf_DEPENDS}
+moc_build_DEPENDS= ${moc_DEPENDS}
+network_build_DEPENDS= ${network_DEPENDS}
+opengl_build_DEPENDS= ${opengl_DEPENDS}
+pixeltool_build_DEPENDS= ${pixeltool_DEPENDS}
+porting_build_DEPENDS= ${porting_DEPENDS}
+qdbusviewer_build_DEPENDS= ${qdbusviewer_DEPENDS}
+qmake_build_DEPENDS= ${qmake_DEPENDS}
+qmake_build_QT4_PREFIX= ${qmake_QT4_PREFIX}
+qt3support_build_DEPENDS= ${qt3support_DEPENDS}
+qtconfig_build_DEPENDS= ${qtconfig_DEPENDS}
+qtestlib_build_DEPENDS= ${qtestlib_DEPENDS}
+qvfb_build_DEPENDS= ${qvfb_DEPENDS}
+rcc_build_DEPENDS= ${rcc_DEPENDS}
+script_build_DEPENDS= ${script_DEPENDS}
+sql_build_DEPENDS= ${sql_DEPENDS}
+svg_build_DEPENDS= ${svg_DEPENDS}
+uic_build_DEPENDS= ${uic_DEPENDS}
+uic3_build_DEPENDS= ${uic3_DEPENDS}
+xml_build_DEPENDS= ${xml_DEPENDS}
+
+accessible_run_DEPENDS= ${accessible_DEPENDS}
+assistant_run_DEPENDS= ${assistant_DEPENDS}
+assistantclient_run_DEPENDS= ${assistantclient_DEPENDS}
+assistantclient_run_NAME= ${assistantclient_NAME}
+codecs-cn_run_DEPENDS= ${codecs-cn_DEPENDS}
+codecs-jp_run_DEPENDS= ${codecs-jp_DEPENDS}
+codecs-kr_run_DEPENDS= ${codecs-kr_DEPENDS}
+codecs-tw_run_DEPENDS= ${codecs-tw_DEPENDS}
+corelib_run_DEPENDS= ${corelib_DEPENDS}
+dbus_run_DEPENDS= ${dbus_DEPENDS}
+designer_run_DEPENDS= ${designer_DEPENDS}
+doc_run_DEPENDS= ${doc_DEPENDS}
+gui_run_DEPENDS= ${gui_DEPENDS}
+iconengines_run_DEPENDS= ${iconengines_DEPENDS}
+imageformats_run_DEPENDS= ${imageformats_DEPENDS}
+inputmethods_run_DEPENDS= ${inputmethods_DEPENDS}
+linguist_run_DEPENDS= ${linguist_DEPENDS}
+makeqpf_run_DEPENDS= ${makeqpf_DEPENDS}
+moc_run_DEPENDS= ${moc_DEPENDS}
+network_run_DEPENDS= ${network_DEPENDS}
+opengl_run_DEPENDS= ${opengl_DEPENDS}
+pixeltool_run_DEPENDS= ${pixeltool_DEPENDS}
+porting_run_DEPENDS= ${porting_DEPENDS}
+qdbusviewer_run_DEPENDS= ${qdbusviewer_DEPENDS}
+qmake_run_DEPENDS= ${qmake_DEPENDS}
+qmake_run_QT4_PREFIX= ${qmake_QT4_PREFIX}
+qt3support_run_DEPENDS= ${qt3support_DEPENDS}
+qtconfig_run_DEPENDS= ${qtconfig_DEPENDS}
+qtestlib_run_DEPENDS= ${qtestlib_DEPENDS}
+qvfb_run_DEPENDS= ${qvfb_DEPENDS}
+rcc_run_DEPENDS= ${rcc_DEPENDS}
+script_run_DEPENDS= ${script_DEPENDS}
+sql_run_DEPENDS= ${sql_DEPENDS}
+svg_run_DEPENDS= ${svg_DEPENDS}
+uic_run_DEPENDS= ${uic_DEPENDS}
+uic3_run_DEPENDS= ${uic3_DEPENDS}
+xml_run_DEPENDS= ${xml_DEPENDS}
+
.if defined(_POSTMKINCLUDED) && !defined(Qt_Post_Include)
Qt_Post_Include= bsd.qt.mk
+.for component in ${_QT_COMPONENTS_ALL}
+_QT_COMPONENTS_SUFFIXED+=${component} ${component}_build ${component}_run
+.endfor
+
.if defined(QT_COMPONENTS)
.for ext in ${QT_COMPONENTS}
-${ext}_QT4_PREFIX?= qt4-
-${ext}_QT4_VERSION?= ${QT4_VERSION}
-${ext}_NAME?= ${ext}
-.if ${_QT_COMPONENTS_ALL:M${ext}}!= ""
-BUILD_DEPENDS+= ${${ext}_QT4_PREFIX}${${ext}_NAME}>=${${ext}_QT4_VERSION}:${PORTSDIR}/${${ext}_DEPENDS}
-RUN_DEPENDS+= ${${ext}_QT4_PREFIX}${${ext}_NAME}>=${${ext}_QT4_VERSION}:${PORTSDIR}/${${ext}_DEPENDS}
+${ext}_QT4_PREFIX?= qt4-
+${ext}_QT4_VERSION?= ${QT4_VERSION}
+${ext}_NAME?= ${ext}
+_${ext}= ${ext}
+.if ${_QT_COMPONENTS_SUFFIXED:M${ext}}!= ""
+.if ${_${ext}:M*_build}!= ""
+BUILD_DEPENDS+= ${${ext}_QT4_PREFIX}${${ext}_NAME:S/_build//}>=${${ext}_QT4_VERSION}:${PORTSDIR}/${${ext}_DEPENDS}
+.elif ${_${ext}:M*_run}!= ""
+RUN_DEPENDS+= ${${ext}_QT4_PREFIX}${${ext}_NAME:S/_run//}>=${${ext}_QT4_VERSION}:${PORTSDIR}/${${ext}_DEPENDS}
+.else
+BUILD_DEPENDS+= ${${ext}_QT4_PREFIX}${${ext}_NAME}>=${${ext}_QT4_VERSION}:${PORTSDIR}/${${ext}_DEPENDS}
+RUN_DEPENDS+= ${${ext}_QT4_PREFIX}${${ext}_NAME}>=${${ext}_QT4_VERSION}:${PORTSDIR}/${${ext}_DEPENDS}
+.endif
.else
IGNORE= cannot install: unknown Qt4 component -- ${ext}
.endif
.endfor
.else
-BUILD_DEPENDS+= qt4>=${QT4_VERSION}:${PORTSDIR}/devel/qt4
-RUN_DEPENDS+= qt4>=${QT4_VERSION}:${PORTSDIR}/devel/qt4
+BUILD_DEPENDS+= qt4>=${QT4_VERSION}:${PORTSDIR}/devel/qt4
+RUN_DEPENDS+= qt4>=${QT4_VERSION}:${PORTSDIR}/devel/qt4
.endif
.endif
==== //depot/projects/soc2007/gabor_perlmk/Mk/bsd.ruby.mk#2 (text+ko) ====
@@ -3,7 +3,7 @@
#
# Created by: Akinori MUSHA <knu at FreeBSD.org>
#
-# $FreeBSD: ports/Mk/bsd.ruby.mk,v 1.162 2007/07/15 09:39:05 stas Exp $
+# $FreeBSD: ports/Mk/bsd.ruby.mk,v 1.163 2007/08/04 11:37:24 gabor Exp $
#
.if !defined(Ruby_Include)
==== //depot/projects/soc2007/gabor_perlmk/Tools/scripts/security-check.awk#2 (text+ko) ====
==== //depot/projects/soc2007/gabor_perlmk/UPDATING#2 (text+ko) ====
@@ -6,6 +6,23 @@
time you update your ports collection, before attempting any port
upgrades.
+20070804:
+ AFFECTS: users of DESTDIR
+ AUTHOR: gabor at FreeBSD.org
+
+DESTDIR is a feature, that allows installation of ports into separate
+environments, like jails. The previous implementation, introduced in the
+August 2006, had some problems and was very expensive to maintain. It was
+completely rolled back, and replaced with a brand new implementation utilizing
+chroot.
+
+When DESTDIR is set, the system will chroot into the specified directory, mount
+devfs, null mount the ports tree, then proceed with building and installing.
+Your kernel must support nullfs (is available as loadable kernel module on
+default installation). The target environment must be a full FreeBSD
+installation. For advanced use, read comments at the beginning of
+bsd.destdir.mk.
+
20070730:
AFFECTS: users of py-*
AUTHOR: python at FreeBSD.org
@@ -5489,4 +5506,4 @@
2) Update all p5-* modules.
portupgrade -f p5-\*
-$FreeBSD: ports/UPDATING,v 1.531 2007/07/30 09:40:56 alexbl Exp $
+$FreeBSD: ports/UPDATING,v 1.532 2007/08/04 11:37:23 gabor Exp $
More information about the p4-projects
mailing list