socsvn commit: r237052 - soc2012/scher/par_ports/head/Mk

scher at FreeBSD.org scher at FreeBSD.org
Mon Jun 4 10:10:43 UTC 2012


Author: scher
Date: Mon Jun  4 10:10:38 2012
New Revision: 237052
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=237052

Log:
  Merge with current ports collection Mk/* files
  [bugfix] "{DO_NADA}: not found" error fixed in bsd.port.mk
  

Added:
  soc2012/scher/par_ports/head/Mk/bsd.options.desc.mk
  soc2012/scher/par_ports/head/Mk/bsd.options.mk
Modified:
  soc2012/scher/par_ports/head/Mk/bsd.apache.mk
  soc2012/scher/par_ports/head/Mk/bsd.autotools.mk
  soc2012/scher/par_ports/head/Mk/bsd.cmake.mk
  soc2012/scher/par_ports/head/Mk/bsd.commands.mk
  soc2012/scher/par_ports/head/Mk/bsd.database.mk
  soc2012/scher/par_ports/head/Mk/bsd.destdir.mk
  soc2012/scher/par_ports/head/Mk/bsd.gcc.mk
  soc2012/scher/par_ports/head/Mk/bsd.gecko.mk
  soc2012/scher/par_ports/head/Mk/bsd.gnome.mk
  soc2012/scher/par_ports/head/Mk/bsd.gnustep.mk
  soc2012/scher/par_ports/head/Mk/bsd.gstreamer.mk
  soc2012/scher/par_ports/head/Mk/bsd.java.mk
  soc2012/scher/par_ports/head/Mk/bsd.kde.mk
  soc2012/scher/par_ports/head/Mk/bsd.kde4.mk
  soc2012/scher/par_ports/head/Mk/bsd.ldap.mk
  soc2012/scher/par_ports/head/Mk/bsd.licenses.db.mk
  soc2012/scher/par_ports/head/Mk/bsd.licenses.mk
  soc2012/scher/par_ports/head/Mk/bsd.linux-apps.mk
  soc2012/scher/par_ports/head/Mk/bsd.linux-rpm.mk
  soc2012/scher/par_ports/head/Mk/bsd.local.mk
  soc2012/scher/par_ports/head/Mk/bsd.lua.mk
  soc2012/scher/par_ports/head/Mk/bsd.mail.mk
  soc2012/scher/par_ports/head/Mk/bsd.octave.mk
  soc2012/scher/par_ports/head/Mk/bsd.parallel.mk
  soc2012/scher/par_ports/head/Mk/bsd.perl.mk
  soc2012/scher/par_ports/head/Mk/bsd.php.mk
  soc2012/scher/par_ports/head/Mk/bsd.pkgng.mk
  soc2012/scher/par_ports/head/Mk/bsd.port.mk
  soc2012/scher/par_ports/head/Mk/bsd.port.options.mk
  soc2012/scher/par_ports/head/Mk/bsd.port.subdir.mk
  soc2012/scher/par_ports/head/Mk/bsd.python.mk
  soc2012/scher/par_ports/head/Mk/bsd.qt.mk
  soc2012/scher/par_ports/head/Mk/bsd.scons.mk
  soc2012/scher/par_ports/head/Mk/bsd.sdl.mk
  soc2012/scher/par_ports/head/Mk/bsd.sites.mk
  soc2012/scher/par_ports/head/Mk/bsd.tcl.mk
  soc2012/scher/par_ports/head/Mk/bsd.wx.mk
  soc2012/scher/par_ports/head/Mk/bsd.xfce.mk
  soc2012/scher/par_ports/head/Mk/bsd.xorg.mk

Modified: soc2012/scher/par_ports/head/Mk/bsd.apache.mk
==============================================================================
--- soc2012/scher/par_ports/head/Mk/bsd.apache.mk	Mon Jun  4 09:55:47 2012	(r237051)
+++ soc2012/scher/par_ports/head/Mk/bsd.apache.mk	Mon Jun  4 10:10:38 2012	(r237052)
@@ -1,7 +1,7 @@
-#-*- mode: makefile; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
-# $FreeBSD: ports/Mk/bsd.apache.mk,v 1.35 2012/01/11 20:09:27 ohauer Exp $
+# $FreeBSD: ports/Mk/bsd.apache.mk,v 1.36 2012/05/23 08:17:48 miwi Exp $
 #
 # bsd.apache.mk - Apache related macros.
 # Author: Clement Laforet <clement at FreeBSD.org>

Modified: soc2012/scher/par_ports/head/Mk/bsd.autotools.mk
==============================================================================
--- soc2012/scher/par_ports/head/Mk/bsd.autotools.mk	Mon Jun  4 09:55:47 2012	(r237051)
+++ soc2012/scher/par_ports/head/Mk/bsd.autotools.mk	Mon Jun  4 10:10:38 2012	(r237052)
@@ -1,7 +1,7 @@
-#-*- mode: makefile; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
-# $FreeBSD: ports/Mk/bsd.autotools.mk,v 1.41 2012/05/11 20:38:01 ade Exp $
+# $FreeBSD: ports/Mk/bsd.autotools.mk,v 1.42 2012/05/23 08:17:48 miwi Exp $
 #
 # Please view me with 4 column tabs!
 #

Modified: soc2012/scher/par_ports/head/Mk/bsd.cmake.mk
==============================================================================
--- soc2012/scher/par_ports/head/Mk/bsd.cmake.mk	Mon Jun  4 09:55:47 2012	(r237051)
+++ soc2012/scher/par_ports/head/Mk/bsd.cmake.mk	Mon Jun  4 10:10:38 2012	(r237052)
@@ -1,4 +1,4 @@
-#-*- mode: Makefile; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
 # USE_CMAKE		- If set, this port uses cmake.
@@ -26,7 +26,7 @@
 #				Default: ${PREFIX}
 #
 #
-# $FreeBSD: ports/Mk/bsd.cmake.mk,v 1.13 2011/11/10 19:50:26 rakuco Exp $
+# $FreeBSD: ports/Mk/bsd.cmake.mk,v 1.14 2012/05/23 08:17:48 miwi Exp $
 
 CMAKE_MAINTAINER=	kde at FreeBSD.org
 

Modified: soc2012/scher/par_ports/head/Mk/bsd.commands.mk
==============================================================================
--- soc2012/scher/par_ports/head/Mk/bsd.commands.mk	Mon Jun  4 09:55:47 2012	(r237051)
+++ soc2012/scher/par_ports/head/Mk/bsd.commands.mk	Mon Jun  4 10:10:38 2012	(r237052)
@@ -1,11 +1,11 @@
-#-*- mode: Fundamental; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
 # bsd.commands.mk - Common commands used within the ports infrastructure
 #
 # Created by: Gabor Kovesdan <gabor at FreeBSD.org>
 #
-# $FreeBSD: ports/Mk/bsd.commands.mk,v 1.10 2012/02/22 17:34:47 bapt Exp $
+# $FreeBSD: ports/Mk/bsd.commands.mk,v 1.11 2012/05/23 08:17:48 miwi Exp $
 #
 # DO NOT COMMIT CHANGES TO THIS FILE BY YOURSELF, EVEN IF YOU DID NOT GET
 # A RESPONSE FROM THE MAINTAINER(S) WITHIN A REASONABLE TIMEFRAME! ALL

Modified: soc2012/scher/par_ports/head/Mk/bsd.database.mk
==============================================================================
--- soc2012/scher/par_ports/head/Mk/bsd.database.mk	Mon Jun  4 09:55:47 2012	(r237051)
+++ soc2012/scher/par_ports/head/Mk/bsd.database.mk	Mon Jun  4 10:10:38 2012	(r237052)
@@ -1,7 +1,7 @@
-# -*- mode: Makefile; tab-width: 4; -*-
+# -*- tab-width: 4; -*-
 # ex: ts=4
 #
-# $FreeBSD: ports/Mk/bsd.database.mk,v 1.74 2012/05/15 22:14:54 girgen Exp $
+# $FreeBSD: ports/Mk/bsd.database.mk,v 1.75 2012/05/23 08:17:48 miwi Exp $
 #
 
 .if defined(_POSTMKINCLUDED) && !defined(Database_Post_Include)

Modified: soc2012/scher/par_ports/head/Mk/bsd.destdir.mk
==============================================================================
--- soc2012/scher/par_ports/head/Mk/bsd.destdir.mk	Mon Jun  4 09:55:47 2012	(r237051)
+++ soc2012/scher/par_ports/head/Mk/bsd.destdir.mk	Mon Jun  4 10:10:38 2012	(r237052)
@@ -1,11 +1,11 @@
-#-*- mode: makefile; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
 # bsd.destdir.mk - Support for chrooted installation
 #
 # Created by: Gabor Kovesdan <gabor at FreeBSD.org>
 #
-# $FreeBSD: ports/Mk/bsd.destdir.mk,v 1.3 2011/01/25 13:39:44 pav Exp $
+# $FreeBSD: ports/Mk/bsd.destdir.mk,v 1.4 2012/05/23 08:17:48 miwi Exp $
 #
 # Please make sure all changes to this file are passed through the maintainer.
 

Modified: soc2012/scher/par_ports/head/Mk/bsd.gcc.mk
==============================================================================
--- soc2012/scher/par_ports/head/Mk/bsd.gcc.mk	Mon Jun  4 09:55:47 2012	(r237051)
+++ soc2012/scher/par_ports/head/Mk/bsd.gcc.mk	Mon Jun  4 10:10:38 2012	(r237052)
@@ -1,4 +1,4 @@
-#-*- mode: Fundamental; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
 # bsd.gcc.mk - Support for smarter USE_GCC usage.
@@ -29,7 +29,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.63 2012/04/29 12:20:17 gerald Exp $
+# $FreeBSD: ports/Mk/bsd.gcc.mk,v 1.64 2012/05/23 08:17:48 miwi Exp $
 #
 
 GCC_Include_MAINTAINER=		gerald at FreeBSD.org

Modified: soc2012/scher/par_ports/head/Mk/bsd.gecko.mk
==============================================================================
--- soc2012/scher/par_ports/head/Mk/bsd.gecko.mk	Mon Jun  4 09:55:47 2012	(r237051)
+++ soc2012/scher/par_ports/head/Mk/bsd.gecko.mk	Mon Jun  4 10:10:38 2012	(r237052)
@@ -1,10 +1,10 @@
-#-*- mode: Fundamental; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
 # Date created:		12 Nov 2005
 # Whom:			Michael Johnson <ahze at FreeBSD.org>
 #
-# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.57 2012/05/12 16:23:08 beat Exp $
+# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.59 2012/06/01 05:15:42 dinoex Exp $
 #
 # 4 column tabs prevent hair loss and tooth decay!
 
@@ -595,7 +595,7 @@
 nss_LDFLAGS+=		-L${LOCALBASE}/lib/nss -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH}
 
 
-png_LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
+png_LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 png_MOZ_OPTIONS=	--with-system-png=${LOCALBASE}
 
 xft_LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft

Modified: soc2012/scher/par_ports/head/Mk/bsd.gnome.mk
==============================================================================
--- soc2012/scher/par_ports/head/Mk/bsd.gnome.mk	Mon Jun  4 09:55:47 2012	(r237051)
+++ soc2012/scher/par_ports/head/Mk/bsd.gnome.mk	Mon Jun  4 10:10:38 2012	(r237052)
@@ -1,7 +1,7 @@
-#-*- mode: Fundamental; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
-# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.173 2011/08/12 08:03:18 kwm Exp $
+# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.174 2012/05/23 08:17:48 miwi Exp $
 #	$NetBSD: $
 #     $MCom: ports/Mk/bsd.gnome.mk,v 1.549 2011/06/10 22:16:59 mezz Exp $
 #

Modified: soc2012/scher/par_ports/head/Mk/bsd.gnustep.mk
==============================================================================
--- soc2012/scher/par_ports/head/Mk/bsd.gnustep.mk	Mon Jun  4 09:55:47 2012	(r237051)
+++ soc2012/scher/par_ports/head/Mk/bsd.gnustep.mk	Mon Jun  4 10:10:38 2012	(r237052)
@@ -1,5 +1,5 @@
 #
-# $FreeBSD: ports/Mk/bsd.gnustep.mk,v 1.70 2012/01/16 18:55:36 dinoex Exp $
+# $FreeBSD: ports/Mk/bsd.gnustep.mk,v 1.71 2012/06/01 09:59:53 dinoex Exp $
 #
 # This file contains some variable definitions that are supposed to
 # make your life easier when dealing with ports related to the GNUstep.
@@ -201,7 +201,7 @@
 GNUSTEP_WITH_GCC42=yes
 .endif
 .endif
-.if !exists(${DESTDIR}/usr/lib/libobjc.so) 
+.if !exists(${DESTDIR}/usr/lib/libobjc.so)
 GNUSTEP_WITH_GCC42=yes
 .endif
 .endif

Modified: soc2012/scher/par_ports/head/Mk/bsd.gstreamer.mk
==============================================================================
--- soc2012/scher/par_ports/head/Mk/bsd.gstreamer.mk	Mon Jun  4 09:55:47 2012	(r237051)
+++ soc2012/scher/par_ports/head/Mk/bsd.gstreamer.mk	Mon Jun  4 10:10:38 2012	(r237052)
@@ -1,4 +1,4 @@
-#-*- mode: Fundamental; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
 # bsd.gstreamer.mk - Support for gstreamer-plugins-based ports.
@@ -6,7 +6,7 @@
 # Created by: Michael Johnson <ahze at FreeBSD.org>
 # Date:		4 Oct 2004
 #
-# $FreeBSD: ports/Mk/bsd.gstreamer.mk,v 1.51 2012/04/09 22:34:35 bapt Exp $
+# $FreeBSD: ports/Mk/bsd.gstreamer.mk,v 1.52 2012/05/23 08:17:48 miwi Exp $
 #    $MCom: ports/Mk/bsd.gstreamer.mk,v 1.43 2008/03/21 04:14:18 ahze Exp $
 
 .if !defined(_POSTMKINCLUDED) && !defined(Gstreamer_Pre_Include)

Modified: soc2012/scher/par_ports/head/Mk/bsd.java.mk
==============================================================================
--- soc2012/scher/par_ports/head/Mk/bsd.java.mk	Mon Jun  4 09:55:47 2012	(r237051)
+++ soc2012/scher/par_ports/head/Mk/bsd.java.mk	Mon Jun  4 10:10:38 2012	(r237052)
@@ -1,4 +1,4 @@
-#-*- mode: Fundamental; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
 # bsd.java.mk - Support for Java-based ports.
@@ -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.93 2012/04/13 04:03:42 glewis Exp $
+# $FreeBSD: ports/Mk/bsd.java.mk,v 1.94 2012/05/23 08:17:48 miwi Exp $
 #
 
 .if !defined(Java_Include)

Modified: soc2012/scher/par_ports/head/Mk/bsd.kde.mk
==============================================================================
--- soc2012/scher/par_ports/head/Mk/bsd.kde.mk	Mon Jun  4 09:55:47 2012	(r237051)
+++ soc2012/scher/par_ports/head/Mk/bsd.kde.mk	Mon Jun  4 10:10:38 2012	(r237052)
@@ -1,7 +1,7 @@
-#-*- mode: Makefile; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
-# $FreeBSD: ports/Mk/bsd.kde.mk,v 1.82 2011/09/23 22:20:46 amdmi3 Exp $
+# $FreeBSD: ports/Mk/bsd.kde.mk,v 1.83 2012/05/23 08:17:48 miwi Exp $
 #
 # Please view me with 4 column tabs!
 

Modified: soc2012/scher/par_ports/head/Mk/bsd.kde4.mk
==============================================================================
--- soc2012/scher/par_ports/head/Mk/bsd.kde4.mk	Mon Jun  4 09:55:47 2012	(r237051)
+++ soc2012/scher/par_ports/head/Mk/bsd.kde4.mk	Mon Jun  4 10:10:38 2012	(r237052)
@@ -1,180 +1,312 @@
-#-*- mode: Makefile; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
-# $FreeBSD: ports/Mk/bsd.kde4.mk,v 1.127 2012/02/24 13:34:28 avilla Exp $
+# $FreeBSD: ports/Mk/bsd.kde4.mk,v 1.131 2012/05/31 00:09:11 avilla Exp $
 #
 
 .if !defined(_POSTMKINCLUDED) && !defined(Kde_Pre_Include)
 
 # Please make sure all changes to this file are past through the maintainer.
 # Do not commit them yourself (unless of course you're the Port's Wraith ;).
-Kde_Pre_Include=	bsd.kde4.mk
 Kde_Include_MAINTAINER=	kde at FreeBSD.org
+Kde_Pre_Include=	bsd.kde4.mk
 
 #
-# This file contains some variable definitions that are supposed to
-# make your life easier when dealing with ports related to the KDE4
-# desktop environment. It's automatically included when USE_KDE4
-# is defined in the ports' makefile.
+# This file contains some variable definitions that are supposed to make your
+# life easier when dealing with ports related to the KDE Software Compilation 4.
+# It's automatically included when ${USE_KDE4} is defined in a port's Makefile.
 #
 # KDE4 related ports can use this as follows:
 #
-# USE_KDE4=	kdehier kdeprefix kdelibs
-# USE_QT_VER=	4
-# QT_COMPONENTS=corelib #set additional qt4 components here
+# USE_KDE4=		kdehier kdelibs kdeprefix
+# USE_QT4=		corelib # Set Qt 4 components here.
 #
 # .include <bsd.port.mk>
 #
+# Additionally, '_build' and '_run' suffixes can be used to force components
+# dependency type (e.g., 'marble_run'). If no suffix is set, a default
+# dependency type will be used. If you want to force both types, add the
+# component twice with both suffixes (e.g., 'pykde4_build pykde4_run').
+#
 # Available KDE4 components are:
 #
-# akonadi	- Akonadi PIM storage service
-# automoc4	- automoc4 tool
-# baseapps	- Basic KDE applications (Konqueror, Dolphin)
-# kdeexp	- experimental libraries (with non-stable ABI/API)
-# kdehier	- Provides common KDE directories
-# kdelibs	- The base set of KDE libraries
-# kdeprefix	- If set, port will be installed into ${KDE4_PREFIX} instead of ${LOCALBASE}
-# oxygen	- icon themes
-# pimlibs	- KDE PIM libraries
-# pimruntime	- KDE PIM runtime services
-# pykde4	- Python bindings for KDE
-# pykdeuic4	- User Interface Compiler for PyKDE
-# runtime	- More KDE applications
-# sharedmime	- share-mime-info wrapper for KDE ports
-# workspace	- More KDE applications (Plasma, kwin, etc.)
+# baseapps		- Basic applications for KDE Desktop
+# kate			- KDE text editor framework
+# kdehier		- Hierarchy of common KDE directories
+# kdelibs		- KDE Developer Platform
+# kdeprefix		- If set, port will be installed into ${KDE4_PREFIX} instead of
+#				  ${LOCALBASE}
+# korundum		- KDE Ruby bindings
+# libkdcraw		- KDE LibRaw library
+# libkdeedu		- Libraries used by KDE educational applications
+# libkexiv2		- KDE Exiv2 library
+# libkipi		- KDE Image Plugin Interface
+# libkonq		- Konqueror core library
+# libksane		- KDE SANE library
+# marble		- KDE virtual globe
+# okular		- KDE universal document viewer
+# oxygen		- KDE icon theme
+# perlkde		- KDE Perl bindings
+# perlqt		- Qt 4 Perl bindings
+# pimlibs		- KDE-Pim libraries
+# pykde4		- KDE Python bindings
+# pykdeuic4		- PyKDE user interface compiler
+# qtruby		- Qt 4 Ruby bindings
+# runtime		- Components required by many KDE Applications
+# sharedmime	- MIME types database for KDE ports
+# smokegen		- SMOKE base libraries
+# smokekde		- KDE SMOKE libraries
+# smokeqt		- Qt 4 SMOKE libraries
+# workspace		- KDE user environments
+# akonadi		- Storage server for KDE-Pim
+# attica		- Qt library implementing Open Collaboration Services API
+# automoc4		- Automatic moc for Qt 4 packages
+# ontologies	- Shared ontologies for semantic searching
+# qimageblitz	- KDE graphical effects and filters library
+# soprano		- Qt 4 RDF framework
+# strigi		- Desktop search daemon
 #
-# These read-only variables can be used in port Makefile:
+# These read-only variables can be used in a port's Makefile:
 #
 # MASTER_SITE_KDE_kde
-#		- MASTER_SITE_KDE_kde is equivalent to MASTER_SITE_KDE
-#		with :kde tag. It could be used when port needs multiple
-#		distfiles from different sites. See for details porters-handbook:
-#		http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/makefile-distfiles.html
-# KDE4_PREFIX	- The place where KDE4 ports live. Currently it is {LOCALBASE}/kde4,
-#		but this could be changed in a future.
+#				- It is equivalent to ${MASTER_SITE_KDE} with :kde tag. It could
+#				  be used when port needs multiple distfiles from different
+#				  sites. See for details the Porter's Handbook:
+#				  http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/porters-handbook/makefile-distfiles.html
+# KDE4_PREFIX	- The place where KDE4 ports live. Currently it is
+#				  ${LOCALBASE}/kde4, but this could change in the future.
 #
 
-KDE4_VERSION=		4.7.4
-KDE4_BRANCH?=		stable
-KDEPIM4_VERSION=	4.4.11.1
-KDEPIM4_BRANCH?=	stable
-KOFFICE2_VERSION=	2.3.2
-KOFFICE2_BRANCH?=	stable
-KDEVELOP_VERSION=	4.2.3
-KDEVELOP_BRANCH?=	stable
+KDE4_VERSION?=			4.8.3
+KDE4_BRANCH?=			stable
+CALLIGRA_VERSION?=		2.4.2
+CALLIGRA_BRANCH?=		stable
+KDEVELOP_VERSION?=		4.3.1
+KDEVELOP_BRANCH?=		stable
 
 #
-# KDE4 is installed into its own prefix to not conflict with KDE3
+# KDE4 is installed into its own prefix to avoid conflicting with KDE3.
 #
-KDE4_PREFIX?=		${LOCALBASE}/kde4
+
+KDE4_PREFIX?=	${LOCALBASE}/kde4
 
 #
-# Tagged MASTER_SITE_KDE
+# Common definitions for KDE4 ports.
 #
-kmaster=		${MASTER_SITE_KDE:S@%/@%/:kde at g}
+
+# ${PREFIX} and ${NO_MTREE} have to be defined in the pre-makefile section.
+.if defined(USE_KDE4) && ${USE_KDE4:Mkdeprefix} != ""
+. if ${.MAKEFLAGS:MPREFIX=*} == ""
+PREFIX=					${KDE4_PREFIX}
+.  if ${KDE4_PREFIX} != ${LOCALBASE}
+NO_MTREE=				yes
+.  endif
+. endif
+.endif
+
+# Tagged ${MASTER_SITE_KDE}.
+kmaster=				${MASTER_SITE_KDE:S@%/@%/:kde at g}
 .if !defined(MASTER_SITE_SUBDIR)
 MASTER_SITE_KDE_kde=	${kmaster:S@%SUBDIR%/@@g}
 .else
-ksub=${MASTER_SITE_SUBDIR}
+ksub=					${MASTER_SITE_SUBDIR}
 MASTER_SITE_KDE_kde=	${kmaster:S@%SUBDIR%/@${ksub}/@g}
-.endif # !defined(MASTER_SITE_SUBDIR)
+.endif
+
+PLIST_SUB+=				KDE4_PREFIX="${KDE4_PREFIX}"
+
+# The following definitions are not intended for usage in KDE4-dependent ports.
+.if defined(KDE4_BUILDENV)
+
+USE_CMAKE=				yes
+CMAKE_SOURCE_PATH=		${WRKSRC}
+USE_LDCONFIG=			yes
+
+. if ${KDE4_BRANCH} == "unstable"
+WITH_DEBUG=				yes
+. endif
+
+. if defined(WITH_DEBUG)
+CMAKE_BUILD_TYPE=		DebugFull
+. endif
+
+PLIST_SUB+=				KDE4_VERSION="${KDE4_VERSION}"
+
+CONFIGURE_WRKSRC=		${CMAKE_SOURCE_PATH}/build
+BUILD_WRKSRC=			${CONFIGURE_WRKSRC}
+INSTALL_WRKSRC?=		${BUILD_WRKSRC}
+
+post-extract:	kde4-create-builddir
+
+kde4-create-builddir:
+	${MKDIR} ${BUILD_WRKSRC}
+
+.endif # defined(KDE4_BUILDENV)
+
+.endif # !defined(_POSTMKINCLUDED) && !defined(Kde_Pre_Include)
+
+.if defined(_POSTMKINCLUDED) && !defined(Kde_Post_Include)
+
+Kde_Post_Include=	bsd.kde4.mk
 
 #
-# KDE4 modules
+# KDE4 components.
+# Set ${component}_TYPE to 'build' or 'run' to specify default dependency type
+# for ${component}; otherwise, it will default to 'build run'.
 #
-_USE_KDE4_ALL=	akonadi automoc4 baseapps kdebase kdehier kdelibs kdeprefix \
-		oxygen pimlibs pimruntime pykde4 pykdeuic4 runtime \
-		sharedmime workspace
 
-akonadi_LIB_DEPENDS=		akonadiprotocolinternals.1:${PORTSDIR}/databases/akonadi
+_USE_KDE4_ALL=		baseapps kdebase kate kdehier kdelibs kdeprefix korundum \
+					libkdcraw libkdeedu libkexiv2 libkipi libkonq libksane \
+					marble okular oxygen perlkde perlqt pimlibs pykde4 \
+					pykdeuic4 qtruby runtime sharedmime smokegen smokekde \
+					smokeqt workspace
+# These components are not shipped with the Software Compilation.
+_USE_KDE4_ALL+=		akonadi attica automoc4 ontologies qimageblitz soprano \
+					strigi
 
-automoc4_BUILD_DEPENDS=		${LOCALBASE}/bin/automoc4:${PORTSDIR}/devel/automoc4
+# Do baseapps and runtime really need to be in ${BUILD_DEPENDS}?
+baseapps_PORT=		x11/kde4-baseapps
+baseapps_PATH=		${KDE4_PREFIX}/bin/kfmclient
 
-baseapps_LIB_DEPENDS=		konq.7:${PORTSDIR}/x11/kde4-baseapps
-kdebase_LIB_DEPENDS=		${baseapps_LIB_DEPENDS}
+# kdebase was replaced by baseapps.
+kdebase_PORT=		${baseapps_PORT}
+kdebase_PATH=		${baseapps_PATH}
 
-kdehier_RUN_DEPENDS=		kdehier4>=1:${PORTSDIR}/misc/kdehier4
+kate_PORT=			editors/kate
+kate_PATH=			${KDE4_PREFIX}/lib/libkateinterfaces.so.5
 
-kdelibs_LIB_DEPENDS=		kimproxy.5:${PORTSDIR}/x11/kdelibs4
+kdehier_PORT=		misc/kdehier4
+kdehier_PATH=		kdehier4>=0
+kdehier_TYPE=		run
 
-kdeprefix_PREFIX=		${KDE4_PREFIX}
+kdelibs_PORT=		x11/kdelibs4
+kdelibs_PATH=		${KDE4_PREFIX}/lib/libkdecore.so.7
 
-oxygen_RUN_DEPENDS=		${KDE4_PREFIX}/share/icons/oxygen/index.theme:${PORTSDIR}/x11-themes/kde4-icons-oxygen
+korundum_PORT=		devel/kdebindings4-ruby-korundum
+korundum_PATH=		${KDE4_PREFIX}/lib/kde4/krubypluginfactory.so
+korundum_TYPE=		run
 
-pimlibs_LIB_DEPENDS=		kpimutils.5:${PORTSDIR}/deskutils/kdepimlibs4
+libkdcraw_PORT=		graphics/libkdcraw-kde4
+libkdcraw_PATH=		${KDE4_PREFIX}/lib/libkdcraw.so.20
 
-pimruntime_LIB_DEPENDS=		kdepim-copy.5:${PORTSDIR}/deskutils/kdepim4-runtime
+libkdeedu_PORT=		misc/libkdeedu
+libkdeedu_PATH=		${KDE4_PREFIX}/lib/libkeduvocdocument.so.5
 
-pykde4_RUN_DEPENDS=		${KDE4_PYTHON_SITELIBDIR}/PyKDE4/kdeui.so:${PORTSDIR}/devel/kdebindings4-python-pykde4
+libkexiv2_PORT=		graphics/libkexiv2-kde4
+libkexiv2_PATH=		${KDE4_PREFIX}/lib/libkexiv2.so.10
 
-pykdeuic4_RUN_DEPENDS=		${LOCALBASE}/bin/pykdeuic4:${PORTSDIR}/devel/kdebindings4-python-pykdeuic4
+libkipi_PORT=		graphics/libkipi-kde4
+libkipi_PATH=		${KDE4_PREFIX}/lib/libkipi.so.8
 
-runtime_BUILD_DEPENDS=		${KDE4_PREFIX}/bin/kdebugdialog:${PORTSDIR}/x11/kde4-runtime
-runtime_RUN_DEPENDS=		${KDE4_PREFIX}/bin/kdebugdialog:${PORTSDIR}/x11/kde4-runtime
+libkonq_PORT=		x11/libkonq
+libkonq_PATH=		${KDE4_PREFIX}/lib/libkonq.so.7
 
-sharedmime_BUILD_DEPENDS=	kde4-shared-mime-info>=1:${PORTSDIR}/misc/kde4-shared-mime-info
-sharedmime_RUN_DEPENDS=		kde4-shared-mime-info>=1:${PORTSDIR}/misc/kde4-shared-mime-info
+libksane_PORT=		graphics/libksane
+libksane_PATH=		${KDE4_PREFIX}/lib/libksane.so.0
 
-workspace_LIB_DEPENDS=		kscreensaver.5:${PORTSDIR}/x11/kde4-workspace
+marble_PORT=		astro/marble
+marble_PATH=		${KDE4_PREFIX}/lib/libmarblewidget.so.13
 
+okular_PORT=		graphics/okular
+okular_PATH=		${KDE4_PREFIX}/lib/libokularcore.so.1
 
-PLIST_SUB+=	KDE4_PREFIX="${KDE4_PREFIX}"
+oxygen_PORT=		x11-themes/kde4-icons-oxygen
+oxygen_PATH=		${KDE4_PREFIX}/share/icons/oxygen/index.theme
+oxygen_TYPE=		run
 
-KDE4_PYTHON_SITELIBDIR=	${PYTHON_SITELIBDIR:S;${PYTHONBASE};${KDE4_PREFIX};}
+perlkde_PORT=		devel/kdebindings4-perl-perlkde
+perlkde_PATH=		${KDE4_PREFIX}/lib/kde4/kperlpluginfactory.so
+perlkde_TYPE=		run
 
-#
-# Common build related stuff for kde4 ports. It's not intended for usage
-# in KDE4-dependent ports
-#
-.if defined(KDE4_BUILDENV)
+perlqt_PORT=		devel/kdebindings4-perl-perlqt
+perlqt_PATH=		${KDE4_PREFIX}/bin/puic4
 
-.if ${KDE4_BRANCH} == "unstable"
-WITH_DEBUG=yes
-.endif
+pimlibs_PORT=		deskutils/kdepimlibs4
+pimlibs_PATH=		${KDE4_PREFIX}/lib/libkpimutils.so.5
 
-.if defined(WITH_DEBUG)
-CMAKE_BUILD_TYPE=	DebugFull
-.endif
+pykde4_PORT=		devel/kdebindings4-python-pykde4
+pykde4_PATH=		${KDE4_PREFIX}/lib/kde4/kpythonpluginfactory.so
+pykde4_TYPE=		run
 
-PLIST_SUB+=	KDE4_VERSION="${KDE4_VERSION}"
+pykdeuic4_PORT=		devel/kdebindings4-python-pykdeuic4
+pykdeuic4_PATH=		${LOCALBASE}/bin/pykdeuic4
+pykdeuic4_TYPE=		run
 
-USE_LDCONFIG=	yes
+qtruby_PORT=		devel/kdebindings4-ruby-qtruby
+qtruby_PATH=		${KDE4_PREFIX}/lib/libqtruby4shared.so.2
 
-USE_CMAKE=	yes
-CMAKE_SOURCE_PATH=	${WRKSRC}
-CONFIGURE_WRKSRC=	${CMAKE_SOURCE_PATH}/build
-BUILD_WRKSRC=		${CONFIGURE_WRKSRC}
-INSTALL_WRKSRC?=	${BUILD_WRKSRC}
+runtime_PORT=		x11/kde4-runtime
+runtime_PATH=		${KDE4_PREFIX}/bin/knotify4
 
-post-extract:	kde-create-builddir
+sharedmime_PORT=	misc/kde4-shared-mime-info
+sharedmime_PATH=	kde4-shared-mime-info>=0
 
-kde-create-builddir:
-	${MKDIR} ${BUILD_WRKSRC}
+smokegen_PORT=		devel/kdebindings4-smoke-smokegen
+smokegen_PATH=		${KDE4_PREFIX}/lib/libsmokebase.so.3
 
-.endif # KDE4_BUILDENV
+smokekde_PORT=		devel/kdebindings4-smoke-smokekde
+smokekde_PATH=		${KDE4_PREFIX}/lib/libsmokekdecore.so.3
 
-.endif #!defined(_POSTMKINCLUDED) && !defined(Kde_Pre_Include)
+smokeqt_PORT=		devel/kdebindings4-smoke-smokeqt
+smokeqt_PATH=		${KDE4_PREFIX}/lib/libsmokeqtcore.so.3
 
-.if defined(_POSTMKINCLUDED) && !defined(Kde_Post_Include)
+workspace_PORT=		x11/kde4-workspace
+workspace_PATH=		${KDE4_PREFIX}/lib/libkworkspace.so.5
 
-Kde_Post_Include=	bsd.kde4.mk
+akonadi_PORT=		databases/akonadi
+akonadi_PATH=		${KDE4_PREFIX}/lib/libakonadiprotocolinternals.so.1
+
+attica_PORT=		x11-toolkits/attica
+attica_PATH=		${LOCALBASE}/lib/libattica.so.0
+
+automoc4_PORT=		devel/automoc4
+automoc4_PATH=		${LOCALBASE}/bin/automoc4
+automoc4_TYPE=		build
+
+ontologies_PORT=	x11-toolkits/shared-desktop-ontologies
+ontologies_PATH=	${LOCALBASE}/share/ontology/core/rdf.ontology
+
+qimageblitz_PORT=	x11/qimageblitz
+qimageblitz_PATH=	${LOCALBASE}/lib/libqimageblitz.so.4
+
+soprano_PORT=		textproc/soprano
+soprano_PATH=		${LOCALBASE}/lib/libsoprano.so.4
 
-.for component in ${USE_KDE4}
-. if ${_USE_KDE4_ALL:M${component}}!=""
-BUILD_DEPENDS+=	${${component}_BUILD_DEPENDS}
-LIB_DEPENDS+=	${${component}_LIB_DEPENDS}
-RUN_DEPENDS+=	${${component}_RUN_DEPENDS}
-.  if defined(${component}_PREFIX)
-.   if ${.MAKEFLAGS:MPREFIX=*}==""
-PREFIX=	${${component}_PREFIX}
-.    if ${KDE4_PREFIX} != ${LOCALBASE}
-NO_MTREE=	yes
+strigi_PORT=		deskutils/strigi
+strigi_PATH=		${LOCALBASE}/lib/libstreamanalyzer.so.0
+
+# Iterate through components deprived of suffix.
+.for component in ${USE_KDE4:O:u:C/_.+//}
+  # Check that the component is valid.
+. if ${_USE_KDE4_ALL:M${component}} != ""
+   # Skip meta-components (e.g., kdeprefix).
+.  if defined(${component}_PORT) && defined(${component}_PATH)
+${component}_DEPENDS=	${${component}_PATH}:${PORTSDIR}/${${component}_PORT}
+    # Check if a dependency type is explicitly requested.
+.   if ${USE_KDE4:M${component}_*} != "" && ${USE_KDE4:M${component}} == ""
+${component}_TYPE=	# empty
+.    if ${USE_KDE4:M${component}_build} != ""
+${component}_TYPE+=	build
+.    endif
+.    if ${USE_KDE4:M${component}_run} != ""
+${component}_TYPE+=	run
 .    endif
+.   endif # ${USE_KDE4:M${component}_*} != "" && ${USE_KDE4:M${component}} == ""
+    # If no dependency type is set, default to full dependency.
+.   if !defined(${component}_TYPE)
+${component}_TYPE=	build run
 .   endif
-.  endif
-. else
-IGNORE=	cannot install: Unknown component ${component}
-. endif
+    # Set real dependencies.
+.   if ${${component}_TYPE:Mbuild} != ""
+BUILD_DEPENDS+=		${${component}_DEPENDS}
+.   endif
+.   if ${${component}_TYPE:Mrun} != ""
+RUN_DEPENDS+=		${${component}_DEPENDS}
+.   endif
+.  endif # defined(${component}_PORT) && defined(${component}_PATH)
+. else # ! ${_USE_KDE4_ALL:M${component}} != ""
+IGNORE=				can't be installed: unknown USE_KDE4 component '${component}'
+. endif # ${_USE_KDE4_ALL:M${component}} != ""
 .endfor
 
-.endif #defined(_POSTMKINCLUDED) && !defined(Kde_Post_Include)
+.endif # defined(_POSTMKINCLUDED) && !defined(Kde_Post_Include)

Modified: soc2012/scher/par_ports/head/Mk/bsd.ldap.mk
==============================================================================
--- soc2012/scher/par_ports/head/Mk/bsd.ldap.mk	Mon Jun  4 09:55:47 2012	(r237051)
+++ soc2012/scher/par_ports/head/Mk/bsd.ldap.mk	Mon Jun  4 10:10:38 2012	(r237052)
@@ -1,7 +1,7 @@
-# -*- mode: Makefile; tab-width: 4; -*-
+# -*- tab-width: 4; -*-
 # ex: ts=4
 #
-# $FreeBSD: ports/Mk/bsd.ldap.mk,v 1.9 2012/05/11 15:19:49 bapt Exp $
+# $FreeBSD: ports/Mk/bsd.ldap.mk,v 1.10 2012/05/23 08:17:49 miwi Exp $
 #
 
 .if defined(_POSTMKINCLUDED) && !defined(Ldap_Post_Include)

Modified: soc2012/scher/par_ports/head/Mk/bsd.licenses.db.mk
==============================================================================
--- soc2012/scher/par_ports/head/Mk/bsd.licenses.db.mk	Mon Jun  4 09:55:47 2012	(r237051)
+++ soc2012/scher/par_ports/head/Mk/bsd.licenses.db.mk	Mon Jun  4 10:10:38 2012	(r237052)
@@ -1,7 +1,7 @@
-#-*- mode: makefile; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
-# $FreeBSD: ports/Mk/bsd.licenses.db.mk,v 1.17 2012/01/09 15:40:53 tabthorpe Exp $
+# $FreeBSD: ports/Mk/bsd.licenses.db.mk,v 1.18 2012/05/23 08:17:49 miwi Exp $
 
 Licenses_db_Include_MAINTAINER=         portmgr at FreeBSD.org
 

Modified: soc2012/scher/par_ports/head/Mk/bsd.licenses.mk
==============================================================================
--- soc2012/scher/par_ports/head/Mk/bsd.licenses.mk	Mon Jun  4 09:55:47 2012	(r237051)
+++ soc2012/scher/par_ports/head/Mk/bsd.licenses.mk	Mon Jun  4 10:10:38 2012	(r237052)
@@ -1,7 +1,7 @@
-#-*- mode: makefile; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
-# $FreeBSD: ports/Mk/bsd.licenses.mk,v 1.11 2012/03/13 17:01:54 eadler Exp $
+# $FreeBSD: ports/Mk/bsd.licenses.mk,v 1.12 2012/05/23 08:17:49 miwi Exp $
 
 Licenses_Include_MAINTAINER=         portmgr at FreeBSD.org
 

Modified: soc2012/scher/par_ports/head/Mk/bsd.linux-apps.mk
==============================================================================
--- soc2012/scher/par_ports/head/Mk/bsd.linux-apps.mk	Mon Jun  4 09:55:47 2012	(r237051)
+++ soc2012/scher/par_ports/head/Mk/bsd.linux-apps.mk	Mon Jun  4 10:10:38 2012	(r237052)
@@ -1,7 +1,7 @@
-#-*- mode: Makefile; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
-# $FreeBSD: ports/Mk/bsd.linux-apps.mk,v 1.46 2012/01/14 22:35:19 netchild Exp $
+# $FreeBSD: ports/Mk/bsd.linux-apps.mk,v 1.47 2012/05/23 08:17:49 miwi Exp $
 #
 # Please view me with 4 column tabs!
 

Modified: soc2012/scher/par_ports/head/Mk/bsd.linux-rpm.mk
==============================================================================
--- soc2012/scher/par_ports/head/Mk/bsd.linux-rpm.mk	Mon Jun  4 09:55:47 2012	(r237051)
+++ soc2012/scher/par_ports/head/Mk/bsd.linux-rpm.mk	Mon Jun  4 10:10:38 2012	(r237052)
@@ -1,7 +1,7 @@
-#-*- mode: Makefile; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
-# $FreeBSD: ports/Mk/bsd.linux-rpm.mk,v 1.26 2011/04/18 13:07:21 netchild Exp $
+# $FreeBSD: ports/Mk/bsd.linux-rpm.mk,v 1.27 2012/05/23 08:17:49 miwi Exp $
 #
 
 # Variables:

Modified: soc2012/scher/par_ports/head/Mk/bsd.local.mk
==============================================================================
--- soc2012/scher/par_ports/head/Mk/bsd.local.mk	Mon Jun  4 09:55:47 2012	(r237051)
+++ soc2012/scher/par_ports/head/Mk/bsd.local.mk	Mon Jun  4 10:10:38 2012	(r237052)
@@ -1,11 +1,11 @@
-# -*- mode: Makefile; tab-width: 4; -*-
+# -*- tab-width: 4; -*-
 # ex: ts=4
 #
 # bsd.local.mk - Sandbox for local modification to ports framework.
 #
 # Created by: Mark Linimon <linimon at FreeBSD.org>
 #
-# $FreeBSD: ports/Mk/bsd.local.mk,v 1.2 2006/12/10 18:15:33 linimon Exp $
+# $FreeBSD: ports/Mk/bsd.local.mk,v 1.3 2012/05/23 08:17:49 miwi Exp $
 #
 
 .if !defined(_POSTMKINCLUDED) && !defined(Local_Pre_Include)

Modified: soc2012/scher/par_ports/head/Mk/bsd.lua.mk
==============================================================================
--- soc2012/scher/par_ports/head/Mk/bsd.lua.mk	Mon Jun  4 09:55:47 2012	(r237051)
+++ soc2012/scher/par_ports/head/Mk/bsd.lua.mk	Mon Jun  4 10:10:38 2012	(r237052)
@@ -1,7 +1,7 @@
-#-*- mode: makefile; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
-# $FreeBSD: ports/Mk/bsd.lua.mk,v 1.22 2011/12/31 08:52:36 mandree Exp $
+# $FreeBSD: ports/Mk/bsd.lua.mk,v 1.23 2012/05/23 08:17:49 miwi Exp $
 #
 # bsd.lua.mk - Support for Lua based ports.
 #

Modified: soc2012/scher/par_ports/head/Mk/bsd.mail.mk
==============================================================================
--- soc2012/scher/par_ports/head/Mk/bsd.mail.mk	Mon Jun  4 09:55:47 2012	(r237051)
+++ soc2012/scher/par_ports/head/Mk/bsd.mail.mk	Mon Jun  4 10:10:38 2012	(r237052)
@@ -1,7 +1,7 @@
-#-*- mode: Fundamental; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
-# $FreeBSD: ports/Mk/bsd.mail.mk,v 1.3 2007/08/04 11:37:23 gabor Exp $
+# $FreeBSD: ports/Mk/bsd.mail.mk,v 1.4 2012/05/23 08:17:49 miwi Exp $
 #
 # Please view me with 4 column tabs!
 

Modified: soc2012/scher/par_ports/head/Mk/bsd.octave.mk
==============================================================================
--- soc2012/scher/par_ports/head/Mk/bsd.octave.mk	Mon Jun  4 09:55:47 2012	(r237051)
+++ soc2012/scher/par_ports/head/Mk/bsd.octave.mk	Mon Jun  4 10:10:38 2012	(r237052)
@@ -1,7 +1,7 @@
-#-*- mode: makefile; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
 # ex:ts=4
 #
-# $FreeBSD: ports/Mk/bsd.octave.mk,v 1.14 2012/01/31 14:50:12 stephen Exp $
+# $FreeBSD: ports/Mk/bsd.octave.mk,v 1.15 2012/05/23 08:17:49 miwi Exp $
 #
 # bsd.octave.mk - Octave related macro
 # Common code to install octave-forge packages.

Added: soc2012/scher/par_ports/head/Mk/bsd.options.desc.mk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ soc2012/scher/par_ports/head/Mk/bsd.options.desc.mk	Mon Jun  4 10:10:38 2012	(r237052)
@@ -0,0 +1,200 @@
+# $FreeBSD: ports/Mk/bsd.options.desc.mk,v 1.56 2012/06/03 16:59:50 sunpoet Exp $
+#
+# READ BEFORE EDITING:
+# - Please keep descriptions sorted alphabetically by variable name.
+#
+
+Options_Desc_MAINTAINER=	ports at FreeBSD.org
+
+AAC_DESC?=		Enable support for aac/mp4
+AALIB_DESC?=		Enable aalib support
+ALSA_DESC?=		Enable alsa audio support
+AMR_DESC?=		Enable OpenCORE AMR 3GPP Speech Codecs
+APACHE_DESC?=		Enable Apache server
+APE_DESC?=		Enable Monkey's Audio support
+AO_DESC?=		Support libao audio library
+ARCHIVE_DESC?=		Support bzip2/zip/iso9660 archive
+ARTS_DESC?=		Enable Arts audio system support
+ASSERT_DESC?=		Enable debug assertions
+AVAHI_DESC?=		Support Zeroconf through Avahi
+BDB1_DESC?=		Enable Berkeley DB 1.85 support
+BDB_DESC?=		Enable Berkeley DB support
+CACA_DESC?=		Enable libcaca support
+CAIRO_DESC?=		Enable Cairo graphic library support
+CDDA2WAV_DESC?=		Enable cdda2wav CD ripper
+CDDB_DESC?=		Enable CDDB support
+CDPARANOIA_DESC?=	Enable cdparanoia CD ripper
+CFITSIO_DESC?=		Enable FITS support via CFITSIO
+COMPOSITE_DESC?=	Enable X11 Composite extension
+CUE_DESC?=		Support embedded cue sheets
+CUPS_DESC?=		Enable Cups printing support
+CURL_DESC?=		Enable CURL support
+DAGRAB_DESC?=		Enable dagrab CD ripper
+DBM_DESC?=		Enable DBM support
+DBUS_DESC?=		Enable D-Bus support
+DEBUG_DESC?=		Enable debug flags
+DOCS_DESC?=		Build and install the documentation
+DV_DESC?=		Enable libDV support
+ECW_DESC?=		Enable ECW support
+ESOUND_DESC?=		Enable Esound sound server support
+EXAMPLES_DESC?=		Build and install the examples
+EXPAT_DESC?=		Enable Expat support
+FAAC_DESC?=		Enable FAAC encoder support
+FAAD_DESC?=		Enable FAAD aac decoder support
+FASTCGI_DESC?=		Enable FastCGI support
+FFMPEG_DESC?=		Support FFMPEG (wma aiff ac3 ape...)
+FLAC_DESC?=		Enable support for flac
+FONTCONFIG_DESC?=	Enable Font configuration API for X
+FPECTL_DESC?=		Enable floating point exception handling
+FREETDS_DESC?=		Enable FreeTDS support
+FREETYPE_DESC?=		Enable TrueType font rendering engine
+FUSE_DESC?=		Enable Fuse support
+GCONF_DESC?=		Enable gconf backend
+GDM_DESC?=		Build GDM login manager
+GEOS_DESC?=		Enable GEOS support
+GEOTIFF_DESC?=		Enable GeoTIFF support
+GIF_DESC?=		Enable GIF support
+GLADE_DESC?=		Enable Glade interface support
+GNOME_DESC?=		Enable GNOME Desktop support
+GNOMEVFS2_DESC?=	Enable GnomeVFS2 support
+GNUPG_DESC?=		Enable GNU Privacy Guard support
+GNUPLOT_DESC?=		Enable plotting using gnuplot
+GOGO_DESC?=		Enable gogo mp3 encoder
+GRAPHVIZ_DESC?=		Enable Graphviz support
+GRASS_DESC?=		Enable GRASS support
+GSM_DESC?=		Enable GSM codec support
+GSTREAMER_DESC?=	Enable multimedia support
+GTK2_DESC?=		Enable GTK2 gui toolkit support
+GTK3_DESC?=		Enable GTK3 gui toolkit support
+GUI_DESC?=		Enable GUI support
+GVFS_DESC?=		Enable remote access support
+H323_DESC?=		Enable H323 support
+HAL_DESC?=		Enable HAL support
+HDF5_DESC?=		Enable HDF-5 support
+HTTPD_DESC?=		Support for httpd output streaming
+ICONS_DESC?=		Enable Icons theme
+ICONV_DESC?=		Enable ICONV support
+IMLIB2_DESC?=		Enable imlib2 image library support
+ID3TAG_DESC?=		Support ID3 v1/v2 tags
+ID3_DESC?=		Enable support for id3 tags
+IPV6_DESC?=		Enable IPv6 support
+JABBER_DESC?=		Enable Jabber support
+JACK_DESC?=		Support JACK audio server
+JASPER_DESC?=		Enable JPEG 2000 support via JasPer
+JAVA_DESC?=		Enable JAVA platform support
+JPEG_DESC?=		Enable JPEG support
+KERBEROS_DESC?=		Enable Kerberos support
+KDE3_DESC?=		Enable KDE3 Desktop support
+KDE4_DESC?=		Enable KDE4 Desktop support
+KML_DESC?=		Enable KML support
+LADSPA_DESC?=		Enable LDSPA audio support
+LAME_DESC?=		Enable lame mp3 encoder support
+LASH_DESC?=		Enable LDASH audio support
+LASTFM_DESC?=		Support Last.FM stream input
+LCMS2_DESC?=		Enable LCMS2 support
+LDAP_DESC?=		Enable LDAP support
+LIBBLURAY_DESC?=	Enable libbluray support
+LIBEXTRACTOR_DESC?=	Enable libextractor support
+LIRC_DESC?=		Enable LIRC support
+LUA_DESC?=		Enable LUA support
+MAD_DESC?=		Enable Mad mp3 decoder support
+MAGICK_DESC?=		Enable ImageMagick Library
+MANPAGES_DESC?=		Build and install man pages
+MIKMOD_DESC?=		Support MOD audio format
+MIXER_DESC?=		Enable Mixer support
+MMKEYS_DESC?=		Enable multimedia keys support
+MMS_DESC?=		Support MMS stream input
+MMX_DESC?=		Enable MMX optimized routines
+MODPERL_DESC?=		Enable mod_perl support
+MODPLUG_DESC?=		Support MODPLUG decoder
+MOTIF_DESC?=		Enable Motif widget library
+MP4_DESC?=		Enable support for mp4
+MPP_DESC?=		Enable support for musepack
+MSQL_DESC?=		Enable msql backend
+MTP_DESC?=		Enable MTP device support
+MULTIBYTE_DESC?=	Enable multibyte character support
+MUSEPACK_DESC?=		Support MPC audio format
+MYSQL_DESC?=		Enable MySQL backend
+NAS_DESC?=		Enable Network Audio System support
+NETCDF_DESC?=		Enable NetCDF support
+NLS_DESC?=		Build and install the localisation data
+NOTIFY_DESC?=		Enable startup notification support
+ODBC_DESC?=		Enable ODBC backend
+ODF_DESC?=		Enable ODF support
+OPENGL_DESC?=		Enable OpenGL support
+OPTIMIZED_CFLAGS_DESC?=	Enable compilation optimizations
+ORACLE_DESC?=		Enable Oracle support
+OSS_DESC?=		Enable Open Sound System support
+PCRE_DESC?=		Enable regular expressions using libpcre
+PERL_DESC?=		Enable Perl scripting language support
+PGSQL_DESC?=		Enable PostgreSQL backend
+PHP_DESC?=		Enable PHP binding/support
+PIXBUF_DESC?=		Enable gdk-pixbuf support
+PNG_DESC?=		Enable PNG support
+POPPLER_DESC?=		Enable PDF and PS support
+PORTAUDIO_DESC?=	Enable PortAudio support
+PRINT_DESC?=		Enable Printer support
+PROJ_DESC?=		Enable PROJ.4 support 
+PTH_DESC?=		Enable GNU Pth for threading/multiprocessing
+PULSEAUDIO_DESC?=	Support PulseAudio sound server
+PYMALLOC_DESC?=		Enable python's internal malloc
+PYTHON_DESC?=		Enable Python binding/support
+QT4_DESC?=		Enable Qt4 gui toolkit support
+RADIUS_DESC?=		Enable RADIUS support
+RAW_DESC?=		Enable RAW support
+RESIN3_DESC?=		Enable Resin 3.x support
+RTMP_DESC?=		Enable RTMP support via librtmp
+RUBY_DESC?=		Enable Ruby binding/support
+SAMPLERATE_DESC?=	Support sample rate conversion
+SASL_DESC?=		Enable SASL support
+SDL_DESC?=		Enable Simple Direct Madia Layer support
+SEM_DESC?=		Enable POSIX semaphores support
+SHOUTCAST_DESC?=	Support for Ogg Icecast and Shoutcast
+SIMD_DESC?=		Use cpu-specific optimizations if possible
+SMB_DESC?=		Enable SMB protocol support
+SNDFILE_DESC?=		Add support for libsndfile
+SNMP_DESC?=		Enable SNMP support
+SPANDSP_DESC?=		Enable Spandsp faxing support
+SPEEX_DESC?=		Enable support for speex audio format
+SQLITE_DESC?=		Enable SQLite backend
+SSE_DESC?=		Enable SSE optimized routines
+SSH_DESC?=		Enable SSH support
+SSL_DESC?=		Enable SSL support
+SVG_DESC?=		Enable SVG image support
+STATIC_DESC?=		Build static executable/libraries
+SVN_DESC?=		Enable Subversion support
+THREADS_DESC?=		Enable thread support
+TIDY_DESC?=		Enable tidy html cleaner support
+TIFF_DESC?=		Enable TIFF support
+TINYXML_DESC?=		Enable XML Parser support via TinyXML
+TOMCAT5_DESC?=		Enable Tomcat 5.x support
+TOMCAT6_DESC?=		Enable Tomcat 6.x support
+TOMCAT7_DESC?=		Enable Tomcat 7.x support
+TREMOR_DESC?=		Support Tremor
+UCS2_DESC?=		Enable Unicode UCS-2 support
+UCS4_DESC?=		Enable Unicode UCS-4 support
+VAAPI_DESC?=		Enable VAAPI support
+VDPAU_DESC?=		Enable VDPAU support
+VORBIS_DESC?=		Enable support for Ogg Vorbis
+VPX_DESC?=		Enable VP8 video codec
+WAV_DESC?=		Support WAV audio format
+WAVPACK_DESC?=		Enable WavPack support
+WEBP_DESC?=		Enable WebP support
+WEBSERVER_DESC?=	Build Internal Webserver
+WXGTK_DESC?=		Enable WxGTK gui toolkit
+X11_DESC?=		Enable support for X11
+X264_DESC?=		Enable H264 video codec using x264
+XALAN_DESC?=		Enable Xalan support
+XCURSOR_DESC?=		Enable cursor themes support
+XERCES_DESC?=		Enable Xerces support
+XINERAMA_DESC?=		Enable X11 Xinerama Extension support
+XKLAVIER_DESC?=		Enable Keyboard layout settings
+XFT_DESC?=		Enable Xft support
+XML_DESC?=		Enable XML Parser support
+XPM_DESC?=		Enable XPM pixmaps support
+XRANDR_DESC?=		Enable Xrandr support
+XSPF_DESC?=		Enable support for XSPF
+XVIDEO_DESC?=		Enable the X Video Extension library
+XVID_DESC?=		Enable xvid mpeg4 video codec
+XVMC_DESC?=		Enable XvMC support
+YAML_DESC?=		Enable YAML support

Added: soc2012/scher/par_ports/head/Mk/bsd.options.mk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ soc2012/scher/par_ports/head/Mk/bsd.options.mk	Mon Jun  4 10:10:38 2012	(r237052)
@@ -0,0 +1,183 @@
+#-*- tab-width: 4; -*-
+# $FreeBSD: ports/Mk/bsd.options.mk,v 1.8 2012/06/02 09:13:13 bapt Exp $
+# Global options
+#
+
+##
+# Set all the options available for the ports, beginning with the
+# global ones and ending with the ones decided by the maintainer.
+# Options global to the entire ports tree
+
+OPTIONSFILE?=	${PORT_DBDIR}/${UNIQUENAME}/options
+
+#ALL_OPTIONS=	DOCS \
+#		NLS
+
+# Set the default values for the global options, as defined by portmgr
+.if !defined(NOPORTDOCS)
+PORT_OPTIONS+=	DOCS
+.endif
+PORT_OPTIONS+=	NLS
+
+# Set the default values for the global options, as defined by portmgr
+.if !defined(NOPORTEXAMPLES)
+PORT_OPTIONS+=	EXAMPLES
+.endif
+
+# Append options set by the port Makefile
+.for opt in ${OPTIONS_DEFINE}
+ALL_OPTIONS+=	${opt}
+.endfor
+
+ALL_OPTIONS:=	${ALL_OPTIONS:O:u}
+
+# Remove global options the port maintainer doesn't want
+.for opt in ${OPTIONS_EXCLUDE}
+ALL_OPTIONS:=	${ALL_OPTIONS:N${opt}}
+.endfor
+
+#XXX  to kill when old option framework won't be used anymore
+.if defined(OPTIONS)
+.  undef optname
+.  for O in ${OPTIONS:S|\#|\\\#|g}
+opt:=	${O}
+.    if !defined(optname)
+optname:=	${O}
+ALL_OPTIONS+=	${O}
+PORT_OPTIONS+=	${O}
+.    elif !defined(optdesc)
+optdesc:=	${opt}
+${optname}_DESC:=	${opt:S|"||g}
+.    else
+.      if ${opt:L} == off
+.        if defined(PORT_OPTIONS) && defined(optname)
+NO_OPTIONS+=	${optname}
+NO_OPTIONS:=	${NO_OPTIONS:O:u}
+.        else

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***


More information about the svn-soc-all mailing list