Date: Wed, 25 Jul 2007 08:18:11 GMT From: Gabor Kovesdan <gabor@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 124074 for review Message-ID: <200707250818.l6P8IBep074605@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=124074 Change 124074 by gabor@gabor_server on 2007/07/25 08:17:51 IFC Affected files ... .. //depot/projects/soc2006/gabor_destdir/CHANGES#10 integrate .. //depot/projects/soc2006/gabor_destdir/MOVED#13 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.gnome.mk#7 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#37 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.xorg.mk#2 integrate .. //depot/projects/soc2006/gabor_destdir/UPDATING#11 integrate Differences ... ==== //depot/projects/soc2006/gabor_destdir/CHANGES#10 (text+ko) ==== @@ -10,6 +10,12 @@ All ports committers are allowed to commit to this file. +20070723: +AUTHOR: rafan@FreeBSD.org + + * The default CONFIGURE_ARGS when GNU_CONFIGURE is set now contains + --mandir and --infodir if configure script supports them. + 20070712: AUTHOR: maho@FreeBSD.org @@ -1366,4 +1372,4 @@ Contact Erwin Lansing if you have any questions about your use of this document. -$FreeBSD: ports/CHANGES,v 1.74 2007/07/12 01:57:09 maho Exp $ +$FreeBSD: ports/CHANGES,v 1.75 2007/07/24 01:43:31 rafan Exp $ ==== //depot/projects/soc2006/gabor_destdir/MOVED#13 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1429 2007/07/23 02:11:21 rafan Exp $ +# $FreeBSD: ports/MOVED,v 1.1430 2007/07/23 13:52:04 danfe Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -3104,3 +3104,5 @@ java/linux-blackdown-jdk13||2007-07-22|Expired: unfixed security vulnerability devel/rx||2007-07-22|Expired: has been decommissioned and is no longer developed security/metasploit-devel|security/metasploit|2007-07-23|move to security/metasploit +x11/nvidia-driver-7184|x11/nvidia-driver-71xx|2007-07-23|moved to x11/nvidia-driver-71xx +x11/nvidia-driver-9631|x11/nvidia-driver-96xx|2007-07-23|moved to x11/nvidia-driver-96xx ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.gnome.mk#7 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: Fundamental; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.141 2007/06/28 16:02:48 pav Exp $ +# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.142 2007/07/23 09:35:27 rafan Exp $ # $NetBSD: $ # $MCom: ports/Mk/bsd.gnome.mk,v 1.414 2007/03/13 01:24:54 marcus Exp $ # @@ -116,8 +116,7 @@ --with-html-dir=${GNOME_HTML_DIR} \ --with-help-dir=${PREFIX}/share/gnome/help \ --disable-gtk-doc \ - --with-gconf-source=${GCONF_CONFIG_SOURCE} \ - --mandir=${PREFIX}/man + --with-gconf-source=${GCONF_CONFIG_SOURCE} gnomeprefix_USE_GNOME_IMPL=gnomehier .if !defined(WITHOUT_HACK) gnomeprefix_PREFIX=${LOCALBASE} ==== //depot/projects/soc2006/gabor_destdir/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.575 2007/07/16 10:12:03 lofi Exp $ +# $FreeBSD: ports/Mk/bsd.port.mk,v 1.576 2007/07/23 09:35:27 rafan Exp $ # $NetBSD: $ # # bsd.port.mk - 940820 Jordan K. Hubbard. @@ -636,7 +636,8 @@ # Set the following to specify all .info files your port installs. # # INFO - A list of .info files (omitting the trailing ".info"); -# only one entry per document! +# only one entry per document! These files are listed in +# the path relative to ${INFO_PATH}. # INFO_PATH - Path, where all .info files will be installed by your # port, relative to ${PREFIX} # Default: "share/info" if ${PREFIX} is equal to /usr @@ -866,7 +867,8 @@ # Default: ${ARCH}-portbld-freebsd${OSREL} # CONFIGURE_ARGS # - Pass these args to configure if ${HAS_CONFIGURE} is set. -# Default: "--prefix=${PREFIX} ${CONFIGURE_TARGET}" if +# Default: "--prefix=${PREFIX} --infodir=${PREFIX}/${INFO_PATH} +# --mandir=${MANPREFIX}/man ${CONFIGURE_TARGET}" if # GNU_CONFIGURE is set, "CC=${CC} CCFLAGS=${CFLAGS} # PREFIX=${PREFIX} INSTALLPRIVLIB=${PREFIX}/lib # INSTALLARCHLIB=${PREFIX}/lib" if PERL_CONFIGURE is set, @@ -2834,9 +2836,18 @@ .if !defined(CONFIGURE_MAX_CMD_LEN) CONFIGURE_MAX_CMD_LEN!= ${SYSCTL} -n kern.argmax .endif -CONFIGURE_ARGS+= --prefix=${PREFIX} ${CONFIGURE_TARGET} +CONFIGURE_ARGS+= --prefix=${PREFIX} $${_LATE_CONFIGURE_ARGS} ${CONFIGURE_TARGET} CONFIGURE_ENV+= lt_cv_sys_max_cmd_len=${CONFIGURE_MAX_CMD_LEN} HAS_CONFIGURE= yes + +SET_LATE_CONFIGURE_ARGS= \ + _LATE_CONFIGURE_ARGS="" ; \ + if [ ! -z "`./${CONFIGURE_SCRIPT} --help 2>&1 | ${GREP} -- '--mandir'`" ]; then \ + _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --mandir=${MANPREFIX}/man" ; \ + fi ; \ + if [ ! -z "`./${CONFIGURE_SCRIPT} --help 2>&1 | ${GREP} -- '--infodir'`" ]; then \ + _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --infodir=${PREFIX}/${INFO_PATH}/${INFO_SUBDIR}" ; \ + fi ; .endif # Passed to most of script invocations @@ -2966,6 +2977,20 @@ INFO_PATH?= info .endif +.if defined(INFO) +. for D in ${INFO:H} +RD:= ${D} +. if ${RD} != "." +. if !defined(INFO_SUBDIR) +INFO_SUBDIR:= ${RD} +. elif ${INFO_SUBDIR} != ${RD} +BROKEN= only one subdirectory in INFO is allowed +. endif +. endif +.undef RD +. endfor +.endif + DOCSDIR_REL?= ${DOCSDIR:S,^${PREFIX}/,,} EXAMPLESDIR_REL?= ${EXAMPLESDIR:S,^${PREFIX}/,,} DATADIR_REL?= ${DATADIR:S,^${PREFIX}/,,} @@ -3580,6 +3605,7 @@ .endif .if defined(HAS_CONFIGURE) @(cd ${CONFIGURE_WRKSRC} && \ + ${SET_LATE_CONFIGURE_ARGS} \ if ! ${SETENV} CC="${CC}" CXX="${CXX}" \ CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ INSTALL="/usr/bin/install -c ${_BINOWNGRP}" \ @@ -5578,14 +5604,14 @@ @${LS} ${PREFIX}/${INFO_PATH}/$i.info* | ${SED} -e s:${PREFIX}/::g >> ${TMPPLIST} @${ECHO_CMD} "@exec install-info --quiet %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \ >> ${TMPPLIST} - @if [ "`${DIRNAME} $i`" != "." ]; then \ - ${ECHO_CMD} "@unexec ${RMDIR} %D/info/`${DIRNAME} $i` 2> /dev/null || true" >> ${TMPPLIST}; \ - fi .endfor +.if defined(INFO_SUBDIR) + @${ECHO_CMD} "@unexec ${RMDIR} %D/${INFO_PATH}/${INFO_SUBDIR} 2> /dev/null || true" >> ${TMPPLIST} +.endif .if (${PREFIX} != "/usr") @${ECHO_CMD} "@unexec if [ -f %D/${INFO_PATH}/dir ]; then if sed -e '1,/Menu:/d' %D/${INFO_PATH}/dir | grep -q '^[*] '; then true; else rm %D/${INFO_PATH}/dir; fi; fi" >> ${TMPPLIST} .if (${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${X11BASE} && ${PREFIX} != ${LINUXBASE}) - @${ECHO_CMD} "@unexec rmdir %D/info 2> /dev/null || true" >> ${TMPPLIST} + @${ECHO_CMD} "@unexec rmdir %D/${INFO_PATH} 2>/dev/null || true" >> ${TMPPLIST} .endif .endif .endif ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.xorg.mk#2 (text+ko) ==== @@ -13,7 +13,7 @@ # # !!! Here be dragons !!! (yeah, here as well...) # -# $FreeBSD: ports/Mk/bsd.xorg.mk,v 1.1 2007/05/19 19:57:27 flz Exp $ +# $FreeBSD: ports/Mk/bsd.xorg.mk,v 1.2 2007/07/23 09:35:27 rafan Exp $ # XORG_Include_MAINTAINER= x11@FreeBSD.org @@ -42,8 +42,6 @@ MASTER_SITES?= ${MASTER_SITE_XORG} MASTER_SITE_SUBDIR?= individual/${XORG_CAT} -CONFIGURE_ARGS+= --mandir="${PREFIX}/man/" - . if ${XORG_CAT} == "app" USE_GNOME+= pkgconfig . endif ==== //depot/projects/soc2006/gabor_destdir/UPDATING#11 (text+ko) ==== @@ -6,9 +6,19 @@ time you update your ports collection, before attempting any port upgrades. +20070723: + AFFECTS: users of x11/nvidia-driver and slave ports + AUTHOR: danfe@FreeBSD.org + + NVVERSION is no longer user settable variable, it's derived from + DISTVERSION from now on. If you used nvidia-driver port with custom + NVVERSION, it's time to switch to corresponding legacy driver version + port. They were renamed in order to stop hardcoding explicit version + numbers in their [directory] names. + 20070718: AFFECTS: users of devel/llvm - AUTHOR: brooks@freebsd.org + AUTHOR: brooks@FreeBSD.org The llvm bytecode and .ll formats have changed as have numerious internal APIs. Existing users should consult the release notes. @@ -51,7 +61,7 @@ 20070704: AFFECTS: users of x11/kdebase3 - AUTHOR: kde@freebsd.org + AUTHOR: kde@FreeBSD.org The media kioslave now mounts all filesystems that support charset conversion with charset conversion turned on, set to the locale from the user's @@ -539,7 +549,7 @@ 20070313: AFFECTS: users of x11/kdebase3 - AUTHOR: kde@freebsd.org + AUTHOR: kde@FreeBSD.org The HAL option has been turned on by default and the fstabbackend patches which have kept the fstab backend for the media kioslave @@ -671,7 +681,7 @@ 20070210: AFFECTS: users of x11/kdebase3 - AUTHOR: kde@freebsd.org + AUTHOR: kde@FreeBSD.org The media kioslave now mounts cdrom/dvd volumes with local charset conversion (mount_cd9660 -C <charset>), which requires the cd9660_iconv @@ -1044,7 +1054,7 @@ 20061109 AFFECTS: users of milter-bogom, dk-milter, dkim-milter - AUTHOR: ache@freebsd.org + AUTHOR: ache@FreeBSD.org All 3 milters change their default user to "mailnull". @@ -1349,7 +1359,7 @@ 20060902: AFFECTS: users of japanese/uim-anthy and japanese/uim-canna - AUTHOR: nobutaka@freebsd.org + AUTHOR: nobutaka@FreeBSD.org Input modes for uim-anthy and uim-canna are reorganized since version 1.2.0. Please re-configure the following keybindings with uim-pref. @@ -1736,7 +1746,7 @@ 20060622: AFFECTS: users of www/dokuwiki - AUTHOR: miwi@freebsd.org + AUTHOR: miwi@FreeBSD.org The default install location has changed from ${PREFIX}/www/data/dokuwiki to ${PREFIX}/www/dokuwiki. @@ -2177,7 +2187,7 @@ 20060330: AFFECTS: users of x11/kdebase3 - AUTHOR: kde@freebsd.org + AUTHOR: kde@FreeBSD.org The genkdmconf.sh rc-script has been removed in favor of a kdm wrapper script, which now handles both launching kdm and automatically updating or @@ -5436,4 +5446,4 @@ 2) Update all p5-* modules. portupgrade -f p5-\* -$FreeBSD: ports/UPDATING,v 1.527 2007/07/19 14:52:17 flz Exp $ +$FreeBSD: ports/UPDATING,v 1.529 2007/07/23 13:56:16 danfe Exp $
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200707250818.l6P8IBep074605>