Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 8 Jun 2007 12:18:14 GMT
From:      Gabor Kovesdan <gabor@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 121210 for review
Message-ID:  <200706081218.l58CIEfm017456@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=121210

Change 121210 by gabor@gabor_server on 2007/06/08 12:18:05

	IFC

Affected files ...

.. //depot/projects/soc2006/gabor_destdir/CHANGES#6 integrate
.. //depot/projects/soc2006/gabor_destdir/GIDs#6 integrate
.. //depot/projects/soc2006/gabor_destdir/LEGAL#6 integrate
.. //depot/projects/soc2006/gabor_destdir/MOVED#7 integrate
.. //depot/projects/soc2006/gabor_destdir/Makefile#4 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.emacs.mk#5 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.gcc.mk#3 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.gnustep.mk#3 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.gstreamer.mk#4 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.java.mk#4 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.kde.mk#5 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#15 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.options.mk#2 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.subdir.mk#8 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.scons.mk#2 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.sites.mk#7 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.xorg.mk#1 branch
.. //depot/projects/soc2006/gabor_destdir/Templates/BSD.local.dist#1 branch
.. //depot/projects/soc2006/gabor_destdir/Tools/make_readmes#2 integrate
.. //depot/projects/soc2006/gabor_destdir/Tools/scripts/addport#2 integrate
.. //depot/projects/soc2006/gabor_destdir/Tools/scripts/mergebase.sh#1 branch
.. //depot/projects/soc2006/gabor_destdir/UIDs#6 integrate
.. //depot/projects/soc2006/gabor_destdir/UPDATING#7 integrate

Differences ...

==== //depot/projects/soc2006/gabor_destdir/CHANGES#6 (text+ko) ====

@@ -10,6 +10,28 @@
 
 All ports committers are allowed to commit to this file.
 
+20070524:
+AUTHOR: portmgr@FreeBSD.org
+The following changes were made to the ports infrastructure:
+
+  * The 'make-deinstall-all' target now checks for moved ports.
+
+  * The installation directories PORTEXAMPLES and PORTDATA are now defined.
+
+  * The USE_MAKESELF knob is added for ports that use the makeself archiver.
+
+  * The description of fetch-list was updated.  The targets fetch-required-list,
+    fetch-url-list, and fetch-urlall-list were added.
+
+  * 'make search' will also now search in ports/MOVED.
+
+  * The default method for 'make update' is now portsnap.  Previously,
+    you had to manually select one of 3 methods: SUP_UPDATE, CVS_UPDATE,
+    or PORTSNAP_UPDATE.  The latter is now obsolete.
+
+  * Several Makevar definitions have been moved to the pre-makefile section:
+    DATADIR, DOCSDIR, ETCDIR, EXAMPLESDIR, WWWDIR.
+
 20070403:
 AUTHOR: portmgr@FreeBSD.org
 The following changes were made to the ports infrastructure:
@@ -47,12 +69,21 @@
     added for porter's convenience.  They contain the values of their
     respective non-REL variables, except relative to installation PREFIX.
 
+20070313:
+AUTHOR: portmgr@FreeBSD.org
+The following changes were made to the ports infrastructure:
+
+  * bsd.ocaml.mk and bsd.xfce.mk were added.
+
+  * The FETCH_CMD was refactored so that ports can override the command,
+    the arguments, or both.
+
 20070306:
 AUTHOR: portmgr@FreeBSD.org
 The following changes were made to the ports infrastructure:
 
   * The remainging vestiges of FreeBSD 4.X support were removed.  Any
-    remaining users of 4.X should have stayed with the RELENG_4_EOL tag.
+    remaining users of 4.X should have stayed with the RELEASE_4_EOL tag.
 
   * It is now possible to include USE_PHP after bsd.port.pre.mk.
 
@@ -1320,4 +1351,4 @@
 Contact Erwin Lansing if you have any questions about your use of
 this document.
 
-$FreeBSD: ports/CHANGES,v 1.68 2007/04/02 23:14:45 pav Exp $
+$FreeBSD: ports/CHANGES,v 1.71 2007/06/03 01:01:35 linimon Exp $

==== //depot/projects/soc2006/gabor_destdir/GIDs#6 (text+ko) ====

@@ -1,4 +1,4 @@
-$FreeBSD: ports/GIDs,v 1.37 2007/04/11 13:27:34 miwi Exp $
+$FreeBSD: ports/GIDs,v 1.41 2007/05/30 06:11:56 miwi Exp $
 # Please keep this file sorted by GID!
 smmsp:*:25:
 bind:*:53:
@@ -52,6 +52,7 @@
 ircproxyd:*:118:
 mythtv:*:119:
 pdns:*:120
+otrs:*:121:
 _ntp:*:123:
 fetchmail:*:124
 postfix:*:125:
@@ -84,6 +85,7 @@
 smx:*:264:
 haclient:*:275:
 mrtg:*:279:
+prelude:*:281:
 _sphinx:*:312:
 dkfilter:*:325:
 wildfire:*:340:
@@ -92,6 +94,7 @@
 drweb:*:426:
 courier:*:465:
 _bbstored:*:505:
+nullmail:*:522:
 dkimproxy:*:525:
 ejabberd:*:544:
 qtss:*:554:
@@ -102,10 +105,11 @@
 tacacs:*:559:
 distcc:*:561:
 polkit:*:562:
+pulse:*:563:
+pulse-access:*:564:
 _xsi:*:600:
 bnetd:*:700:
 bopm:*:717:
 openxpki:*:777:
 netdisco:*:840:
 bacula:*:910:
-otrs:*:121:

==== //depot/projects/soc2006/gabor_destdir/LEGAL#6 (text+ko) ====

@@ -1,5 +1,5 @@
 # Creator:  Jordan Hubbard
-# $FreeBSD: ports/LEGAL,v 1.534 2007/04/13 15:52:55 miwi Exp $
+# $FreeBSD: ports/LEGAL,v 1.542 2007/06/07 08:59:34 miwi Exp $
 
    **********************************************************************
    ***                      NOTE TO COMMITTERS                        ***
@@ -128,6 +128,7 @@
 						free for commercial use
 DarwinStreamingSrvr*-Source.tar net/DarwinStreamingServer Server License restrictions
 						See http://www.opensource.apple.com/apsl/
+darwinia-demo		games/linux-darwinia-demo Redistribution limited
 vbsd*e.tar.Z		security/vscan		Restricted to the license
 						terms set for VirusScan
 dbvis			java/dbvis		Redistribution is not permitted
@@ -135,6 +136,7 @@
 						beta status
 dcl-*-C.tar.gz		science/cdcl		No commercial use
 dcl-*.tar.gz		science/dcl		No commercial use
+defcon			games/linux-defcon	Redistribution limited
 DFSongSd.ttf		chinese/dfsongsd	No redistribution or
 						commercial use is allowed
 dgd/*			net/dgd			License required for commercial
@@ -158,6 +160,7 @@
 						http://cr.yp.to/softwarelaw.html
 djbfft-*		math/djbfft		No license -- see
 						http://cr.yp.to/softwarelaw.html
+dlv			lang/dlv		Not sure if we can redistribute it
 dn*.tgz			emulators/darcnes	Commercial use is restricted
 dnews_*			news/dnews		Only free for schools and
 						universities, but they have to
@@ -377,10 +380,11 @@
 lame*			audio/lame		May be patented
 lgrind/*		print/lgrind		Contains non-free code written by
 						Van Jacobson
+libamrnb		audio/libamrnb		No redistribution allowed
+libamrwb		audio/libamrwb		No redistribution allowed
 libdvdcss-*.tar.bz2	multimedia/libdvdcss	CSS code may violate the DMCA
 libidea-*		security/libidea	Crypto; export-controlled
 libots-*.alpha.rpm	lang/compaq-cc		Distribution not allowed
-LimeWireOther.zip	net-p2p/limewire	No redistribution allowed
 Linux-ACU-Driver-v*	sysutils/linux-acu	Redistribution not allowed
 Linux_MegaCli_*		sysutils/linux-megacli	Redistribution not allowed
 rpm/i386/fedora/4/gtk2-* x11-toolkits/linux-gtk2 LGPL binary, no source
@@ -433,6 +437,8 @@
 NetComponents-*		java/netcomponents	No redistribution except as part
 						of a substantially different product
 netshow_linux.gz	multimedia/netshow	Commercial software
+nerolinux-*		sysutils/linux-nero	Must be downloaded from WWW and
+						a Serial Number must be bought
 nntpcache-*		news/nntpcache		Commercial or government use
 						requires license
 nsc2ke.*		math/nsc2ke		No resale, contact author for
@@ -596,6 +602,7 @@
 						original source code
 ut_linux_mgr_*		sysutils/linux-megamgr	Redistribution prohibited
 linux-ut/*		games/linux-ut		Redistribution limited
+uplink-demo		games/linux-uplink-demo	Redistribution limited
 ut2004-lnx-*		games/linux-ut2004-demo	Redistribution limited
 uzap.tar.gz             editors/uzap		Restrictive copyright
 vbsd440e.tar.Z		security/vscan		Commercial software
@@ -675,3 +682,4 @@
 lha-1.14i-ac*		archivers/lha-ac	No Redistribution
 GotoBLAS*		math/gotoblas		No Redistribution
 gamess.*/gamess*	science/gamess		No Redistribution
+vst_sdk2_3.zip		audio/ardour		Redistribution of the VST PlugIns SDK is not allowed

==== //depot/projects/soc2006/gabor_destdir/MOVED#7 (text+ko) ====

@@ -1,7 +1,7 @@
 #
 # MOVED - a list of (recently) moved or removed ports
 #
-# $FreeBSD: ports/MOVED,v 1.1348 2007/04/11 11:29:23 sem Exp $
+# $FreeBSD: ports/MOVED,v 1.1386 2007/06/06 14:13:51 naddy Exp $
 #
 # Each entry consists of a single line containing the following four
 # fields in the order named, separated with the pipe (`|') character:
@@ -22,6 +22,7 @@
 # (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
@@ -941,7 +942,6 @@
 textproc/yaxi|textproc/ocaml-yaxi|2004-03-19|port renamed
 devel/camomile|devel/ocaml-camomile|2004-03-19|port renamed
 archivers/gshar+gunshar|archivers/sharutils|2004-03-19|port renamed
-devel/imake|devel/imake-4|2004-03-19|removed, obsoleted by imake-4 long ago
 net/arpwatch-devel|net-mgmt/arpwatch-devel|2004-03-20|moved to better fitting category
 multimedia/ffmpeg045|multimedia/ffmpeg|2004-03-20|latest stable version is better
 editors/emacs21|editors/emacs|2004-03-20|emacs 21.x moved to default port location
@@ -2381,7 +2381,6 @@
 emulators/linux_base-fc3||2006-07-04|Has expired: superseeded by linux_base-fc4 port
 misc/linux-opengroupware||2006-07-04|Has expired
 net/opengk||2006-07-04|Has expired: Latest version is from 2003-02-03. Use net/gatekeeper instead
-security/p5-Crypt-OpenPGP||2006-07-04|Has expired: Crypt-OpenPGP was abandoned in 2002, use security/gnupg instead
 textproc/sed_inplace||2006-07-04|Has expired: This port is not required anymore
 textproc/xml4j||2006-07-04|Has expired: it has been replaced by textproc/xerces-j 8 years ago
 www/sitemapgen|www/google-sitemapgen|2006-07-05|Duplicate port
@@ -2913,7 +2912,6 @@
 databases/pecl-paradox||2007-04-10|Has expired: Does not compile
 deskutils/yank||2007-04-10|Has expired: Incomplete pkg-plist
 emulators/kmamerun||2007-04-10|Has expired: Project was abandoned 4 years ago and expects an old version of XMAME, please use other frontends instead (like gxmame)
-graphics/hobbes-icons-xpm||2007-04-10|Has expired: Archaic port
 japanese/firefox-ja||2007-04-10|Has expired: Incomplete pkg-plist
 japanese/lookup-xemacs||2007-04-10|Has expired: Does not install
 lang/linux-hla||2007-04-10|Has expired: Does not compile
@@ -2936,3 +2934,133 @@
 www/urchin5||2007-04-10|Has expired: Does not install
 databases/cyrus-smlacapd||2007-04-10|Has expired: this software is obsolete
 databases/mysql-administrator||2007-04-11|Removed
+devel/crossgo32||2007-04-14|Has expired: Archaic port
+devel/crossgo32-djgpp2||2007-04-14|Removed, Archaic port
+devel/crossgo32-djgpp2-pdcurses||2007-04-14|Removed, Archaic port
+www/xsm|www/extsm|2007-04-16|was moved to resolve conflict with x11/xsm import
+lang/tk-wrapper|x11-toolkits/tk-wrapper|2007-04-16|Moved to correct category
+lang/gcc-objc|lang/gcc41|2007-04-21|Has expired, obsolete
+cad/geda-projectmanager||2007-04-23|Has expired: project dead
+audio/xmpeg3||2007-04-23|Has expired: does not work
+japanese/dvipdfm|print/dvipdfmx|2007-04-24|Obsolete
+audio/xmms-real-random||2007-04-24|Removed per maintainer's request, serious multimedia users have surely moved beyond xmms(1)
+chinese/mldonkey-core||2007-04-26|Obsoleted by net-p2p/mldonkey version 2.8.5
+graphics/gstreamer-plugins-libcaca80||2007-04-29|Obsoleted, use 0.10.x version instead
+devel/make||2007-04-29|Port was only useful on FreeBSD 4.x
+multimedia/libdts|multimedia/libdca|2007-05-01|Project renamed
+dns/dnscap||2007-05-03|Removed on authors request until it has reached stability
+net-im/libgaim|net-im/libpurple|2007-05-03|Project renamed
+net-im/gaim-devel|net-im/pidgin|2007-05-03|Project renamed
+net-im/gaim-consoleui-devel|net-im/finch|2007-05-03|Project renamed
+devel/imake-6|devel/imake|2007-05-19|Remove hardcoded version from portname
+x11-fonts/xorg-fonts-encodings|x11-fonts/encodings|2007-05-19|Encoding fonts are now distributed separately
+x11/xorg-documents|x11/xorg-docs|2007-05-19|X.org documentation now has its own distfile, rename accordingly
+x11/xorg-manpages|||X.org manual pages are now installed with every single port
+x11/xorg-clients|x11/xorg-apps|2007-05-19|Rename to new xorg-apps meta-port
+x11/libXfont|x11-fonts/libXfont|2007-05-19|Move to the x11-fonts category
+x11-servers/xorg-fontserver|x11-fonts/xfs|2007-05-19|Rename to follow X.org name
+x11/xlibs|xorg-libraries|2007-05-25|Replaced by x11/xorg-libraries
+multimedia/ffmpeg-devel|multimedia/ffmpeg|2007-05-25|Merged multimedia/ffmpeg-devel into multimedia/ffmpeg
+devel/wfut||2007-05-27|Obsolete
+net-im/gaim-hotkeys|net-im/pidgin-hotkeys|2007-05-28|Project renamed
+devel/ruby-inline||2007-05-28|Has expired: New versions only available in rubygems. Use devel/rubygem-inline instead.
+devel/tkref||2007-05-28|Has expired: is seriously outdated, take a look at http://www.tcl.tk/doc/ for TCL/TK documentation
+net-p2p/amule1||2007-05-28|Has expired: use net-p2p/amule2 if you are running OSVERSION > 500000
+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
+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
+audio/gstreamer-plugins-cdaudio80|audio/gstreamer-plugins-cdaudio|2007-06-01|Gstreamer 0.8 has been removed
+audio/gstreamer-plugins-cdparanoia80|audio/gstreamer-plugins-cdparanoia|2007-06-01|Gstreamer 0.8 has been removed
+audio/gstreamer-plugins-esound80|audio/gstreamer-plugins-esound|2007-06-01|Gstreamer 0.8 has been removed
+audio/gstreamer-plugins-faac80|audio/gstreamer-plugins-faac|2007-06-01|Gstreamer 0.8 has been removed
+audio/gstreamer-plugins-faad80|audio/gstreamer-plugins-faad|2007-06-01|Gstreamer 0.8 has been removed
+audio/gstreamer-plugins-flac80|audio/gstreamer-plugins-flac|2007-06-01|Gstreamer 0.8 has been removed
+audio/gstreamer-plugins-gsm80|audio/gstreamer-plugins-gsm|2007-06-01|Gstreamer 0.8 has been removed
+audio/gstreamer-plugins-ivorbis80|audio/gstreamer-plugins-ivorbis|2007-06-01|Gstreamer 0.8 has been removed
+audio/gstreamer-plugins-jack80|audio/gstreamer-plugins-jack|2007-06-01|Gstreamer 0.8 has been removed
+audio/gstreamer-plugins-ladspa80|audio/gstreamer-plugins-ladspa|2007-06-01|Gstreamer 0.8 has been removed
+audio/gstreamer-plugins-lame80|audio/gstreamer-plugins-lame|2007-06-01|Gstreamer 0.8 has been removed
+audio/gstreamer-plugins-mad80|audio/gstreamer-plugins-mad|2007-06-01|Gstreamer 0.8 has been removed
+audio/gstreamer-plugins-mikmod80||2007-06-01|Gstreamer 0.8 has been removed
+audio/gstreamer-plugins-musepack80|audio/gstreamer-plugins-musepack|2007-06-01|Gstreamer 0.8 has been removed
+audio/gstreamer-plugins-musicbrainz80|audio/gstreamer-plugins-musicbrainz|2007-06-01|Gstreamer 0.8 has been removed
+audio/gstreamer-plugins-nas80||2007-06-01|Gstreamer 0.8 has been removed
+audio/gstreamer-plugins-ogg80|audio/gstreamer-plugins-ogg|2007-06-01|Gstreamer 0.8 has been removed
+audio/gstreamer-plugins-polyp80||2007-06-01|Gstreamer 0.8 has been removed
+audio/gstreamer-plugins-shout280|audio/gstreamer-plugins-shout2|2007-06-01|Gstreamer 0.8 has been removed
+audio/gstreamer-plugins-shout80||2007-06-01|Gstreamer 0.8 has been removed
+audio/gstreamer-plugins-sidplay80|audio/gstreamer-plugins-sidplay|2007-06-01|Gstreamer 0.8 has been removed
+audio/gstreamer-plugins-smoothwave80||2007-06-01|Gstreamer 0.8 has been removed
+audio/gstreamer-plugins-sndfile80||2007-06-01|Gstreamer 0.8 has been removed
+audio/gstreamer-plugins-speex80|audio/gstreamer-plugins-speex|2007-06-01|Gstreamer 0.8 has been removed
+audio/gstreamer-plugins-vorbis80|audio/gstreamer-plugins-vorbis|2007-06-01|Gstreamer 0.8 has been removed
+devel/gstreamer-plugins-gconf80|devel/gstreamer-plugins-gconf|2007-06-01|Gstreamer 0.8 has been removed
+devel/gstreamer-plugins-gnomevfs80|devel/gstreamer-plugins-gnomevfs|2007-06-01|Gstreamer 0.8 has been removed
+devel/gstreamer-plugins-sdl80|devel/gstreamer-plugins-sdl|2007-06-01|Gstreamer 0.8 has been removed
+graphics/gstreamer-plugins-aalib80|graphics/gstreamer-plugins-aalib|2007-06-01|Gstreamer 0.8 has been removed
+graphics/gstreamer-plugins-cairo80|graphics/gstreamer-plugins-cairo|2007-06-01|Gstreamer 0.8 has been removed
+graphics/gstreamer-plugins-gdkpixbuf80||2007-06-01|Gstreamer 0.8 has been removed
+graphics/gstreamer-plugins-hermes80||2007-06-01|Gstreamer 0.8 has been removed
+graphics/gstreamer-plugins-jpeg80|graphics/gstreamer-plugins-jpeg|2007-06-01|Gstreamer 0.8 has been removed
+graphics/gstreamer-plugins-libmng80||2007-06-01|Gstreamer 0.8 has been removed
+graphics/gstreamer-plugins-libpng80|graphics/gstreamer-plugins-libpng|2007-06-01|Gstreamer 0.8 has been removed
+graphics/gstreamer-plugins-libvisual80|graphics/gstreamer-plugins-libvisual|2007-06-01|Gstreamer 0.8 has been removed
+graphics/gstreamer-plugins-swfdec80|graphics/gstreamer-plugins-swfdec|2007-06-01|Gstreamer 0.8 has been removed
+multimedia/gstreamer-ffmpeg80|multimedia/gstreamer-ffmpeg|2007-06-01|Gstreamer 0.8 has been removed
+multimedia/gstreamer-plugins-all80|multimedia/gstreamer-plugins-all|2007-06-01|Gstreamer 0.8 has been removed
+multimedia/gstreamer-plugins-core80|multimedia/gstreamer-plugins-core|2007-06-01|Gstreamer 0.8 has been removed
+multimedia/gstreamer-plugins-dts80|multimedia/gstreamer-plugins-dts|2007-06-01|Gstreamer 0.8 has been removed
+multimedia/gstreamer-plugins-dv80|multimedia/gstreamer-plugins-dv|2007-06-01|Gstreamer 0.8 has been removed
+multimedia/gstreamer-plugins-dvd80|multimedia/gstreamer-plugins-dvd|2007-06-01|Gstreamer 0.8 has been removed
+multimedia/gstreamer-plugins-libfame80||2007-06-01|Gstreamer 0.8 has been removed
+multimedia/gstreamer-plugins-mpeg2dec80|multimedia/gstreamer-plugins-mpeg2dec|2007-06-01|Gstreamer 0.8 has been removed
+multimedia/gstreamer-plugins-mplex80||2007-06-01|Gstreamer 0.8 has been removed
+multimedia/gstreamer-plugins-theora80|multimedia/gstreamer-plugins-theora|2007-06-01|Gstreamer 0.8 has been removed
+multimedia/gstreamer-plugins-x26480||2007-06-01|Gstreamer 0.8 has been removed
+multimedia/gstreamer-plugins-xvid80|multimedia/gstreamer-plugins-xvid|2007-06-01|Gstreamer 0.8 has been removed
+multimedia/gstreamer-plugins80|multimedia/gstreamer-plugins|2007-06-01|Gstreamer 0.8 has been removed
+multimedia/gstreamer80|multimedia/gstreamer|2007-06-01|Gstreamer 0.8 has been removed
+multimedia/py-gstreamer80|multimedia/py-gstreamer|2007-06-01|Gstreamer 0.8 has been removed
+net/gstreamer-plugins-libmms80|net/gstreamer-plugins-libmms|2007-06-01|Gstreamer 0.8 has been removed
+sysutils/gstreamer-plugins-cdio80||2007-06-01|Gstreamer 0.8 has been removed
+x11-toolkits/gstreamer-plugins-pango80|x11-toolkits/gstreamer-plugins-pango|2007-06-01|Gstreamer 0.8 has been removed
+audio/goobox||2007-06-01|Gstreamer 0.8 has been removed
+audio/jamboree||2007-06-01|Gstreamer 0.8 has been removed
+audio/klira||2007-06-01|Gstreamer 0.8 has been removed
+audio/lindele||2007-06-01|Gstreamer 0.8 has been removed
+audio/gstreamer-monkeysaudio||2007-06-01|Gstreamer 0.8 has been removed
+audio/tunesbrowser||2007-06-01|Gstreamer 0.8 has been removed
+games/gnome-music-quiz||2007-06-01|Gstreamer 0.8 has been removed
+multimedia/gstreamer-editor||2007-06-01|Gstreamer 0.8 has been removed
+multimedia/gstreamer-pitfdll||2007-06-01|Gstreamer 0.8 has been removed
+multimedia/istanbul||2007-06-01|Gstreamer 0.8 has been removed
+devel/agenda-libs||2007-06-02|Has expired: Agenda VR3 is dead for long time
+devel/agenda-headers||2007-06-02|Has expired: Agenda VR3 is dead for long time
+devel/agenda-snow-libs||2007-06-02|Has expired: Agenda VR3 is dead for long time
+devel/agenda-static-libs||2007-06-02|Has expired: Agenda VR3 is dead for long time
+devel/mipsel-linux-binutils||2007-06-02|Has expired: This is Agenda VR3-specific port, and Agenda VR3 is dead for long time.
+devel/mipsel-linux-gcc||2007-06-02|Has expired: This is Agenda VR3-specific port, and Agenda VR3 is dead for long time.
+devel/mipsel-linux-kernel-headers||2007-06-02|Has expired: This is Agenda VR3-specific port, and Agenda VR3 is dead for long time.
+net/mrtg-ping-probe|net-mgmt/mrtg-ping-probe|2007-06-03|related ports mrtg was moved to net-mgmt from net
+japanese/addttfont||2007-06-03|obsolete
+japanese/p5-mkres||2007-06-03|obsolete
+x11-toolkits/py-wmgeneral||2007-06-04|Renamed to x11-toolkits/py-wmdockapps
+misc/gretl|math/gretl|2007-06-04|New category
+devel/ups-debug||2007-06-04|Has expired: only runs on FreeBSD 4.X/386
+korean/han||2007-06-04|Has expired: Broken on all supported versions of FreeBSD
+net/tspc2||2007-06-04|Has expired: development is discontinued
+net-p2p/freenet||2007-06-04|Has expired: Does not work with existing Freenet network
+net-p2p/libfreenet||2007-06-04|Has expired: Does not work with existing Freenet network
+net-p2p/microdc||2007-06-04|Has expired: microdc is no longer in development. Consider using net-p2p/microdc2 instead
+security/op||2007-06-04|Has expired: no longer available from any mastersite
+shells/bash2||2007-06-04|Has expired: Old, unmaintained version, use shells/bash instead
+sysutils/xperfmon||2007-06-04|Has expired: irrelevant for supported FreeBSD releases
+textproc/ruby-html-parser||2007-06-04|Has expired: distfile and homepage disappeared
+textproc/ruby-libxslt||2007-06-04|Has expired: Broken on all supported versions of FreeBSD
+www/py-htmltestcase||2007-06-04|Has expired: Upstream site disappeared and dependency is set to expire
+multimedia/snd-music-duplicates||2007-06-05|Has expired: Development has been ceased, successor is shareware.
+audio/freebirth||2007-06-05|Has expired: Doesn't work on FreeBSD 5.0 and higher
+net/sixxs-heartbeatd||2007-06-05|obsolete, use net/sixxs-aiccu instead

==== //depot/projects/soc2006/gabor_destdir/Makefile#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: ports/Makefile,v 1.99 2007/02/26 08:54:07 ru Exp $
+# $FreeBSD: ports/Makefile,v 1.102 2007/05/24 23:58:29 linimon Exp $
 #
 
 SUBDIR += accessibility
@@ -57,6 +57,7 @@
 SUBDIR += www
 SUBDIR += x11
 SUBDIR += x11-clocks
+SUBDIR += x11-drivers
 SUBDIR += x11-fm
 SUBDIR += x11-fonts
 SUBDIR += x11-servers
@@ -97,6 +98,7 @@
 	if [ "${INDEX_PRISTINE}" != "" ]; then \
 		export LOCALBASE=/nonexistentlocal; \
 		export X11BASE=/nonexistentx; \
+		export USE_NONDEFAULT_X11BASE=1; \
 	fi; \
 	tmpdir=`/usr/bin/mktemp -d -t index` || exit 1; \
 	trap "rm -rf $${tmpdir}; exit 1" 1 2 3 5 10 13 15; \
@@ -151,14 +153,8 @@
 SUPFLAGS+=	-h ${SUPHOST}
 .endif
 update:
-.if defined(PORTSNAP_UPDATE)
+.if defined(SUP_UPDATE) && defined(PORTSSUPFILE)
 	@echo "--------------------------------------------------------------"
-	@echo ">>> Running ${PORTSNAP}"
-	@echo "--------------------------------------------------------------"
-	@${PORTSNAP} ${PORTSNAP_FLAGS} fetch
-	@${PORTSNAP} ${PORTSNAP_FLAGS} update
-.elif defined(SUP_UPDATE) && defined(PORTSSUPFILE)
-	@echo "--------------------------------------------------------------"
 	@echo ">>> Running ${SUP}"
 	@echo "--------------------------------------------------------------"
 	@${SUP} ${SUPFLAGS} ${PORTSSUPFILE}
@@ -171,5 +167,17 @@
 	@${ECHO_MSG} "Error: Please define PORTSSUPFILE before doing make update."
 	@exit 1
 .else
-	@${ECHO_MSG} "Error: Please define either PORTSNAP_UPDATE, SUP_UPDATE, or CVS_UPDATE first."
+	@echo "--------------------------------------------------------------"
+	@echo ">>> Running ${PORTSNAP}"
+	@echo "--------------------------------------------------------------"
+.if !exists(${PORTSDIR}/.portsnap.INDEX)
+	@echo "Error: 'make update' uses portsnap(8) by default and"
+	@echo "needs ${PORTSDIR} to be created by portsnap on its first run."
+	@echo "Please run 'portsnap fetch extract' first."
+	@echo "You can also define SUP_UPDATE and PORTSSUPFILE to use csup(1)"
+	@echo "or CVS_UPDATE to use cvs(1) for updating."
+.else
+	@${PORTSNAP} ${PORTSNAP_FLAGS} fetch
+	@${PORTSNAP} ${PORTSNAP_FLAGS} update
+.endif
 .endif

==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.emacs.mk#5 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-#	$FreeBSD: ports/Mk/bsd.emacs.mk,v 1.62 2007/04/04 07:24:06 clsung Exp $
+#	$FreeBSD: ports/Mk/bsd.emacs.mk,v 1.65 2007/05/27 17:43:21 anray Exp $
 #
 #	bsd.emacs.mk - 19990829 Shigeyuki Fukushima.
 #
@@ -115,7 +115,7 @@
 # Emacs-22.x
 .elif (${EMACS_PORT_NAME} == "emacs22")
 EMACS_NAME=		emacs
-EMACS_VER=		22.0.97
+EMACS_VER=		22.0.99
 EMACS_MAJOR_VER=	22
 EMACS_LIBDIR?=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER?=	share/${EMACS_NAME}/${EMACS_VER}
@@ -183,7 +183,7 @@
 # XEmacs-21 development version
 .elif (${EMACS_PORT_NAME} == "xemacs-devel")
 EMACS_NAME=		xemacs
-EMACS_VER=		21.5-b27
+EMACS_VER=		21.5-b28
 EMACS_MAJOR_VER=	21
 EMACS_LIBDIR?=		lib/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER?=	lib/${EMACS_NAME}-${EMACS_VER}
@@ -201,7 +201,7 @@
 .elif (${EMACS_PORT_NAME} == "xemacs-devel-mule") || \
 	(${EMACS_PORT_NAME} == "xemacs-mule-xft")
 EMACS_NAME=		xemacs
-EMACS_VER=		21.5-b27
+EMACS_VER=		21.5-b28
 EMACS_MAJOR_VER=	21
 EMACS_LIBDIR?=		lib/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER?=	lib/${EMACS_NAME}-${EMACS_VER}

==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.gcc.mk#3 (text+ko) ====

@@ -18,7 +18,7 @@
 # If you are wondering what your port exactly does, use "make test-gcc"
 # to see some debugging.
 #
-# $FreeBSD: ports/Mk/bsd.gcc.mk,v 1.11 2007/01/29 09:27:04 pav Exp $
+# $FreeBSD: ports/Mk/bsd.gcc.mk,v 1.12 2007/05/19 22:06:14 pav Exp $
 #
 
 GCC_Include_MAINTAINER=		gerald@FreeBSD.org
@@ -41,10 +41,10 @@
 GCCVERSION_029500=	400012 500035 2.95
 GCCVERSION_030200=	500039 501103 3.2
 GCCVERSION_030301=	501103 502126 3.3
-GCCVERSION_030402=	502126 999999 3.4
+GCCVERSION_030402=	502126 700042 3.4
 GCCVERSION_040000=	999999 999999 4.0
 GCCVERSION_040100=	999999 999999 4.1
-GCCVERSION_040200=	999999 999999 4.2
+GCCVERSION_040200=	700042 999999 4.2
 
 #
 # No configurable parts below this.

==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.gnustep.mk#3 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: ports/Mk/bsd.gnustep.mk,v 1.42 2007/01/30 04:25:35 kris Exp $
+# $FreeBSD: ports/Mk/bsd.gnustep.mk,v 1.43 2007/06/04 11:20:29 dinoex Exp $
 #
 # This file contains some variable definitions that are supposed to
 # make your life easier when dealing with ports related to the GNUstep.
@@ -216,7 +216,7 @@
 .if !defined(GNUSTEP_WITH_BASE_GCC)
 .if !defined(GNUSTEP_WITH_GCC32) && !defined(GNUSTEP_WITH_GCC33) && !defined(GNUSTEP_WITH_GCC34)
 .if !defined(GNUSTEP_WITH_GCC40) && !defined(GNUSTEP_WITH_GCC41) && !defined(GNUSTEP_WITH_GCC42)
-GNUSTEP_WITH_GCC41=	yes
+GNUSTEP_WITH_GCC42=	yes
 .endif
 .endif
 

==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.gstreamer.mk#4 (text+ko) ====

@@ -6,7 +6,7 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # Date:		4 Oct 2004
 #
-# $FreeBSD: ports/Mk/bsd.gstreamer.mk,v 1.33 2007/03/08 14:20:01 ahze Exp $
+# $FreeBSD: ports/Mk/bsd.gstreamer.mk,v 1.38 2007/06/07 16:21:34 ahze Exp $
 #    $MCom: ports/Mk/bsd.gstreamer.mk,v 1.38 2006/10/10 20:22:01 mezz Exp $
 
 .if !defined(_POSTMKINCLUDED) && !defined(Gstreamer_Pre_Include)
@@ -20,8 +20,6 @@
 #
 #  For Gstreamer 0.10:
 # USE_GSTREAMER=	lame faac ffmpeg
-#  For Gstreamer 0.8:
-# USE_GSTREAMER80=	dvd lame flac
 #
 # If you want to use USE_GSTREAMER after <bsd.port.pre.mk>
 # you must follow one of the examples listed below
@@ -48,45 +46,30 @@
 #
 
 GSTREAMER_PORT=		${PORTSDIR}/multimedia/gstreamer-plugins
-GSTREAMER80_PORT=	${GSTREAMER_PORT}80
 _GST_LIB_BASE=		${LOCALBASE}/lib/gstreamer-${GST_VERSION}
-_GST80_LIB_BASE=	${LOCALBASE}/lib/gstreamer-${GST80_VERSION}
 GST_VERSION=		0.10
 GST_MINOR_VERSION=	.0
-GST80_VERSION=		0.8
-GST80_MINOR_VERSION=	.10
 GST_SHLIB_VERSION=	1
-GST80_SHLIB_VERSION=	1
 #
 # These are the current supported gstreamer-plugins modules
 #
-_USE_GSTREAMER_ALL=	a52dec aalib annodex bad bz2 cairo cdaudio cdparanoia dts \
+_USE_GSTREAMER10_ALL=	a52dec aalib annodex bad bz2 cairo cdaudio cdparanoia dts \
 			dv dvd esound faac faad ffmpeg flac gconf gnomevfs \
 			gnonlin good gsm hal ivorbis jack jpeg ladspa lame \
-			libcaca libmms libpng libvisual mad mpeg2enc mpeg2dec \
+			libcaca libmms libpng libvisual mp3 mpeg2enc mpeg2dec \
 			musepack neon ogg pango pulse python sdl shout2 sidplay \
 			spc speex swfdec theora ugly vorbis wavpack xvid
-_USE_GSTREAMER80_ALL=	a52dec aalib artsd audiofile cairo cdaudio cdio cdparanoia \
-			dts dv dvd esound faac faad ffmpeg flac \
-			gconf gdkpixbuf gnomevfs gsm hermes ivorbis jack jpeg \
-			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 \
-			python swfdec vorbis x264 xvid
+
 # other plugins
-OTHER_GSTREAMER_PLUGINS+=	core yes
-OTHER_GSTREAMER80_PLUGINS+=	${OTHER_GSTREAMER_PLUGINS}
+OTHER_GSTREAMER_PLUGINS+=	core yes ${_USE_GSTREAMER10_ALL} fluendo-mp3 mad
 
 _USE_GSTREAMER_ALL+=	${OTHER_GSTREAMER_PLUGINS}
-_USE_GSTREAMER80_ALL+=	${OTHER_GSTREAMER80_PLUGINS}
 
 core_DEPENDS=	multimedia/gstreamer-plugins-core
 
 yes_DEPENDS=	multimedia/gstreamer-plugins
 yes_NAME=	gstreamer-plugins
-yes_GST80_PREFIX=	# empty
-yes_GST_PREFIX=		# empty
+yes_GST_PREFIX=	# empty
 
 cdio_DEPENDS=	sysutils/gstreamer-plugins-cdio
 
@@ -111,6 +94,8 @@
 
 flac_DEPENDS=	audio/gstreamer-plugins-flac
 
+fluendo-mp3_DEPENDS=	audio/gstreamer-plugins-fluendo-mp3
+
 gsm_DEPENDS=	audio/gstreamer-plugins-gsm
 
 ivorbis_DEPENDS=	audio/gstreamer-plugins-ivorbis
@@ -127,6 +112,8 @@
 
 mikmod_DEPENDS=	audio/gstreamer-plugins-mikmod
 
+mp3_DEPENDS=	audio/gstreamer-plugins-mp3
+
 musepack_DEPENDS=	audio/gstreamer-plugins-musepack
 
 musicbrainz_DEPENDS=	audio/gstreamer-plugins-musicbrainz
@@ -194,11 +181,8 @@
 bz2_DEPENDS=	multimedia/gstreamer-plugins-bz2
 
 ffmpeg_DEPENDS=	multimedia/gstreamer-ffmpeg
-ffmpeg_GST80_SUFX=	80
-ffmpeg_GST80_PREFIX=	gstreamer-
 ffmpeg_GST_PREFIX=	gstreamer-
 ffmpeg_GST_SUFX=	# empty
-ffmpeg_GST80_VERSION=	0.8.7
 ffmpeg_GST_VERSION=	0.10.0
 
 dts_DEPENDS=	multimedia/gstreamer-plugins-dts
@@ -225,11 +209,8 @@
 
 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
@@ -250,18 +231,6 @@
 .if defined(_POSTMKINCLUDED) && !defined(Gstreamer_Post_Include)
 Gstreamer_Post_Include=	bsd.gstreamer.mk
 
-.for ext in ${USE_GSTREAMER80}
-${ext}_GST80_SUFX?=	80
-${ext}_GST80_PREFIX?=	gstreamer-plugins-
-${ext}_GST80_VERSION?=	${GST80_VERSION}${GST80_MINOR_VERSION}
-${ext}_NAME?=		${ext}
-. if ${_USE_GSTREAMER80_ALL:M${ext}}!= "" && exists(${PORTSDIR}/${${ext}_DEPENDS}${${ext}_GST80_SUFX})
-BUILD_DEPENDS+=	${${ext}_GST80_PREFIX}${${ext}_NAME}${${ext}_GST80_SUFX}>=${${ext}_GST80_VERSION}:${PORTSDIR}/${${ext}_DEPENDS}${${ext}_GST80_SUFX}
-RUN_DEPENDS+=	${${ext}_GST80_PREFIX}${${ext}_NAME}${${ext}_GST80_SUFX}>=${${ext}_GST80_VERSION}:${PORTSDIR}/${${ext}_DEPENDS}${${ext}_GST80_SUFX}
-. else
-IGNORE=	cannot install: unknown gstreamer-plugin -- ${ext}
-. endif
-.endfor
 .for ext in ${USE_GSTREAMER}
 ${ext}_GST_PREFIX?=	gstreamer-plugins-
 ${ext}_GST_VERSION?=	${GST_VERSION}${GST_MINOR_VERSION}

==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.java.mk#4 (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.77 2007/03/07 07:44:36 linimon Exp $
+# $FreeBSD: ports/Mk/bsd.java.mk,v 1.78 2007/06/06 15:38:54 glewis Exp $
 #
 
 .if !defined(Java_Include)
@@ -187,8 +187,6 @@
 											VERSION=1.5.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_3_INFO=	PORT=java/linux-blackdown-jdk13	HOME=${LOCALBASE}/linux-blackdown-jdk1.3.1 \
-											VERSION=1.3.1	OS=linux	VENDOR=blackdown
 _JAVA_PORT_LINUX_BLACKDOWN_JDK_1_4_INFO=	PORT=java/linux-blackdown-jdk14	HOME=${LOCALBASE}/linux-blackdown-jdk1.4.2 \
 											VERSION=1.4.2	OS=linux	VENDOR=blackdown
 _JAVA_PORT_LINUX_SUN_JDK_1_2_INFO=			PORT=java/linux-sun-jdk12		HOME=${LOCALBASE}/linux-sun-jdk1.2.2 \
@@ -230,7 +228,6 @@
 					JAVA_PORT_LINUX_SUN_JDK_1_3 \
 					JAVA_PORT_LINUX_SUN_JDK_1_2 \
 					JAVA_PORT_LINUX_BLACKDOWN_JDK_1_4 \
-					JAVA_PORT_LINUX_BLACKDOWN_JDK_1_3 \
 					JAVA_PORT_LINUX_BLACKDOWN_JDK_1_2
 _JAVA_PORTS_ALL=	${JAVA_PREFERRED_PORTS} \
 					${_JAVA_PREFERRED_PORTS} \

==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.kde.mk#5 (text+ko) ====

@@ -1,7 +1,7 @@
 #-*- mode: Makefile; tab-width: 4; -*-
 # ex:ts=4
 #
-# $FreeBSD: ports/Mk/bsd.kde.mk,v 1.71 2007/04/12 12:33:34 lofi Exp $
+# $FreeBSD: ports/Mk/bsd.kde.mk,v 1.72 2007/04/19 17:07:59 lofi Exp $
 #
 # Please view me with 4 column tabs!
 
@@ -140,8 +140,8 @@
 
 # Qt 4.x common stuff
 QT_PREFIX?=	${LOCALBASE}
-MOC?=		${QT_PREFIX}/bin/moc4
-UIC?=		${QT_PREFIX}/bin/uic4
+MOC?=		${QT_PREFIX}/bin/moc-qt4
+UIC?=		${QT_PREFIX}/bin/uic-qt4
 QMAKE?=		${QT_PREFIX}/bin/qmake-qt4
 QMAKESPEC?=	${QT_PREFIX}/share/qt4/mkspecs/freebsd-g++
 

==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#15 (text+ko) ====

@@ -1,7 +1,7 @@
 #-*- mode: makefile; tab-width: 4; -*-
 # ex:ts=4
 #
-# $FreeBSD: ports/Mk/bsd.port.mk,v 1.565 2007/04/07 12:51:47 pav Exp $
+# $FreeBSD: ports/Mk/bsd.port.mk,v 1.568 2007/05/25 00:09:37 linimon Exp $
 #	$NetBSD: $
 #
 #	bsd.port.mk - 940820 Jordan K. Hubbard.
@@ -94,7 +94,7 @@
 # EXTRACT_SUFX	- Suffix for archive names
 #				  You never have to set both DISTFILES and EXTRACT_SUFX.
 #				  Default: .tar.bz2 if USE_BZIP2 is set, .zip if USE_ZIP is
-#				  set, .tar.gz otherwise.
+#				  set, .run if USE_MAKESELF is set, .tar.gz otherwise).
 # MASTER_SITES	- Primary location(s) for distribution files if not found
 #				  locally.  See bsd.sites.mk for common choices for
 #				  MASTER_SITES.
@@ -298,6 +298,8 @@
 #				  compression.
 # USE_ZIP		- If set, this port distfile uses zip, not tar w/[bg]zip
 #				  for compression.
+# USE_MAKESELF		- If set, this port distfile uses makeself, not tar w/[bg]zip
+#				  for compression.
 # USE_DOS2UNIX	- If set to "YES", remove the ^M from all files
 #				  under ${WRKSRC}. If set to a string, remove in all
 #				  files under ${WRKSRC} with one of these names the ^Ms.
@@ -373,8 +375,10 @@
 #				  case the linux X libraries are referenced.
 #
 # USE_FREETYPE	- If set, this port uses the freetype print libraries.
-# USE_GL		- If set, this port uses libGL (not needed with XFree86 4.x
-#				  which already includes this functionality).
+# USE_GL		- A list of Mesa or GL related dependencies needed by the port.
+#				  Supported components are: glut, glu, glw, gl and linux.
+#				  If set to "yes", this is equivalent to "glu". Note that
+#				  glut depends on glu, glw and glu depend on gl.
 # USE_MOTIF		- If set, this port uses a Motif toolkit.  Implies USE_XPM.
 # NO_OPENMOTIF	- If set, this port uses a custom Motif toolkit
 #				  instead of Openmotif.
@@ -470,6 +474,10 @@
 # USE_LINUX_RPM	- Set to yes to pull in variables and targets useful to Linux
 #				  RPM ports.
 #				  Implies inclusion of bsd.linux-rpm.mk.
+#
+# USE_XORG			- Set to a list of X.org module dependencies.
+#				  Implies inclusion of bsd.xorg.mk.
+#
 # AUTOMATIC_PLIST
 #				- Set to yes to enable automatic packing list generation.
 #				  Currently has no effect unless USE_LINUX_RPM is set.
@@ -517,7 +525,7 @@
 # You rarely need to redefine any of these except WRKSRC and NO_WRKSUBDIR.
 #
 # X11BASE		- Where X11 ports install things.
-#				  Default: /usr/X11R6
+#				  Default: ${LOCALBASE}
 # LOCALBASE		- Where non-X11 ports install things.
 #				  Default: /usr/local
 # LINUXBASE		- Where Linux ports install things.
@@ -644,24 +652,51 @@
 #				  installed (for example because NOPORTDOCS is defined).
 #				  Useful for dynamically generated documentation.
 #
+# Set the following to specify all documentation your port installs into
+# ${EXAMPLESDIR}
+#
+# PORTEXAMPLES		- A list of files and directories relative to EXAMPLESDIR.
+#				  Shell glob patterns can be used, directories include
+#				  the entire subtree of contained files and directories.
+#				  Should not be set when no examples files are
+#				  installed (for example because NOPORTEXAMPLES is defined).
+#				  Useful for dynamically generated examples.
+#
+# Set the following to specify all documentation your port installs into
+# ${DATADIR}
+#
+# PORTDATA		- A list of files and directories relative to DATADIR.
+#				  Shell glob patterns can be used, directories include
+#				  the entire subtree of contained files and directories.
+#				  Should not be set when no data files are
+#				  installed (for example because NOPORTDATA is defined).
+#				  Useful for dynamically generated data files.
+#
 # Default targets and their behaviors:
 #
-# fetch			- Retrieves ${DISTFILES} (and ${PATCHFILES} if defined)
-#				  into ${DISTDIR} as necessary.
-# fetch-list	- Show list of files that would be retrieved by fetch.
+# fetch				- Retrieves missing ${DISTFILES} and ${PATCHFILES} for this
+#				  port.
+# fetch-list			- Show list of commands to retrieve missing ${DISTFILES} and
+#				  ${PATCHFILES} for this port.
 # fetch-recursive
-#				- Retrieves ${DISTFILES} (and ${PATCHFILES} if defined),
-#				  for port and dependencies into ${DISTDIR} as necessary.
+#				- Retrieves missing ${DISTFILES} and ${PATCHFILES} for this
+#				  port and dependencies.
 # fetch-recursive-list
-#				- Show list of files that would be retrieved by
-#				  fetch-recursive.
+#				- Show list of commands to retrieve missing ${DISTFILES} and
+#				  ${PATCHFILES} for this port and dependencies.
+# fetch-required
+#				- Retrieves missing ${DISTFILES} and ${PATCHFILES} for this
+#				  port and dependencies.
 # fetch-required-list
-#				- Show list of files that would be retrieved by
-#				  fetch-required.
-# fetch-required
-#				- Retrieves ${DISTFILES} (and ${PATCHFILES} if defined),
-#				  for port and dependencies that are not already installed
-#				  into ${DISTDIR}.
+#				- Show list of commands to retrieve missing ${DISTFILES} and
+#				  ${PATCHFILES} for this port and dependencies.
+# fetch-url-list
+#				- Show list of URLS to retrieve missing ${DISTFILES} and
+#				  ${PATCHFILES} for this port.
+# fetch-urlall-list
+#				- Show list of URLS to retrieve ${DISTFILES} and
+#				  ${PATCHFILES} for this port.
+#
 # all-depends-list
 #				- Show all directories which are dependencies
 #				  for this port.
@@ -767,7 +802,8 @@
 # For extract:
 #
 # EXTRACT_CMD	- Command for extracting archive: "bzip2" if USE_BZIP2
-#				  is set, "unzip" if USE_ZIP is set, "gzip" otherwise.
+#				  is set, "unzip" if USE_ZIP is set, "unmakeself" if
+#				  USE_MAKESELF if set, "gzip" otherwise.
 # EXTRACT_BEFORE_ARGS
 #				- Arguments to ${EXTRACT_CMD} before filename.
 #				  Default: "-dc"
@@ -863,8 +899,8 @@
 # NO_MTREE		- If set, will not invoke mtree from bsd.port.mk from
 #				  the "install" target.
 # MTREE_FILE	- The name of the mtree file.
-#				  Default: /etc/mtree/BSD.x11.dist if USE_X_PREFIX is set,
-#				  /etc/mtree/BSD.local.dist otherwise.
+#				  Default: ${PORTSDIR}/Templates/BSD.local.dist or
+#				  /etc/mtree/BSD.usr.dist if ${PREFIX} == "/usr".
 # PLIST_DIRS	- Directories to be added to packing list
 # PLIST_FILES	- Files and symbolic links to be added to packing list
 #
@@ -1276,21 +1312,50 @@
 # by individual Makefiles or local system make configuration.
 PORTSDIR?=		/usr/ports
 LOCALBASE?=		/usr/local
-X11BASE?=		/usr/X11R6
+X11BASE?=		${LOCALBASE}
 LINUXBASE?=		/compat/linux
 DISTDIR?=		${PORTSDIR}/distfiles
 _DISTDIR?=		${DISTDIR}/${DIST_SUBDIR}
 INDEXDIR?=		${PORTSDIR}
 INDEXFILE?=		INDEX-${OSVERSION:C/([0-9]).*/\1/}
 
+DOCSDIR?=		${TARGETDIR}/share/doc/${PORTNAME}
+EXAMPLESDIR?=		${TARGETDIR}/share/examples/${PORTNAME}
+DATADIR?=		${TARGETDIR}/share/${PORTNAME}
+WWWDIR?=		${TARGETDIR}/www/${PORTNAME}
+ETCDIR?=		${TARGETDIR}/etc/${PORTNAME}
+
 .if defined(USE_LINUX_RPM)
 .include "${PORTSDIR}/Mk/bsd.linux-rpm.mk"
 .endif
 
+.if ${OSVERSION} >= 502123
+X_WINDOW_SYSTEM ?= xorg
+.else
+X_WINDOW_SYSTEM ?= xfree86-4
+.endif
+
+.if ${OSVERSION} < 602000
+.if ${X11BASE} != ${LOCALBASE} && !defined(USE_NONDEFAULT_X11BASE)
+.BEGIN:
+	@${ECHO_MSG} "On FreeBSD before 6.2 ports system unfortunately can not set default X11BASE by itself so please help it a bit by setting X11BASE=\$${LOCALBASE} in make.conf."
+	@${ECHO_MSG} "On the other hand, if you do wish to use non-default X11BASE, please set variable USE_NONDEFAULT_X11BASE."
+	@${FALSE}
+.endif
+.endif
+
+.if defined(USE_XORG) || defined(XORG_CAT)
+. if ${X_WINDOW_SYSTEM} == "xorg"
+.include "${PORTSDIR}/Mk/bsd.xorg.mk"
+. endif
+.endif
+
 .if defined(USE_BZIP2)
 EXTRACT_SUFX?=			.tar.bz2
 .elif defined(USE_ZIP)
 EXTRACT_SUFX?=			.zip
+.elif defined(USE_MAKESELF)
+EXTRACT_SUFX?=			.run
 .else
 EXTRACT_SUFX?=			.tar.gz
 .endif
@@ -1495,7 +1560,7 @@
 PLIST_SUB+=	OSREL=${OSREL} PREFIX=%D LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
 SUB_LIST+=	PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \
 		DATADIR=${DATADIR} DOCSDIR=${DOCSDIR} EXAMPLESDIR=${EXAMPLESDIR} \
-		WWWDIR=${WWWDIR}
+		WWWDIR=${WWWDIR} ETCDIR=${ETCDIR}
 
 PLIST_REINPLACE+=	dirrmtry stopdaemon
 PLIST_REINPLACE_DIRRMTRY=s!^@dirrmtry \(.*\)!@unexec rmdir %D/\1 2>/dev/null || true!
@@ -1522,6 +1587,18 @@
 PLIST_SUB+=		PORTDOCS=""
 .endif
 
+.if defined(NOPORTEXAMPLES)
+PLIST_SUB+=	        PORTEXAMPLES="@comment "
+.else
+PLIST_SUB+=	        PORTEXAMPLES=""
+.endif
+
+.if defined(NOPORTDATA)
+PLIST_SUB+=	        PORTDATA="@comment "
+.else
+PLIST_SUB+=	        PORTDATA=""
+.endif
+
 CONFIGURE_SHELL?=	${SH}
 MAKE_SHELL?=	${SH}
 
@@ -1552,6 +1629,9 @@
 .if defined(USE_ZIP)
 EXTRACT_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 .endif
+.if defined(USE_MAKESELF)
+EXTRACT_DEPENDS+=	unmakeself:${PORTSDIR}/archivers/unmakeself
+.endif
 .if defined(USE_GMAKE)
 BUILD_DEPENDS+=		gmake:${PORTSDIR}/devel/gmake
 CONFIGURE_ENV+=	MAKE=${GMAKE}
@@ -1720,22 +1800,22 @@
 .endif
 
 .if defined(X_WINDOW_SYSTEM) && ${X_WINDOW_SYSTEM:L} == xorg
-X_IMAKE_PORT=		${PORTSDIR}/devel/imake-6
+X_IMAKE_PORT=		${PORTSDIR}/devel/imake
 X_LIBRARIES_PORT=	${PORTSDIR}/x11/xorg-libraries
-X_CLIENTS_PORT=		${PORTSDIR}/x11/xorg-clients
+X_CLIENTS_PORT=		${PORTSDIR}/x11/xorg-apps
 X_SERVER_PORT=		${PORTSDIR}/x11-servers/xorg-server
-X_FONTSERVER_PORT=	${PORTSDIR}/x11-servers/xorg-fontserver
+X_FONTSERVER_PORT=	${PORTSDIR}/x11-fonts/xfs
 X_PRINTSERVER_PORT=	${PORTSDIR}/x11-servers/xorg-printserver
 X_VFBSERVER_PORT=	${PORTSDIR}/x11-servers/xorg-vfbserver
 X_NESTSERVER_PORT=	${PORTSDIR}/x11-servers/xorg-nestserver
-X_FONTS_ENCODINGS_PORT=	${PORTSDIR}/x11-fonts/xorg-fonts-encodings
+X_FONTS_ENCODINGS_PORT=	${PORTSDIR}/x11-fonts/encodings
 X_FONTS_MISC_PORT=	${PORTSDIR}/x11-fonts/xorg-fonts-miscbitmaps
 X_FONTS_100DPI_PORT=	${PORTSDIR}/x11-fonts/xorg-fonts-100dpi
 X_FONTS_75DPI_PORT=	${PORTSDIR}/x11-fonts/xorg-fonts-75dpi
 X_FONTS_CYRILLIC_PORT=	${PORTSDIR}/x11-fonts/xorg-fonts-cyrillic
 X_FONTS_TTF_PORT=	${PORTSDIR}/x11-fonts/xorg-fonts-truetype
 X_FONTS_TYPE1_PORT=	${PORTSDIR}/x11-fonts/xorg-fonts-type1
-X_MANUALS_PORT=		${PORTSDIR}/x11/xorg-manpages
+X_FONTS_ALIAS_PORT=	${PORTSDIR}/x11-fonts/font-alias
 .elif defined(X_WINDOW_SYSTEM) && ${X_WINDOW_SYSTEM:L} == xfree86-4
 X_IMAKE_PORT=		${PORTSDIR}/devel/imake-4
 X_LIBRARIES_PORT=	${PORTSDIR}/x11/XFree86-4-libraries
@@ -1752,7 +1832,6 @@
 X_FONTS_CYRILLIC_PORT=	${PORTSDIR}/x11-fonts/XFree86-4-fontCyrillic
 X_FONTS_TTF_PORT=	${PORTSDIR}/x11-fonts/XFree86-4-fontScalable
 X_FONTS_TYPE1_PORT=	${PORTSDIR}/x11-fonts/XFree86-4-fontScalable
-X_MANUALS_PORT=		${PORTSDIR}/x11/XFree86-4-manuals
 .else
 IGNORE=	cannot install: bad X_WINDOW_SYSTEM setting; valid values are 'xfree86-4' and 'xorg'
 .endif
@@ -1761,19 +1840,63 @@
 BUILD_DEPENDS+=			imake:${X_IMAKE_PORT}
 .endif
 
-.if defined(USE_XPM) || defined(USE_GL)
+.if defined(PACKAGE_BUILDING) && defined(USE_DISPLAY)
+BUILD_DEPENDS+=	Xvfb:${X_VFBSERVER_PORT} \
+	${X11BASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT} \
+	${X11BASE}/lib/X11/fonts/misc/fonts.alias:${X_FONTS_ALIAS_PORT}
+.endif
+
+.if ${X_WINDOW_SYSTEM:L} == xfree86-4
+
+.if defined(USE_XPM)

>>> TRUNCATED FOR MAIL (1000 lines) <<<



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200706081218.l58CIEfm017456>