MFH: r369684

Add RedHat's patch for CVE-2014-7186, commonly known as "redir_stack" overflow,
which has not been shown to be as critical as "shellshock" currently.

Security:	CVE-2014-7186

Keywords/sample.yaml

@@ -26,4 +26,6 @@ pre-deinstall: |
   target_file="${sample_file%.sample}"
   if cmp -s "${target_file}" "${sample_file}"; then
     rm -f "${target_file}"
+  else
+    echo "You may need to manually remove ${target_file} if it's no longer needed."
   fi

Mk/Uses/lua.mk

@@ -98,7 +98,7 @@ MAKE_ENV+=	LUA_MODLIBDIR=${LUA_MODLIBDIR} \
 .if ${_LUA_ARGS:Mbuild}
 BUILD_DEPENDS+=	${LUA_CMD}:${PORTSDIR}/lang/lua${LUA_VER_STR}
 .elfif ${_LUA_ARGS:Mrun}
-RUN_DEPENDS+=	${LUA_CMD}:${POTSDIR}/lang/lua${LUA_VER_STR}
+RUN_DEPENDS+=	${LUA_CMD}:${PORTSDIR}/lang/lua${LUA_VER_STR}
 .else
 LIB_DEPENDS+=	liblua-${LUA_VER}.so:${PORTSDIR}/lang/lua${LUA_VER_STR}
 .endif

Mk/Uses/twisted.mk

@@ -53,7 +53,7 @@ BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/twisted/__init__.py:${PORTSDIR}/devel/py-tw
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/twisted/__init__.py:${PORTSDIR}/devel/py-twistedCore
 .endif
 
-_TWISTED_COMPONENTS=	conch flow lore mail names news runner web web2 words
+_TWISTED_COMPONENTS=	conch flow lore mail names news pair runner web web2 words
 
 conch_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/conch/__init__.py:${PORTSDIR}/security/py-twistedConch
 flow_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/flow/__init__.py:${PORTSDIR}/devel/py-twistedFlow

Mk/bsd.apache.mk

@@ -348,9 +348,15 @@ APACHE_PORT?=	www/apache${APACHE_VERSION}
 
 PLIST_SUB+=	APACHEMODDIR="${APACHEMODDIR}" \
 		APACHEINCLUDEDIR="${APACHEINCLUDEDIR}" \
-		APACHEETCDIR="${APACHEETCDIR}"
+		APACHEETCDIR="${APACHEETCDIR}" \
+		APACHE_VERSION="${APACHE_VERSION}"
+
+SUB_LIST+=	APACHEMODDIR="${APACHEMODDIR}" \
+		APACHEETCDIR="${APACHEETCDIR}" \
+		APACHE_VERSION="${APACHE_VERSION}"
 
 APACHE_PKGNAMEPREFIX=	ap${APACHE_VERSION}-
+
 .if defined(AP_FAST_BUILD)
 PKGNAMEPREFIX?=	${APACHE_PKGNAMEPREFIX}
 .endif
@@ -462,7 +468,6 @@ ap-gen-plist:
 .if defined(AP_GENPLIST)
 .	if !exists(${PLIST})
 	@${ECHO} "===>  Generating apache plist"
-# apache22
 	@${ECHO} "@unexec ${SED} -i '' -E '/LoadModule[[:blank:]]+%%AP_NAME%%_module/d' %D/%%APACHEETCDIR%%/httpd.conf" >> ${PLIST}
 	@${ECHO} "%%APACHEMODDIR%%/%%AP_MODULE%%" >> ${PLIST}
 	@${ECHO} "@exec %D/sbin/apxs -e ${AP_MOD_EN} -n %%AP_NAME%% %D/%F" >> ${PLIST}
@@ -493,6 +498,7 @@ do-install:
 .	endif
 . endif
 .endif
+
 .endif          # defined(AP_FAST_BUILD)
-.endif          # defined(AP_PORT_IS_MODULE)
+.endif          # defined(AP_PORT_IS_SERVER / AP_PORT_IS_MODULE)
 .endif          # defined(_POSTMKINCLUDED) && !defined(Apache_Post_Include)

Mk/bsd.pkgng.mk

@@ -265,7 +265,7 @@ do-package: ${TMPPLIST}
 			fi; \
 		fi; \
 	else \
-		cd ${.CURDIR} && eval ${MAKE} delete-package; \
+		cd ${.CURDIR} && eval ${MAKE} delete-package >/dev/null; \
 		exit 1; \
 	fi
 .endif

Mk/bsd.port.mk

@@ -3025,6 +3025,8 @@ IGNORE=		is not an interactive port
 IGNORE=		may not be placed on a CDROM: ${NO_CDROM}
 .elif (defined(RESTRICTED) && defined(NO_RESTRICTED))
 IGNORE=		is restricted: ${RESTRICTED}
+.elif (defined(NO_PACKAGE) && defined(PACKAGE_BUILDING))
+IGNORE=		may not be packaged: ${NO_PACKAGE}
 .elif defined(BROKEN)
 .if !defined(TRYBROKEN)
 IGNORE=		is marked as broken: ${BROKEN}
@@ -3397,7 +3399,7 @@ do-fetch:
 						continue 2; \
 					else \
 						${ECHO_MSG} "=> Fetched file size mismatch (expected $${CKSIZE}, actual $${actual_size})"; \
-						if [ $${sites_remaining} -gt 1 ]; then \
+						if [ $${sites_remaining} -gt 0 ]; then \
 							${ECHO_MSG} "=> Trying next site"; \
 							${RM} -f $${file}; \
 						fi; \
@@ -3783,7 +3785,7 @@ do-package: ${TMPPLIST}
 			cd ${.CURDIR} && eval ${MAKE} package-links; \
 		fi; \
 	else \
-		cd ${.CURDIR} && eval ${MAKE} delete-package; \
+		cd ${.CURDIR} && eval ${MAKE} delete-package >/dev/null; \
 		exit 1; \
 	fi
 .else
@@ -3818,7 +3820,7 @@ do-package: ${TMPPLIST}
 		fi; \
 	else \
 		[ -n "$${made_prefix}" ] && ${RMDIR} ${PREFIX}; \
-		cd ${.CURDIR} && eval ${MAKE} delete-package; \
+		cd ${.CURDIR} && eval ${MAKE} delete-package >/dev/null; \
 		exit 1; \
 	fi
 .endif
@@ -3860,6 +3862,7 @@ delete-package-links:
 
 .if !target(delete-package)
 delete-package: delete-package-links
+	@${ECHO_MSG} "===>  Deleting package for ${PKGNAME}"
 .	if defined(NO_STAGE)
 	@${RM} -f ${PKGFILE}
 .	else

UPDATING

@@ -5,6 +5,22 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20140926:
+  AFFECTS: users of shells/bash
+  AUTHOR: bdrewery@FreeBSD.org
+
+  Bash supports a feature of exporting functions in the environment with
+  export -f.  Running bash with exported functioned in the environment will
+  then import those functions into the environment.  This resulted in
+  security issues CVE-2014-6271 and CVE-2014-7169, commonly known as
+  "shellshock".
+
+  To fully mitigate against this sort of attack we have applied a non-upstream
+  patch to disable this functionality by default.  You can execute bash
+  with --import-functions to allow it to import functions from the
+  environment.  The default can also be changed in the port by selecting the
+  IMPORTFUNCTIONS option.
+
 20140627:
   AFFECTS: Users of Java
   AUTHOR: swills@FreeBSD.org

audio/padevchooser/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	padevchooser
 PORTVERSION=	0.9.3
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	audio
 MASTER_SITES=	http://0pointer.de/lennart/projects/${PORTNAME}/
 
@@ -12,8 +12,7 @@ COMMENT=	GTK icon tray for PulseAudio
 
 LIB_DEPENDS=	libglademm-2.4.so:${PORTSDIR}/devel/libglademm24 \
 		libpulse.so:${PORTSDIR}/audio/pulseaudio \
-		libnotify.so:${PORTSDIR}/devel/libnotify \
-		libavahi-core.so:${PORTSDIR}/net/avahi
+		libnotify.so:${PORTSDIR}/devel/libnotify
 RUN_DEPENDES=	dbus-daemon:${PORTSDIR}/devel/dbus
 
 GNU_CONFIGURE=	yes

audio/raproxy/Makefile

@@ -11,6 +11,8 @@ DISTNAME=	${PORTNAME}${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Progressive Networks RealAudio Proxy Kit 3.0 beta 1
 
+BROKEN=		Unfetchable
+
 ALL_TARGET=	raproxy
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
 

audio/tuxguitar/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	tuxguitar
 PORTVERSION=	1.2
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	audio java
 MASTER_SITES=	SF/${PORTNAME}/TuxGuitar/TuxGuitar-${PORTVERSION}:src \
 		${MASTER_SITE_LOCAL}/gahr/:fluid \
@@ -28,7 +28,7 @@ LIB_DEPENDS=	libfluidsynth.so:${PORTSDIR}/audio/fluidsynth \
 MAKE_ENV+=	PREFIX=${PREFIX} INSTALL_DOC_DIR=${DOCSDIR} \
 		INSTALL_SHARE_DIR=${DATADIR}
 
-USES=		gmake pkgconfig
+USES=		desktop-file-utils gmake pkgconfig
 USE_JAVA=	yes
 USE_ANT=	yes
 WITH_GECKO=	libxul
@@ -59,7 +59,10 @@ post-patch:
 	${FIND} ${WRKSRC}/.. -name GNUmakefile | ${XARGS} ${REINPLACE_CMD} -e '\
 	    s|-I$$(shell gcj -print-file-name=include/)|-I${JAVA_HOME}/include \
 	    -I${JAVA_HOME}/include/freebsd -I${LOCALBASE}/include|; \
-	    s|LDFLAGS\?=.*|LDFLAGS?=-L${LOCALBASE}/lib|'
+	    s|-I $$(shell $$(GCJ) -print-file-name=include/)|-I${JAVA_HOME}/include \
+	    -I${JAVA_HOME}/include/freebsd -I${LOCALBASE}/include|; \
+	    s|LDFLAGS\?=.*|LDFLAGS+=-L${LOCALBASE}/lib|; \
+	    s|CFLAGS\?=|CFLAGS+=|'
 	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g; \
 	    s|%%PREFIX%%|${PREFIX}|g; \
 	    s|%%JAVAJARDIR%%|${JAVAJARDIR}|g; \
@@ -85,8 +88,8 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/tuxguitar.jar ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/../misc/*.tg ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKDIR}/8MBGMSFX.SF2 ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/../TuxGuitar-oss/jni/libtuxguitar-oss-jni.so ${STAGEDIR}${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/../TuxGuitar-fluidsynth/jni/libtuxguitar-fluidsynth-jni.so ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_PROGRAM} ${WRKSRC}/../TuxGuitar-oss/jni/libtuxguitar-oss-jni.so ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_PROGRAM} ${WRKSRC}/../TuxGuitar-fluidsynth/jni/libtuxguitar-fluidsynth-jni.so ${STAGEDIR}${PREFIX}/lib
 .for p in ${PLUGINS}
 	${INSTALL_DATA} ${WRKSRC}/../TuxGuitar-${p}/tuxguitar-${p}.jar ${STAGEDIR}${DATADIR}/plugins
 .endfor

comms/fldigi/files/patch-src_spot_pskrep.cxx

@@ -0,0 +1,11 @@
+--- src/spot/pskrep.cxx.orig	2014-07-04 15:11:14.000000000 -0700
++++ src/spot/pskrep.cxx	2014-07-04 15:13:32.000000000 -0700
+@@ -50,7 +50,7 @@
+ #include <algorithm>
+ #include <fstream>
+ 
+-#if GCC_VER_OK
++#if GCC_VER_OK || HAVE_STD_HASH
+ #	if HAVE_STD_HASH
+ #		define MAP_TYPE std::unordered_map
+ #		define HASH_TYPE std::hash

comms/obexapp/Makefile

@@ -14,7 +14,7 @@ LIB_DEPENDS=	libopenobex.so:${PORTSDIR}/comms/openobex \
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USES=		iconv
+USES=		iconv readline
 PLIST_FILES=	bin/obexapp
 
 .if !defined(NO_INSTALL_MANPAGES)

databases/phpmyadmin/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	phpMyAdmin
-DISTVERSION=	4.2.5
+DISTVERSION=	4.2.8.1
 CATEGORIES=	databases www
 MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME}/${DISTVERSION}
 DISTNAME=	${PORTNAME}-${DISTVERSION}-all-languages

databases/phpmyadmin/distinfo

@@ -1,2 +1,2 @@
-SHA256 (phpMyAdmin-4.2.5-all-languages.tar.xz) = 1da068a70047d7b87a37e31f55241b1340150a6bc8451f08ecd1ed37242f2beb
-SIZE (phpMyAdmin-4.2.5-all-languages.tar.xz) = 5200328
+SHA256 (phpMyAdmin-4.2.8.1-all-languages.tar.xz) = 4358b9d98beabcb7609cf9943f9d340ea09958897f0da20318a6f1cebb981704
+SIZE (phpMyAdmin-4.2.8.1-all-languages.tar.xz) = 5145812

databases/rubygem-activemodel/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	activemodel
-PORTVERSION=	3.2.17
+PORTVERSION=	3.2.19
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 

databases/rubygem-activemodel/distinfo

@@ -1,2 +1,2 @@
-SHA256 (rubygem/activemodel-3.2.17.gem) = 7fc010fbde8f3574485d768b5fc056c83c7fd01d227b8e56a46b4febc91b4606
-SIZE (rubygem/activemodel-3.2.17.gem) = 44544
+SHA256 (rubygem/activemodel-3.2.19.gem) = 4ea3abf790eca9ee8228e9e2a465350e258294270a639b63f0e1dfad236fe70e
+SIZE (rubygem/activemodel-3.2.19.gem) = 44544

databases/rubygem-activerecord/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	activerecord
-PORTVERSION=	3.2.17
+PORTVERSION=	3.2.19
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 

databases/rubygem-activerecord/distinfo

@@ -1,2 +1,2 @@
-SHA256 (rubygem/activerecord-3.2.17.gem) = ad544500826264c523082f9533fbb5b9306277f09e53824b9bb176ff53ad59e4
-SIZE (rubygem/activerecord-3.2.17.gem) = 297472
+SHA256 (rubygem/activerecord-3.2.19.gem) = 052945ad510744aaa3e35a817a6f515a2316e7dd96df6460f75b36067bb60372
+SIZE (rubygem/activerecord-3.2.19.gem) = 297472

devel/bugzilla44/Makefile

@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	bugzilla
-PORTVERSION=	4.4.4
-PORTREVISION=	1
+PORTVERSION=	4.4.5
 CATEGORIES=	devel
 MASTER_SITES=	BUGZILLA
 MASTER_SITE_SUBDIR=	webtools webtools/archived
@@ -162,7 +161,8 @@ EXTRA_PATCHES=	${FILESDIR}/freebsd-project-ldap.diff
 post-extract:
 	@${RM} -rf ${WRKSRC}/.bzr
 	@${RM} -f ${WRKSRC}/.bzrignore ${WRKSRC}/.gitignore ${WRKSRC}/.gitrev \
-		${WRKSRC}/docs/en/README.docs ${WRKSRC}/docs/en/html/Bugzilla-Guide.proc
+		${WRKSRC}/docs/en/README.docs ${WRKSRC}/docs/en/html/Bugzilla-Guide.proc \
+		${WRKSRC}/.travis.yml ${WRKSRC}/Build.PL ${WRKSRC}/MANIFEST.SKIP
 
 post-patch:
 	@${PERL} -pi -e 's/(default => ON_WINDOWS.+)apache/$$1www/' \
@@ -178,7 +178,7 @@ post-patch:
 		${XARGS} ${REINPLACE_CMD} -i '' -e "s!/var/www/html/bugzilla!${WWWDIR}!"
 
 pre-install:
-	@${FIND} ${WRKSRC} -type f \( -name "*.orig" -or -name "*.bak" \) -delete
+	${FIND} ${WRKSRC} -type f \( -name "*.orig" -or -name "*.bak" \) -delete
 
 do-install:	.SILENT
 	${MKDIR} ${STAGEDIR}${WWWDIR}
@@ -191,12 +191,11 @@ do-install:	.SILENT
 	${TAR} -C ${WRKSRC} -cf - Bugzilla template | ${TAR} --unlink -C ${STAGEDIR}${WWWDIR} -xf -
 	@${MKDIR} ${EMPTY_DIRS_LIST:S!^!${STAGEDIR}${WWWDIR}/!}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/)
+	(cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 .if ${PORT_OPTIONS:MCONTRIB}
-	@(cd ${WRKSRC}/contrib && \
-		${FIND} . -type d -exec ${MKDIR} "${STAGEDIR}${WWWDIR}/contrib/{}" \; && \
-		${FIND} . -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${WWWDIR}/contrib/{}" \;)
+	@${MKDIR} ${STAGEDIR}${WWWDIR}/contrib
+	(cd ${WRKSRC}/contrib && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/contrib)
 .endif
 
 .include <bsd.port.mk>

devel/bugzilla44/distinfo

@@ -1,2 +1,2 @@
-SHA256 (bugzilla/bugzilla-4.4.4.tar.gz) = c799da664c8b3ca8acf993026021249f12f2dd6c3604837bc3ebacf11927d2d1
-SIZE (bugzilla/bugzilla-4.4.4.tar.gz) = 2957476
+SHA256 (bugzilla/bugzilla-4.4.5.tar.gz) = 70609fa5bbe55a3b802afcf749a098824d7a96dc87b91ce07b000cfdd7987da5
+SIZE (bugzilla/bugzilla-4.4.5.tar.gz) = 2955964

devel/bugzilla44/pkg-plist

@@ -887,178 +887,178 @@
 %%WWWDIR%%/whine.pl
 %%WWWDIR%%/whineatnews.pl
 %%WWWDIR%%/xmlrpc.cgi
-@dirrmtry %%WWWDIR%%/xt
-@dirrm %%WWWDIR%%/template/en/default/whine
-@dirrm %%WWWDIR%%/template/en/default/setup
-@dirrm %%WWWDIR%%/template/en/default/search
-@dirrm %%WWWDIR%%/template/en/default/request
-@dirrm %%WWWDIR%%/template/en/default/reports
-@dirrm %%WWWDIR%%/template/en/default/pages
-@dirrm %%WWWDIR%%/template/en/default/list
-@dirrm %%WWWDIR%%/template/en/default/global
-@dirrm %%WWWDIR%%/template/en/default/flag
-@dirrm %%WWWDIR%%/template/en/default/extensions
-@dirrm %%WWWDIR%%/template/en/default/email
-@dirrm %%WWWDIR%%/template/en/default/bug/process
-@dirrm %%WWWDIR%%/template/en/default/bug/create
-@dirrm %%WWWDIR%%/template/en/default/bug/activity
-@dirrm %%WWWDIR%%/template/en/default/bug
-@dirrm %%WWWDIR%%/template/en/default/attachment
-@dirrm %%WWWDIR%%/template/en/default/admin/workflow
-@dirrm %%WWWDIR%%/template/en/default/admin/versions
-@dirrm %%WWWDIR%%/template/en/default/admin/users
-@dirrm %%WWWDIR%%/template/en/default/admin/settings
-@dirrm %%WWWDIR%%/template/en/default/admin/sanitycheck
-@dirrm %%WWWDIR%%/template/en/default/admin/products/groupcontrol
-@dirrm %%WWWDIR%%/template/en/default/admin/products
-@dirrm %%WWWDIR%%/template/en/default/admin/params
-@dirrm %%WWWDIR%%/template/en/default/admin/milestones
-@dirrm %%WWWDIR%%/template/en/default/admin/keywords
-@dirrm %%WWWDIR%%/template/en/default/admin/groups
-@dirrm %%WWWDIR%%/template/en/default/admin/flag-type
-@dirrm %%WWWDIR%%/template/en/default/admin/fieldvalues
-@dirrm %%WWWDIR%%/template/en/default/admin/custom_fields
-@dirrm %%WWWDIR%%/template/en/default/admin/components
-@dirrm %%WWWDIR%%/template/en/default/admin/classifications
-@dirrm %%WWWDIR%%/template/en/default/admin
-@dirrm %%WWWDIR%%/template/en/default/account/prefs
-@dirrm %%WWWDIR%%/template/en/default/account/password
-@dirrm %%WWWDIR%%/template/en/default/account/email
-@dirrm %%WWWDIR%%/template/en/default/account/auth
-@dirrm %%WWWDIR%%/template/en/default/account
-@dirrm %%WWWDIR%%/template/en/default
-@dirrm %%WWWDIR%%/template/en
-@dirrmtry %%WWWDIR%%/template
-@dirrmtry %%WWWDIR%%/t
-@dirrm %%WWWDIR%%/skins/standard/index
-@dirrm %%WWWDIR%%/skins/standard/global
-@dirrm %%WWWDIR%%/skins/standard/dependency-tree
-@dirrm %%WWWDIR%%/skins/standard
-@dirrm %%WWWDIR%%/skins/contrib/Dusk
-@dirrm %%WWWDIR%%/skins/contrib
-@dirrmtry %%WWWDIR%%/skins
-@dirrmtry %%WWWDIR%%/lib
-@dirrmtry %%WWWDIR%%/js/yui/yuitest
-@dirrmtry %%WWWDIR%%/js/yui/yuiloader
-@dirrmtry %%WWWDIR%%/js/yui/yahoo-dom-event
-@dirrmtry %%WWWDIR%%/js/yui/yahoo
-@dirrmtry %%WWWDIR%%/js/yui/uploader
-@dirrmtry %%WWWDIR%%/js/yui/treeview
-@dirrmtry %%WWWDIR%%/js/yui/tabview
-@dirrmtry %%WWWDIR%%/js/yui/swfstore
-@dirrmtry %%WWWDIR%%/js/yui/swfdetect
-@dirrmtry %%WWWDIR%%/js/yui/swf
-@dirrmtry %%WWWDIR%%/js/yui/stylesheet
-@dirrmtry %%WWWDIR%%/js/yui/storage
-@dirrmtry %%WWWDIR%%/js/yui/slider
-@dirrmtry %%WWWDIR%%/js/yui/selector
-@dirrmtry %%WWWDIR%%/js/yui/resize
-@dirrmtry %%WWWDIR%%/js/yui/reset-fonts-grids
-@dirrmtry %%WWWDIR%%/js/yui/reset-fonts
-@dirrmtry %%WWWDIR%%/js/yui/reset
-@dirrmtry %%WWWDIR%%/js/yui/progressbar
-@dirrmtry %%WWWDIR%%/js/yui/profilerviewer
-@dirrmtry %%WWWDIR%%/js/yui/profiler
-@dirrmtry %%WWWDIR%%/js/yui/paginator
-@dirrmtry %%WWWDIR%%/js/yui/menu
-@dirrmtry %%WWWDIR%%/js/yui/logger
-@dirrmtry %%WWWDIR%%/js/yui/layout
-@dirrmtry %%WWWDIR%%/js/yui/json
-@dirrmtry %%WWWDIR%%/js/yui/imageloader
-@dirrmtry %%WWWDIR%%/js/yui/imagecropper
-@dirrmtry %%WWWDIR%%/js/yui/history
-@dirrmtry %%WWWDIR%%/js/yui/grids
-@dirrmtry %%WWWDIR%%/js/yui/get
-@dirrmtry %%WWWDIR%%/js/yui/fonts
-@dirrmtry %%WWWDIR%%/js/yui/event-simulate
-@dirrmtry %%WWWDIR%%/js/yui/event-mouseenter
-@dirrmtry %%WWWDIR%%/js/yui/event-delegate
-@dirrmtry %%WWWDIR%%/js/yui/event
-@dirrmtry %%WWWDIR%%/js/yui/element-delegate
-@dirrmtry %%WWWDIR%%/js/yui/element
-@dirrmtry %%WWWDIR%%/js/yui/dragdrop
-@dirrmtry %%WWWDIR%%/js/yui/dom
-@dirrmtry %%WWWDIR%%/js/yui/datemath
-@dirrmtry %%WWWDIR%%/js/yui/datatable
-@dirrmtry %%WWWDIR%%/js/yui/datasource
-@dirrmtry %%WWWDIR%%/js/yui/cookie
-@dirrmtry %%WWWDIR%%/js/yui/container
-@dirrmtry %%WWWDIR%%/js/yui/connection
-@dirrmtry %%WWWDIR%%/js/yui/colorpicker
-@dirrmtry %%WWWDIR%%/js/yui/charts
-@dirrmtry %%WWWDIR%%/js/yui/carousel
-@dirrmtry %%WWWDIR%%/js/yui/calendar
-@dirrmtry %%WWWDIR%%/js/yui/button
-@dirrmtry %%WWWDIR%%/js/yui/base
-@dirrmtry %%WWWDIR%%/js/yui/autocomplete
-@dirrmtry %%WWWDIR%%/js/yui/assets/skins/sam
-@dirrmtry %%WWWDIR%%/js/yui/assets/skins
-@dirrmtry %%WWWDIR%%/js/yui/assets
-@dirrmtry %%WWWDIR%%/js/yui/animation
-@dirrmtry %%WWWDIR%%/js/yui
-@dirrmtry %%WWWDIR%%/js/history.js
-@dirrmtry %%WWWDIR%%/js
-@dirrm %%WWWDIR%%/images
-@dirrmtry %%WWWDIR%%/graphs
-@dirrmtry %%WWWDIR%%/data
-%%CONTRIB%%@dirrm %%WWWDIR%%/contrib/cmdline
-%%CONTRIB%%@dirrm %%WWWDIR%%/contrib/bugzilla-submit
-@dirrmtry %%WWWDIR%%/contrib
-@dirrm %%WWWDIR%%/Bugzilla/Whine
-@dirrm %%WWWDIR%%/Bugzilla/WebService/Server
-@dirrm %%WWWDIR%%/Bugzilla/WebService
-@dirrm %%WWWDIR%%/Bugzilla/User/Setting
-@dirrm %%WWWDIR%%/Bugzilla/User
-@dirrm %%WWWDIR%%/Bugzilla/Template/Plugin
-@dirrm %%WWWDIR%%/Bugzilla/Template
-@dirrm %%WWWDIR%%/Bugzilla/Send
-@dirrm %%WWWDIR%%/Bugzilla/Search
-@dirrm %%WWWDIR%%/Bugzilla/Migrate
-@dirrm %%WWWDIR%%/Bugzilla/JobQueue
-@dirrm %%WWWDIR%%/Bugzilla/Job
-@dirrm %%WWWDIR%%/Bugzilla/Install
-@dirrm %%WWWDIR%%/Bugzilla/Field
-@dirrm %%WWWDIR%%/Bugzilla/DB/Schema
-@dirrm %%WWWDIR%%/Bugzilla/DB
-@dirrm %%WWWDIR%%/Bugzilla/Config
-@dirrm %%WWWDIR%%/Bugzilla/BugUrl/Bugzilla
-@dirrm %%WWWDIR%%/Bugzilla/BugUrl
-@dirrm %%WWWDIR%%/Bugzilla/Auth/Verify
-@dirrm %%WWWDIR%%/Bugzilla/Auth/Persist
-@dirrm %%WWWDIR%%/Bugzilla/Auth/Login
-@dirrm %%WWWDIR%%/Bugzilla/Auth
-@dirrm %%WWWDIR%%/Bugzilla/Attachment
-@dirrmtry %%WWWDIR%%/Bugzilla
-@dirrmtry %%WWWDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/xsl
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/lib/Pod/Simple/HTMLBatch
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/html/api/Bugzilla/Auth
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/html/api/Bugzilla/Config
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/html/api/Bugzilla/DB
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/html/api/Bugzilla/Field
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/html/api/Bugzilla/Install
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/html/api/Bugzilla/JobQueue
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/html/api/Bugzilla/Search
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/html/api/Bugzilla/Template/Plugin
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/html/api/Bugzilla/Template
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/html/api/Bugzilla/User/Setting
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/html/api/Bugzilla/User
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/html/api/Bugzilla/WebService/Server
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/html/api/Bugzilla/WebService
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/html/api/Bugzilla/Whine
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/html/api/Bugzilla
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/html/api/contrib
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/html/api/extensions
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/html/api
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/images/callouts
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/pdf
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/xml
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/en
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/lib/Pod/Simple/HTML
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/lib/Pod/Simple/HTMLBatch
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/lib/Pod/Simple
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/lib/Pod
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/lib
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/xml
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/pdf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/images/callouts
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/html/api/extensions
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/html/api/contrib
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/html/api/Bugzilla/Whine
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/html/api/Bugzilla/WebService/Server
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/html/api/Bugzilla/WebService
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/html/api/Bugzilla/User/Setting
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/html/api/Bugzilla/User
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/html/api/Bugzilla/Template/Plugin
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/html/api/Bugzilla/Template
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/html/api/Bugzilla/Search
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/html/api/Bugzilla/JobQueue
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/html/api/Bugzilla/Install
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/html/api/Bugzilla/Field
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/html/api/Bugzilla/DB
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/html/api/Bugzilla/Config
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/html/api/Bugzilla/Auth
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/html/api/Bugzilla
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/html/api
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/xsl
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%WWWDIR%%/Bugzilla/Attachment
+@dirrm %%WWWDIR%%/Bugzilla/Auth/Login
+@dirrm %%WWWDIR%%/Bugzilla/Auth/Persist
+@dirrm %%WWWDIR%%/Bugzilla/Auth/Verify
+@dirrm %%WWWDIR%%/Bugzilla/Auth
+@dirrm %%WWWDIR%%/Bugzilla/BugUrl/Bugzilla
+@dirrm %%WWWDIR%%/Bugzilla/BugUrl
+@dirrm %%WWWDIR%%/Bugzilla/Config
+@dirrm %%WWWDIR%%/Bugzilla/DB/Schema
+@dirrm %%WWWDIR%%/Bugzilla/DB
+@dirrm %%WWWDIR%%/Bugzilla/Field
+@dirrm %%WWWDIR%%/Bugzilla/Install
+@dirrm %%WWWDIR%%/Bugzilla/Job
+@dirrm %%WWWDIR%%/Bugzilla/JobQueue
+@dirrm %%WWWDIR%%/Bugzilla/Migrate
+@dirrm %%WWWDIR%%/Bugzilla/Search
+@dirrm %%WWWDIR%%/Bugzilla/Send
+@dirrm %%WWWDIR%%/Bugzilla/Template/Plugin
+@dirrm %%WWWDIR%%/Bugzilla/Template
+@dirrm %%WWWDIR%%/Bugzilla/User/Setting
+@dirrm %%WWWDIR%%/Bugzilla/User
+@dirrm %%WWWDIR%%/Bugzilla/WebService/Server
+@dirrm %%WWWDIR%%/Bugzilla/WebService
+@dirrm %%WWWDIR%%/Bugzilla/Whine
+@dirrmtry %%WWWDIR%%/Bugzilla
+%%CONTRIB%%@dirrm %%WWWDIR%%/contrib/bugzilla-submit
+%%CONTRIB%%@dirrm %%WWWDIR%%/contrib/cmdline
+@dirrmtry %%WWWDIR%%/contrib
+@dirrmtry %%WWWDIR%%/data
+@dirrmtry %%WWWDIR%%/graphs
+@dirrmtry %%WWWDIR%%/images
+@dirrm %%WWWDIR%%/js/history.js
+@dirrm %%WWWDIR%%/js/yui/animation
+@dirrm %%WWWDIR%%/js/yui/assets/skins/sam
+@dirrm %%WWWDIR%%/js/yui/assets/skins
+@dirrm %%WWWDIR%%/js/yui/assets
+@dirrm %%WWWDIR%%/js/yui/autocomplete
+@dirrm %%WWWDIR%%/js/yui/base
+@dirrm %%WWWDIR%%/js/yui/button
+@dirrm %%WWWDIR%%/js/yui/calendar
+@dirrm %%WWWDIR%%/js/yui/carousel
+@dirrm %%WWWDIR%%/js/yui/charts
+@dirrm %%WWWDIR%%/js/yui/colorpicker
+@dirrm %%WWWDIR%%/js/yui/connection
+@dirrm %%WWWDIR%%/js/yui/container
+@dirrm %%WWWDIR%%/js/yui/cookie
+@dirrm %%WWWDIR%%/js/yui/datasource
+@dirrm %%WWWDIR%%/js/yui/datatable
+@dirrm %%WWWDIR%%/js/yui/datemath
+@dirrm %%WWWDIR%%/js/yui/dom
+@dirrm %%WWWDIR%%/js/yui/dragdrop
+@dirrm %%WWWDIR%%/js/yui/element
+@dirrm %%WWWDIR%%/js/yui/element-delegate
+@dirrm %%WWWDIR%%/js/yui/event
+@dirrm %%WWWDIR%%/js/yui/event-delegate
+@dirrm %%WWWDIR%%/js/yui/event-mouseenter
+@dirrm %%WWWDIR%%/js/yui/event-simulate
+@dirrm %%WWWDIR%%/js/yui/fonts
+@dirrm %%WWWDIR%%/js/yui/get
+@dirrm %%WWWDIR%%/js/yui/grids
+@dirrm %%WWWDIR%%/js/yui/history
+@dirrm %%WWWDIR%%/js/yui/imagecropper
+@dirrm %%WWWDIR%%/js/yui/imageloader
+@dirrm %%WWWDIR%%/js/yui/json
+@dirrm %%WWWDIR%%/js/yui/layout
+@dirrm %%WWWDIR%%/js/yui/logger
+@dirrm %%WWWDIR%%/js/yui/menu
+@dirrm %%WWWDIR%%/js/yui/paginator
+@dirrm %%WWWDIR%%/js/yui/profiler
+@dirrm %%WWWDIR%%/js/yui/profilerviewer
+@dirrm %%WWWDIR%%/js/yui/progressbar
+@dirrm %%WWWDIR%%/js/yui/reset
+@dirrm %%WWWDIR%%/js/yui/reset-fonts
+@dirrm %%WWWDIR%%/js/yui/reset-fonts-grids
+@dirrm %%WWWDIR%%/js/yui/resize
+@dirrm %%WWWDIR%%/js/yui/selector
+@dirrm %%WWWDIR%%/js/yui/slider
+@dirrm %%WWWDIR%%/js/yui/storage
+@dirrm %%WWWDIR%%/js/yui/stylesheet
+@dirrm %%WWWDIR%%/js/yui/swf
+@dirrm %%WWWDIR%%/js/yui/swfdetect
+@dirrm %%WWWDIR%%/js/yui/swfstore
+@dirrm %%WWWDIR%%/js/yui/tabview
+@dirrm %%WWWDIR%%/js/yui/treeview
+@dirrm %%WWWDIR%%/js/yui/uploader
+@dirrm %%WWWDIR%%/js/yui/yahoo
+@dirrm %%WWWDIR%%/js/yui/yahoo-dom-event
+@dirrm %%WWWDIR%%/js/yui/yuiloader
+@dirrm %%WWWDIR%%/js/yui/yuitest
+@dirrm %%WWWDIR%%/js/yui
+@dirrm %%WWWDIR%%/js
+@dirrmtry %%WWWDIR%%/lib
+@dirrm %%WWWDIR%%/skins/contrib/Dusk
+@dirrm %%WWWDIR%%/skins/contrib
+@dirrm %%WWWDIR%%/skins/standard/dependency-tree
+@dirrm %%WWWDIR%%/skins/standard/global
+@dirrm %%WWWDIR%%/skins/standard/index
+@dirrm %%WWWDIR%%/skins/standard
+@dirrmtry %%WWWDIR%%/skins
+@dirrmtry %%WWWDIR%%/t
+@dirrm %%WWWDIR%%/template/en/default/account/auth
+@dirrm %%WWWDIR%%/template/en/default/account/email
+@dirrm %%WWWDIR%%/template/en/default/account/password
+@dirrm %%WWWDIR%%/template/en/default/account/prefs
+@dirrm %%WWWDIR%%/template/en/default/account
+@dirrm %%WWWDIR%%/template/en/default/admin/classifications
+@dirrm %%WWWDIR%%/template/en/default/admin/components
+@dirrm %%WWWDIR%%/template/en/default/admin/custom_fields
+@dirrm %%WWWDIR%%/template/en/default/admin/fieldvalues
+@dirrm %%WWWDIR%%/template/en/default/admin/flag-type
+@dirrm %%WWWDIR%%/template/en/default/admin/groups
+@dirrm %%WWWDIR%%/template/en/default/admin/keywords
+@dirrm %%WWWDIR%%/template/en/default/admin/milestones
+@dirrm %%WWWDIR%%/template/en/default/admin/params
+@dirrm %%WWWDIR%%/template/en/default/admin/products/groupcontrol
+@dirrm %%WWWDIR%%/template/en/default/admin/products
+@dirrm %%WWWDIR%%/template/en/default/admin/sanitycheck
+@dirrm %%WWWDIR%%/template/en/default/admin/settings
+@dirrm %%WWWDIR%%/template/en/default/admin/users
+@dirrm %%WWWDIR%%/template/en/default/admin/versions
+@dirrm %%WWWDIR%%/template/en/default/admin/workflow
+@dirrm %%WWWDIR%%/template/en/default/admin
+@dirrm %%WWWDIR%%/template/en/default/attachment
+@dirrm %%WWWDIR%%/template/en/default/bug/activity
+@dirrm %%WWWDIR%%/template/en/default/bug/create
+@dirrm %%WWWDIR%%/template/en/default/bug/process
+@dirrm %%WWWDIR%%/template/en/default/bug
+@dirrm %%WWWDIR%%/template/en/default/email
+@dirrm %%WWWDIR%%/template/en/default/extensions
+@dirrm %%WWWDIR%%/template/en/default/flag
+@dirrm %%WWWDIR%%/template/en/default/global
+@dirrm %%WWWDIR%%/template/en/default/list
+@dirrm %%WWWDIR%%/template/en/default/pages
+@dirrm %%WWWDIR%%/template/en/default/reports
+@dirrm %%WWWDIR%%/template/en/default/request
+@dirrm %%WWWDIR%%/template/en/default/search
+@dirrm %%WWWDIR%%/template/en/default/setup
+@dirrm %%WWWDIR%%/template/en/default/whine
+@dirrm %%WWWDIR%%/template/en/default
+@dirrm %%WWWDIR%%/template/en
+@dirrmtry %%WWWDIR%%/template
+@dirrmtry %%WWWDIR%%/xt
+@dirrmtry %%WWWDIR%%

devel/cmake-gui/Makefile

@@ -4,7 +4,7 @@ PORTNAME=	cmake
 PORTVERSION=	2.8.12.1
 PORTREVISION=	1
 CATEGORIES=	devel
-MASTER_SITES=	http://downloads.cmake.org/files/v2.8/
+MASTER_SITES=	http://www.cmake.org/files/v2.8/
 PKGNAMESUFFIX=	-gui
 
 MAINTAINER=	kde@FreeBSD.org

devel/cmake/Makefile

@@ -5,7 +5,7 @@ PORTNAME=	cmake
 PORTVERSION=	2.8.12.1
 PORTREVISION?=	4
 CATEGORIES=	devel
-MASTER_SITES=	http://downloads.cmake.org/files/v2.8/
+MASTER_SITES=	http://www.cmake.org/files/v2.8/
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT?=	Cross-platform Makefile generator

devel/dbus/Makefile

@@ -3,7 +3,7 @@
 #   $MCom: ports/devel/dbus/Makefile,v 1.58 2013/02/15 15:06:49 kwm Exp $
 
 PORTNAME=	dbus
-PORTVERSION=	1.8.4
+PORTVERSION=	1.8.8
 CATEGORIES=	devel gnome
 MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus/
 

devel/dbus/distinfo

@@ -1,2 +1,2 @@
-SHA256 (dbus-1.8.4.tar.gz) = 3ef63dc8d0111042071ee7f7bafa0650c6ce2d7be957ef0b7ec269495a651ff8
-SIZE (dbus-1.8.4.tar.gz) = 1860286
+SHA256 (dbus-1.8.8.tar.gz) = dfab263649a979d0fff64a30cac374891a8e9940350e41f3bbd7679af32bd1fd
+SIZE (dbus-1.8.8.tar.gz) = 1864881

devel/dbus/pkg-plist

@@ -29,7 +29,7 @@ lib/libdbus-1.a
 lib/libdbus-1.la
 lib/libdbus-1.so
 lib/libdbus-1.so.3
-lib/libdbus-1.so.3.8.5
+lib/libdbus-1.so.3.8.7
 libdata/pkgconfig/dbus-1.pc
 @group %%GROUPS%%
 @mode 4750

devel/freeocl/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	freeocl
 PORTVERSION=	0.3.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 DISTNAME=	FreeOCL-${PORTVERSION}-src

devel/freeocl/files/patch-src-utils-threadpool.cpp

@@ -0,0 +1,10 @@
+--- src/utils/threadpool.cpp.orig	2014-07-04 08:45:34.000000000 +0200
++++ src/utils/threadpool.cpp	2014-07-04 08:46:03.000000000 +0200
+@@ -18,6 +18,7 @@
+ #include "threadpool.h"
+ #include <FreeOCL/config.h>
+ #include <sched.h>
++#include <xmmintrin.h>
+ #include <atomic_ops.h>
+ #include <utils/time.h>
+ 

devel/freeocl/files/patch-src_freeocl.h

@@ -1,10 +1,11 @@
---- src/freeocl.h.orig	2013-11-15 21:18:17.000000000 +0100
-+++ src/freeocl.h	2013-11-15 21:24:32.000000000 +0100
-@@ -26,6 +26,7 @@
+--- src/freeocl.h.orig	2012-09-02 19:00:41.000000000 +0200
++++ src/freeocl.h	2014-07-04 08:42:48.000000000 +0200
+@@ -26,6 +26,8 @@
  #include "dispatch.h"
  #include <iostream>
  #include <deque>
 +#include <sys/types.h>
++#include <xmmintrin.h>
  
  #ifdef DEBUG_UTILS
  #define MSG(X)	std::cout << #X << std::endl

devel/monodevelop-database/Makefile

@@ -9,6 +9,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-2
 MAINTAINER=	mono@FreeBSD.org
 COMMENT=	MonoDevelop database support
 
+BROKEN=		Fails to build with monodevelop-5.0.1
+
 LICENSE=	MIT
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/monodevelop.pc:${PORTSDIR}/devel/monodevelop

devel/p5-Config-Properties/Makefile

@@ -7,7 +7,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	cmanley@xs4all.nl
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Read and write property files
 
 USES=		perl5

devel/p5-Test-OpenLDAP/Makefile

@@ -2,7 +2,7 @@
 
 PORTNAME=	Test-OpenLDAP
 PORTVERSION=	0.05
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -17,7 +17,7 @@ RUN_DEPENDS=	\
 	p5-Data-UUID>0:${PORTSDIR}/devel/p5-Data-UUID \
 	p5-perl-ldap>0:${PORTSDIR}/net/p5-perl-ldap \
 	${LOCALBASE}/libexec/slapd:${PORTSDIR}/net/openldap${OPENLDAP_VER}-server \
-	p5-URI>0:${PORTSDIR}/net/p5-Net
+	p5-Net>0:${PORTSDIR}/net/p5-Net
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5

devel/rubygem-activesupport/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	activesupport
-PORTVERSION=	3.2.17
+PORTVERSION=	3.2.19
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 

devel/rubygem-activesupport/distinfo

@@ -1,2 +1,2 @@
-SHA256 (rubygem/activesupport-3.2.17.gem) = e0cc4b452f8cd1350f16017965ebcfe5010a2a699a34d5e8485d214905766b87
-SIZE (rubygem/activesupport-3.2.17.gem) = 290304
+SHA256 (rubygem/activesupport-3.2.19.gem) = 2c837a59250da14b12a6b0cfb6774f0afae90aa749fd96ad4347344d8417ad3d
+SIZE (rubygem/activesupport-3.2.19.gem) = 290304

devel/subversion/Makefile

@@ -77,9 +77,6 @@ BDB_BUILD_DEPENDS=	yes
 OLD_LIB_DEPENDS:=	${LIB_DEPENDS:S!^!${LOCALBASE}/lib/!:C!(\.so|\.[0-9]+)?:!.a:!}
 BUILD_DEPENDS+=		${OLD_LIB_DEPENDS}
 LIB_DEPENDS=
-PLIST_SUB+=		DYNAMIC_ENABLED="@comment "
-.else
-PLIST_SUB+=		DYNAMIC_ENABLED=""
 .endif
 
 .if ${PORT_OPTIONS:MBDB}
@@ -227,8 +224,8 @@ _mkrepos:	.USE
 .endif
 
 svn-build-outputs-hack:
-	cd ${WRKSRC} && ${PATCH} ${PATCH_DIST_ARGS} -p0 < ${PATCHDIR}/extra-patch-build.conf
-	cd ${WRKSRC} && python2 gen-make.py --release --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc
+	(cd ${WRKSRC} && ${PATCH} ${PATCH_DIST_ARGS} -p0 < ${PATCHDIR}/extra-patch-build.conf)
+	(cd ${WRKSRC} && python2 gen-make.py --release --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc)
 	${MV} ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk.addons
 
 .include <bsd.port.post.mk>

devel/subversion/Makefile.common

@@ -10,10 +10,12 @@ DIST_SUBDIR=	subversion18
 MASTER_SITE_SUBDIR=	subversion
 
 GNU_CONFIGURE=	yes
-USES+=		tar:bzip2 pkgconfig libtool
+USES+=		tar:bzip2 pkgconfig libtool cpe
 
 LICENSE=	APACHE20
 
+CPE_VENDOR=	apache
+
 CONFLICTS_INSTALL+=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[^8].[0-9]*
 
 LIB_DEPENDS+=		libapr-1.so:${PORTSDIR}/devel/apr1 \

devel/subversion/pkg-plist

@@ -68,61 +68,61 @@ include/subversion-1/svn_version.h
 include/subversion-1/svn_wc.h
 include/subversion-1/svn_xml.h
 lib/libsvn_client-1.a
-%%DYNAMIC_ENABLED%%lib/libsvn_client-1.so
-%%DYNAMIC_ENABLED%%lib/libsvn_client-1.so.0
-%%DYNAMIC_ENABLED%%lib/libsvn_client-1.so.0.0.0
+%%NO_STATIC%%lib/libsvn_client-1.so
+%%NO_STATIC%%lib/libsvn_client-1.so.0
+%%NO_STATIC%%lib/libsvn_client-1.so.0.0.0
 lib/libsvn_delta-1.a
-%%DYNAMIC_ENABLED%%lib/libsvn_delta-1.so
-%%DYNAMIC_ENABLED%%lib/libsvn_delta-1.so.0
-%%DYNAMIC_ENABLED%%lib/libsvn_delta-1.so.0.0.0
+%%NO_STATIC%%lib/libsvn_delta-1.so
+%%NO_STATIC%%lib/libsvn_delta-1.so.0
+%%NO_STATIC%%lib/libsvn_delta-1.so.0.0.0
 lib/libsvn_diff-1.a
-%%DYNAMIC_ENABLED%%lib/libsvn_diff-1.so
-%%DYNAMIC_ENABLED%%lib/libsvn_diff-1.so.0
-%%DYNAMIC_ENABLED%%lib/libsvn_diff-1.so.0.0.0
+%%NO_STATIC%%lib/libsvn_diff-1.so
+%%NO_STATIC%%lib/libsvn_diff-1.so.0
+%%NO_STATIC%%lib/libsvn_diff-1.so.0.0.0
 lib/libsvn_fs-1.a
-%%DYNAMIC_ENABLED%%lib/libsvn_fs-1.so
-%%DYNAMIC_ENABLED%%lib/libsvn_fs-1.so.0
-%%DYNAMIC_ENABLED%%lib/libsvn_fs-1.so.0.0.0
+%%NO_STATIC%%lib/libsvn_fs-1.so
+%%NO_STATIC%%lib/libsvn_fs-1.so.0
+%%NO_STATIC%%lib/libsvn_fs-1.so.0.0.0
 %%BDB%%lib/libsvn_fs_base-1.a
-%%DYNAMIC_ENABLED%%%%BDB%%lib/libsvn_fs_base-1.so
-%%DYNAMIC_ENABLED%%%%BDB%%lib/libsvn_fs_base-1.so.0
-%%DYNAMIC_ENABLED%%%%BDB%%lib/libsvn_fs_base-1.so.0.0.0
+%%NO_STATIC%%%%BDB%%lib/libsvn_fs_base-1.so
+%%NO_STATIC%%%%BDB%%lib/libsvn_fs_base-1.so.0
+%%NO_STATIC%%%%BDB%%lib/libsvn_fs_base-1.so.0.0.0
 lib/libsvn_fs_fs-1.a
-%%DYNAMIC_ENABLED%%lib/libsvn_fs_fs-1.so
-%%DYNAMIC_ENABLED%%lib/libsvn_fs_fs-1.so.0
-%%DYNAMIC_ENABLED%%lib/libsvn_fs_fs-1.so.0.0.0
+%%NO_STATIC%%lib/libsvn_fs_fs-1.so
+%%NO_STATIC%%lib/libsvn_fs_fs-1.so.0
+%%NO_STATIC%%lib/libsvn_fs_fs-1.so.0.0.0
 lib/libsvn_fs_util-1.a
-%%DYNAMIC_ENABLED%%lib/libsvn_fs_util-1.so
-%%DYNAMIC_ENABLED%%lib/libsvn_fs_util-1.so.0
-%%DYNAMIC_ENABLED%%lib/libsvn_fs_util-1.so.0.0.0
+%%NO_STATIC%%lib/libsvn_fs_util-1.so
+%%NO_STATIC%%lib/libsvn_fs_util-1.so.0
+%%NO_STATIC%%lib/libsvn_fs_util-1.so.0.0.0
 lib/libsvn_ra-1.a
-%%DYNAMIC_ENABLED%%lib/libsvn_ra-1.so
-%%DYNAMIC_ENABLED%%lib/libsvn_ra-1.so.0
-%%DYNAMIC_ENABLED%%lib/libsvn_ra-1.so.0.0.0
+%%NO_STATIC%%lib/libsvn_ra-1.so
+%%NO_STATIC%%lib/libsvn_ra-1.so.0
+%%NO_STATIC%%lib/libsvn_ra-1.so.0.0.0
 lib/libsvn_ra_local-1.a
-%%DYNAMIC_ENABLED%%lib/libsvn_ra_local-1.so
-%%DYNAMIC_ENABLED%%lib/libsvn_ra_local-1.so.0
-%%DYNAMIC_ENABLED%%lib/libsvn_ra_local-1.so.0.0.0
+%%NO_STATIC%%lib/libsvn_ra_local-1.so
+%%NO_STATIC%%lib/libsvn_ra_local-1.so.0
+%%NO_STATIC%%lib/libsvn_ra_local-1.so.0.0.0
 %%SERF%%lib/libsvn_ra_serf-1.a
-%%DYNAMIC_ENABLED%%%%SERF%%lib/libsvn_ra_serf-1.so
-%%DYNAMIC_ENABLED%%%%SERF%%lib/libsvn_ra_serf-1.so.0
-%%DYNAMIC_ENABLED%%%%SERF%%lib/libsvn_ra_serf-1.so.0.0.0
+%%NO_STATIC%%%%SERF%%lib/libsvn_ra_serf-1.so
+%%NO_STATIC%%%%SERF%%lib/libsvn_ra_serf-1.so.0
+%%NO_STATIC%%%%SERF%%lib/libsvn_ra_serf-1.so.0.0.0
 lib/libsvn_ra_svn-1.a
-%%DYNAMIC_ENABLED%%lib/libsvn_ra_svn-1.so
-%%DYNAMIC_ENABLED%%lib/libsvn_ra_svn-1.so.0
-%%DYNAMIC_ENABLED%%lib/libsvn_ra_svn-1.so.0.0.0
+%%NO_STATIC%%lib/libsvn_ra_svn-1.so
+%%NO_STATIC%%lib/libsvn_ra_svn-1.so.0
+%%NO_STATIC%%lib/libsvn_ra_svn-1.so.0.0.0
 lib/libsvn_repos-1.a
-%%DYNAMIC_ENABLED%%lib/libsvn_repos-1.so
-%%DYNAMIC_ENABLED%%lib/libsvn_repos-1.so.0
-%%DYNAMIC_ENABLED%%lib/libsvn_repos-1.so.0.0.0
+%%NO_STATIC%%lib/libsvn_repos-1.so
+%%NO_STATIC%%lib/libsvn_repos-1.so.0
+%%NO_STATIC%%lib/libsvn_repos-1.so.0.0.0
 lib/libsvn_subr-1.a
-%%DYNAMIC_ENABLED%%lib/libsvn_subr-1.so
-%%DYNAMIC_ENABLED%%lib/libsvn_subr-1.so.0
-%%DYNAMIC_ENABLED%%lib/libsvn_subr-1.so.0.0.0
+%%NO_STATIC%%lib/libsvn_subr-1.so
+%%NO_STATIC%%lib/libsvn_subr-1.so.0
+%%NO_STATIC%%lib/libsvn_subr-1.so.0.0.0
 lib/libsvn_wc-1.a
-%%DYNAMIC_ENABLED%%lib/libsvn_wc-1.so
-%%DYNAMIC_ENABLED%%lib/libsvn_wc-1.so.0
-%%DYNAMIC_ENABLED%%lib/libsvn_wc-1.so.0.0.0
+%%NO_STATIC%%lib/libsvn_wc-1.so
+%%NO_STATIC%%lib/libsvn_wc-1.so.0
+%%NO_STATIC%%lib/libsvn_wc-1.so.0.0.0
 man/man1/svn.1.gz
 man/man1/svnadmin.1.gz
 man/man1/svndumpfilter.1.gz

devel/subversion16/Makefile

@@ -88,12 +88,6 @@ SVNGROUP?=	svn
 SVNUSER?=	svn
 .endif
 
-.if ${PORT_OPTIONS:MSTATIC}
-PLIST_SUB+=	DYNAMIC_ENABLED="@comment "
-.else
-PLIST_SUB+=	DYNAMIC_ENABLED=""
-.endif
-
 .if make(repository)
 WITH_REPOSITORY_CREATION=	yes
 .endif

devel/subversion16/Makefile.common

@@ -11,13 +11,14 @@ DIST_SUBDIR=	subversion
 
 EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 
-USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool
 USE_KDE4=	# Used below if KWallet support is enabled
-USES+=		pkgconfig
+USES+=		pkgconfig tar:bzip2 cpe
 
 LICENSE=	APACHE20
 
+CPE_VENDOR=	apache
+
 CONFLICTS_INSTALL+=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[^6].[0-9]*
 
 LIB_DEPENDS+=		libapr-1.so:${PORTSDIR}/devel/apr1 \

devel/subversion16/pkg-plist

@@ -55,72 +55,72 @@ include/subversion-1/svn_wc.h
 include/subversion-1/svn_xml.h
 %%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.a
 %%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.la
-%%DYNAMIC_ENABLED%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so
-%%DYNAMIC_ENABLED%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so.0
+%%NO_STATIC%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so
+%%NO_STATIC%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so.0
 %%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.a
 %%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.la
-%%DYNAMIC_ENABLED%%%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.so
-%%DYNAMIC_ENABLED%%%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.so.0
+%%NO_STATIC%%%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.so
+%%NO_STATIC%%%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.so.0
 lib/libsvn_client-1.a
 lib/libsvn_client-1.la
-%%DYNAMIC_ENABLED%%lib/libsvn_client-1.so
-%%DYNAMIC_ENABLED%%lib/libsvn_client-1.so.0
+%%NO_STATIC%%lib/libsvn_client-1.so
+%%NO_STATIC%%lib/libsvn_client-1.so.0
 lib/libsvn_delta-1.a
 lib/libsvn_delta-1.la
-%%DYNAMIC_ENABLED%%lib/libsvn_delta-1.so
-%%DYNAMIC_ENABLED%%lib/libsvn_delta-1.so.0
+%%NO_STATIC%%lib/libsvn_delta-1.so
+%%NO_STATIC%%lib/libsvn_delta-1.so.0
 lib/libsvn_diff-1.a
 lib/libsvn_diff-1.la
-%%DYNAMIC_ENABLED%%lib/libsvn_diff-1.so
-%%DYNAMIC_ENABLED%%lib/libsvn_diff-1.so.0
+%%NO_STATIC%%lib/libsvn_diff-1.so
+%%NO_STATIC%%lib/libsvn_diff-1.so.0
 lib/libsvn_fs-1.a
 lib/libsvn_fs-1.la
-%%DYNAMIC_ENABLED%%lib/libsvn_fs-1.so
-%%DYNAMIC_ENABLED%%lib/libsvn_fs-1.so.0
+%%NO_STATIC%%lib/libsvn_fs-1.so
+%%NO_STATIC%%lib/libsvn_fs-1.so.0
 %%BDB%%lib/libsvn_fs_base-1.a
 %%BDB%%lib/libsvn_fs_base-1.la
-%%DYNAMIC_ENABLED%%%%BDB%%lib/libsvn_fs_base-1.so
-%%DYNAMIC_ENABLED%%%%BDB%%lib/libsvn_fs_base-1.so.0
+%%NO_STATIC%%%%BDB%%lib/libsvn_fs_base-1.so
+%%NO_STATIC%%%%BDB%%lib/libsvn_fs_base-1.so.0
 lib/libsvn_fs_fs-1.a
 lib/libsvn_fs_fs-1.la
-%%DYNAMIC_ENABLED%%lib/libsvn_fs_fs-1.so
-%%DYNAMIC_ENABLED%%lib/libsvn_fs_fs-1.so.0
+%%NO_STATIC%%lib/libsvn_fs_fs-1.so
+%%NO_STATIC%%lib/libsvn_fs_fs-1.so.0
 lib/libsvn_fs_util-1.a
 lib/libsvn_fs_util-1.la
-%%DYNAMIC_ENABLED%%lib/libsvn_fs_util-1.so
-%%DYNAMIC_ENABLED%%lib/libsvn_fs_util-1.so.0
+%%NO_STATIC%%lib/libsvn_fs_util-1.so
+%%NO_STATIC%%lib/libsvn_fs_util-1.so.0
 lib/libsvn_ra-1.a
 lib/libsvn_ra-1.la
-%%DYNAMIC_ENABLED%%lib/libsvn_ra-1.so
-%%DYNAMIC_ENABLED%%lib/libsvn_ra-1.so.0
+%%NO_STATIC%%lib/libsvn_ra-1.so
+%%NO_STATIC%%lib/libsvn_ra-1.so.0
 lib/libsvn_ra_local-1.a
 lib/libsvn_ra_local-1.la
-%%DYNAMIC_ENABLED%%lib/libsvn_ra_local-1.so
-%%DYNAMIC_ENABLED%%lib/libsvn_ra_local-1.so.0
+%%NO_STATIC%%lib/libsvn_ra_local-1.so
+%%NO_STATIC%%lib/libsvn_ra_local-1.so.0
 %%NEON%%lib/libsvn_ra_neon-1.a
 %%NEON%%lib/libsvn_ra_neon-1.la
-%%DYNAMIC_ENABLED%%%%NEON%%lib/libsvn_ra_neon-1.so
-%%DYNAMIC_ENABLED%%%%NEON%%lib/libsvn_ra_neon-1.so.0
+%%NO_STATIC%%%%NEON%%lib/libsvn_ra_neon-1.so
+%%NO_STATIC%%%%NEON%%lib/libsvn_ra_neon-1.so.0
 lib/libsvn_ra_svn-1.a
 lib/libsvn_ra_svn-1.la
-%%DYNAMIC_ENABLED%%lib/libsvn_ra_svn-1.so
-%%DYNAMIC_ENABLED%%lib/libsvn_ra_svn-1.so.0
+%%NO_STATIC%%lib/libsvn_ra_svn-1.so
+%%NO_STATIC%%lib/libsvn_ra_svn-1.so.0
 lib/libsvn_repos-1.a
 lib/libsvn_repos-1.la
-%%DYNAMIC_ENABLED%%lib/libsvn_repos-1.so
-%%DYNAMIC_ENABLED%%lib/libsvn_repos-1.so.0
+%%NO_STATIC%%lib/libsvn_repos-1.so
+%%NO_STATIC%%lib/libsvn_repos-1.so.0
 %%SERF%%lib/libsvn_ra_serf-1.a
 %%SERF%%lib/libsvn_ra_serf-1.la
-%%DYNAMIC_ENABLED%%%%SERF%%lib/libsvn_ra_serf-1.so
-%%DYNAMIC_ENABLED%%%%SERF%%lib/libsvn_ra_serf-1.so.0
+%%NO_STATIC%%%%SERF%%lib/libsvn_ra_serf-1.so
+%%NO_STATIC%%%%SERF%%lib/libsvn_ra_serf-1.so.0
 lib/libsvn_subr-1.a
 lib/libsvn_subr-1.la
-%%DYNAMIC_ENABLED%%lib/libsvn_subr-1.so
-%%DYNAMIC_ENABLED%%lib/libsvn_subr-1.so.0
+%%NO_STATIC%%lib/libsvn_subr-1.so
+%%NO_STATIC%%lib/libsvn_subr-1.so.0
 lib/libsvn_wc-1.a
 lib/libsvn_wc-1.la
-%%DYNAMIC_ENABLED%%lib/libsvn_wc-1.so
-%%DYNAMIC_ENABLED%%lib/libsvn_wc-1.so.0
+%%NO_STATIC%%lib/libsvn_wc-1.so
+%%NO_STATIC%%lib/libsvn_wc-1.so.0
 @comment enable modules in this order: dav_svn, authz_svn, dontdothat
 %%MOD_DAV_SVN%%@unexec %%SED%% -i '' -E '/LoadModule[[:blank:]]+dav_svn_module/d' %D/%%APACHEETCDIR%%/httpd.conf
 %%MOD_DAV_SVN%%%%APACHEMODDIR%%/mod_dav_svn.so

devel/subversion17/Makefile

@@ -94,14 +94,10 @@ USES+=			gettext:build
 .  endif
 .  if ${PORT_OPTIONS:MBDB}
 BDB_BUILD_DEPENDS=	yes
-.else
 .  endif
 OLD_LIB_DEPENDS:=	${LIB_DEPENDS:S!^!${LOCALBASE}/lib/!:C!(\.so|\.[0-9]+)?:!.a:!}
 BUILD_DEPENDS+=		${OLD_LIB_DEPENDS}
 LIB_DEPENDS=
-PLIST_SUB+=		DYNAMIC_ENABLED="@comment "
-.else
-PLIST_SUB+=		DYNAMIC_ENABLED=""
 .endif
 
 .if make(repository)
@@ -282,7 +278,7 @@ _mkrepos:	.USE
 .endif
 
 svn-build-outputs-hack:
-	(cd ${WRKSRC} && ./gen-make.py --release --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc)
-	${MV} ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk
+	(cd ${WRKSRC} && python2 ./gen-make.py --release --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc)
+	${MV} ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk.addons
 
 .include <bsd.port.post.mk>

devel/subversion17/Makefile.common

@@ -12,10 +12,12 @@ MASTER_SITE_SUBDIR=	subversion
 
 USE_KDE4=	# Used below if KWallet support is enabled
 GNU_CONFIGURE=	yes
-USES+=		tar:bzip2 pkgconfig libtool
+USES+=		tar:bzip2 pkgconfig libtool cpe
 
 LICENSE=	APACHE20
 
+CPE_VENDOR=	apache
+
 CONFLICTS_INSTALL+=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[^7].[0-9]*
 
 LIB_DEPENDS+=		libapr-1.so:${PORTSDIR}/devel/apr1 \
@@ -116,7 +118,7 @@ post-patch:
 	@${REINPLACE_CMD} "s#^swig_pydir =.*#swig_pydir = ${PYTHON_SITELIBDIR}/libsvn#" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} "s#^swig_pydir_extra =.*#swig_pydir_extra = ${PYTHON_SITELIBDIR}/svn#" ${WRKSRC}/Makefile.in
 .if defined(SVN_BUILD_BINDINGS)
-	@${CP} ${FILESDIR}/build-outputs.mk ${WRKSRC}
+	${CP} ${FILESDIR}/build-outputs.mk ${WRKSRC}
 .endif
 .if ${PORT_OPTIONS:MFREEBSD_TEMPLATE} && defined(ORGANIZATION)
 	@${ECHO_CMD} "#define ORGANIZATION_NAME \"${ORGANIZATION}\"" > ${WRKSRC}/subversion/freebsd-organization.h

devel/subversion17/files/extra-patch-fbsd-template

@@ -91,7 +91,7 @@
 +  svn_stringbuf_appendcstr(default_msg, "Approved by:\t" APR_EOL_STR);
 +  svn_stringbuf_appendcstr(default_msg, "Obtained from:\t" APR_EOL_STR);
 +  svn_stringbuf_appendcstr(default_msg, "MFC after:\t" APR_EOL_STR);
-+  svn_stringbuf_appendcstr(default_msg, "MFH:\t" APR_EOL_STR);
++  svn_stringbuf_appendcstr(default_msg, "MFH:\t\t" APR_EOL_STR);
 +  svn_stringbuf_appendcstr(default_msg, "Relnotes:\t" APR_EOL_STR);
 +  svn_stringbuf_appendcstr(default_msg, "Security:\t" APR_EOL_STR);
 +  svn_stringbuf_appendcstr(default_msg, "Sponsored by:\t"

devel/subversion17/pkg-plist

@@ -60,73 +60,73 @@ include/subversion-1/svn_version.h
 include/subversion-1/svn_wc.h
 include/subversion-1/svn_xml.h
 %%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.a
-%%DYNAMIC_ENABLED%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so
-%%DYNAMIC_ENABLED%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so.0
-%%DYNAMIC_ENABLED%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so.0.0.0
+%%NO_STATIC%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so
+%%NO_STATIC%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so.0
+%%NO_STATIC%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so.0.0.0
 %%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.a
-%%DYNAMIC_ENABLED%%%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.so
-%%DYNAMIC_ENABLED%%%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.so.0
-%%DYNAMIC_ENABLED%%%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.so.0.0.0
+%%NO_STATIC%%%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.so
+%%NO_STATIC%%%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.so.0
+%%NO_STATIC%%%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.so.0.0.0
 lib/libsvn_client-1.a
-%%DYNAMIC_ENABLED%%lib/libsvn_client-1.so
-%%DYNAMIC_ENABLED%%lib/libsvn_client-1.so.0
-%%DYNAMIC_ENABLED%%lib/libsvn_client-1.so.0.0.0
+%%NO_STATIC%%lib/libsvn_client-1.so
+%%NO_STATIC%%lib/libsvn_client-1.so.0
+%%NO_STATIC%%lib/libsvn_client-1.so.0.0.0
 lib/libsvn_delta-1.a
-%%DYNAMIC_ENABLED%%lib/libsvn_delta-1.so
-%%DYNAMIC_ENABLED%%lib/libsvn_delta-1.so.0
-%%DYNAMIC_ENABLED%%lib/libsvn_delta-1.so.0.0.0
+%%NO_STATIC%%lib/libsvn_delta-1.so
+%%NO_STATIC%%lib/libsvn_delta-1.so.0
+%%NO_STATIC%%lib/libsvn_delta-1.so.0.0.0
 lib/libsvn_diff-1.a
-%%DYNAMIC_ENABLED%%lib/libsvn_diff-1.so
-%%DYNAMIC_ENABLED%%lib/libsvn_diff-1.so.0
-%%DYNAMIC_ENABLED%%lib/libsvn_diff-1.so.0.0.0
+%%NO_STATIC%%lib/libsvn_diff-1.so
+%%NO_STATIC%%lib/libsvn_diff-1.so.0
+%%NO_STATIC%%lib/libsvn_diff-1.so.0.0.0
 lib/libsvn_fs-1.a
-%%DYNAMIC_ENABLED%%lib/libsvn_fs-1.so
-%%DYNAMIC_ENABLED%%lib/libsvn_fs-1.so.0
-%%DYNAMIC_ENABLED%%lib/libsvn_fs-1.so.0.0.0
+%%NO_STATIC%%lib/libsvn_fs-1.so
+%%NO_STATIC%%lib/libsvn_fs-1.so.0
+%%NO_STATIC%%lib/libsvn_fs-1.so.0.0.0
 %%BDB%%lib/libsvn_fs_base-1.a
-%%DYNAMIC_ENABLED%%%%BDB%%lib/libsvn_fs_base-1.so
-%%DYNAMIC_ENABLED%%%%BDB%%lib/libsvn_fs_base-1.so.0
-%%DYNAMIC_ENABLED%%%%BDB%%lib/libsvn_fs_base-1.so.0.0.0
+%%NO_STATIC%%%%BDB%%lib/libsvn_fs_base-1.so
+%%NO_STATIC%%%%BDB%%lib/libsvn_fs_base-1.so.0
+%%NO_STATIC%%%%BDB%%lib/libsvn_fs_base-1.so.0.0.0
 lib/libsvn_fs_fs-1.a
-%%DYNAMIC_ENABLED%%lib/libsvn_fs_fs-1.so
-%%DYNAMIC_ENABLED%%lib/libsvn_fs_fs-1.so.0
-%%DYNAMIC_ENABLED%%lib/libsvn_fs_fs-1.so.0.0.0
+%%NO_STATIC%%lib/libsvn_fs_fs-1.so
+%%NO_STATIC%%lib/libsvn_fs_fs-1.so.0
+%%NO_STATIC%%lib/libsvn_fs_fs-1.so.0.0.0
 lib/libsvn_fs_util-1.a
-%%DYNAMIC_ENABLED%%lib/libsvn_fs_util-1.so
-%%DYNAMIC_ENABLED%%lib/libsvn_fs_util-1.so.0
-%%DYNAMIC_ENABLED%%lib/libsvn_fs_util-1.so.0.0.0
+%%NO_STATIC%%lib/libsvn_fs_util-1.so
+%%NO_STATIC%%lib/libsvn_fs_util-1.so.0
+%%NO_STATIC%%lib/libsvn_fs_util-1.so.0.0.0
 lib/libsvn_ra-1.a
-%%DYNAMIC_ENABLED%%lib/libsvn_ra-1.so
-%%DYNAMIC_ENABLED%%lib/libsvn_ra-1.so.0
-%%DYNAMIC_ENABLED%%lib/libsvn_ra-1.so.0.0.0
+%%NO_STATIC%%lib/libsvn_ra-1.so
+%%NO_STATIC%%lib/libsvn_ra-1.so.0
+%%NO_STATIC%%lib/libsvn_ra-1.so.0.0.0
 lib/libsvn_ra_local-1.a
-%%DYNAMIC_ENABLED%%lib/libsvn_ra_local-1.so
-%%DYNAMIC_ENABLED%%lib/libsvn_ra_local-1.so.0
-%%DYNAMIC_ENABLED%%lib/libsvn_ra_local-1.so.0.0.0
+%%NO_STATIC%%lib/libsvn_ra_local-1.so
+%%NO_STATIC%%lib/libsvn_ra_local-1.so.0
+%%NO_STATIC%%lib/libsvn_ra_local-1.so.0.0.0
 %%NEON%%lib/libsvn_ra_neon-1.a
-%%DYNAMIC_ENABLED%%%%NEON%%lib/libsvn_ra_neon-1.so
-%%DYNAMIC_ENABLED%%%%NEON%%lib/libsvn_ra_neon-1.so.0
-%%DYNAMIC_ENABLED%%%%NEON%%lib/libsvn_ra_neon-1.so.0.0.0
+%%NO_STATIC%%%%NEON%%lib/libsvn_ra_neon-1.so
+%%NO_STATIC%%%%NEON%%lib/libsvn_ra_neon-1.so.0
+%%NO_STATIC%%%%NEON%%lib/libsvn_ra_neon-1.so.0.0.0
 %%SERF%%lib/libsvn_ra_serf-1.a
-%%DYNAMIC_ENABLED%%%%SERF%%lib/libsvn_ra_serf-1.so
-%%DYNAMIC_ENABLED%%%%SERF%%lib/libsvn_ra_serf-1.so.0
-%%DYNAMIC_ENABLED%%%%SERF%%lib/libsvn_ra_serf-1.so.0.0.0
+%%NO_STATIC%%%%SERF%%lib/libsvn_ra_serf-1.so
+%%NO_STATIC%%%%SERF%%lib/libsvn_ra_serf-1.so.0
+%%NO_STATIC%%%%SERF%%lib/libsvn_ra_serf-1.so.0.0.0
 lib/libsvn_ra_svn-1.a
-%%DYNAMIC_ENABLED%%lib/libsvn_ra_svn-1.so
-%%DYNAMIC_ENABLED%%lib/libsvn_ra_svn-1.so.0
-%%DYNAMIC_ENABLED%%lib/libsvn_ra_svn-1.so.0.0.0
+%%NO_STATIC%%lib/libsvn_ra_svn-1.so
+%%NO_STATIC%%lib/libsvn_ra_svn-1.so.0
+%%NO_STATIC%%lib/libsvn_ra_svn-1.so.0.0.0
 lib/libsvn_repos-1.a
-%%DYNAMIC_ENABLED%%lib/libsvn_repos-1.so
-%%DYNAMIC_ENABLED%%lib/libsvn_repos-1.so.0
-%%DYNAMIC_ENABLED%%lib/libsvn_repos-1.so.0.0.0
+%%NO_STATIC%%lib/libsvn_repos-1.so
+%%NO_STATIC%%lib/libsvn_repos-1.so.0
+%%NO_STATIC%%lib/libsvn_repos-1.so.0.0.0
 lib/libsvn_subr-1.a
-%%DYNAMIC_ENABLED%%lib/libsvn_subr-1.so
-%%DYNAMIC_ENABLED%%lib/libsvn_subr-1.so.0
-%%DYNAMIC_ENABLED%%lib/libsvn_subr-1.so.0.0.0
+%%NO_STATIC%%lib/libsvn_subr-1.so
+%%NO_STATIC%%lib/libsvn_subr-1.so.0
+%%NO_STATIC%%lib/libsvn_subr-1.so.0.0.0
 lib/libsvn_wc-1.a
-%%DYNAMIC_ENABLED%%lib/libsvn_wc-1.so
-%%DYNAMIC_ENABLED%%lib/libsvn_wc-1.so.0
-%%DYNAMIC_ENABLED%%lib/libsvn_wc-1.so.0.0.0
+%%NO_STATIC%%lib/libsvn_wc-1.so
+%%NO_STATIC%%lib/libsvn_wc-1.so.0
+%%NO_STATIC%%lib/libsvn_wc-1.so.0.0.0
 @comment enable modules in this order: dav_svn, authz_svn, dontdothat
 %%MOD_DAV_SVN%%@unexec %%SED%% -i '' -E '/LoadModule[[:blank:]]+dav_svn_module/d' %D/%%APACHEETCDIR%%/httpd.conf
 %%MOD_DAV_SVN%%%%APACHEMODDIR%%/mod_dav_svn.so

devel/thrift-cpp/Makefile

@@ -34,10 +34,11 @@ INSTALL_WRKSRC=		${WRKSRC}/lib/cpp
 
 OPTIONS_DEFINE=		QT4
 QT4_CONFIGURE_WITH=	qt4
+QT4_USE=		QT4=network,moc_build,qmake_build,rcc_build,uic_build
 
 OPTIONS_SUB=		yes
 
-CONFIGURE_ARGS+=        \
+CONFIGURE_ARGS+=	\
 		--without-c_glib \
 		--with-cpp \
 		--without-csharp \
@@ -56,10 +57,6 @@ CONFIGURE_ARGS+=        \
 USE_CXXSTD=	c++11
 .endif
 
-.if ${PORT_OPTIONS:MQT4}
-USE_QT4=		network moc_build qmake_build rcc_build uic_build
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} 's,^pkgconfigdir = .*,pkgconfigdir=$${prefix}/libdata/pkgconfig,' ${WRKSRC}/lib/cpp/Makefile.am
 

editors/gobby/Makefile

@@ -2,6 +2,7 @@
 
 PORTNAME=	gobby
 PORTVERSION=	0.4.13
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	http://releases.0x539.de/gobby/ \
 		LOCAL/${MAINTAINER:C/([^@]*)@.*/\1/}
@@ -19,8 +20,8 @@ LIB_DEPENDS=	libobby.so:${PORTSDIR}/devel/obby \
 OPTIONS_DEFINE=	GTKSPELL NLS
 GTKSPELL_DESC=	Enable GtkSpell support
 
-USE_GNOME=	gnomehack gtksourceview2 intltool
-USES=		gmake pkgconfig
+USE_GNOME=	gtksourceview2 intltool
+USES=		gmake pkgconfig pathfix
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 

editors/gobby/files/patch-inc__config.hpp

@@ -0,0 +1,38 @@
+--- ./inc/config.hpp.orig	2012-01-30 01:27:51.000000000 +0100
++++ ./inc/config.hpp	2014-07-24 13:11:27.000000000 +0200
+@@ -31,6 +31,19 @@
+ #include <libxml++/nodes/element.h>
+ #include <libxml++/nodes/textnode.h>
+ 
++
++namespace serialise
++{
++template<>
++class default_context_to<Glib::ustring>: public context_base_to<Glib::ustring>
++{
++public:
++	typedef Glib::ustring data_type;
++
++	virtual std::string to_string(const data_type& from) const;
++};
++}
++
+ namespace Gobby
+ {
+ 
+@@ -460,15 +473,6 @@
+ };
+ 
+ template<>
+-class default_context_to<Glib::ustring>: public context_base_to<Glib::ustring>
+-{
+-public:
+-	typedef Glib::ustring data_type;
+-
+-	virtual std::string to_string(const data_type& from) const;
+-};
+-
+-template<>
+ class default_context_from<Glib::ustring>:
+ 	public context_base_from<Glib::ustring>
+ {

editors/gobby/files/patch-inc__preferencesdialog.hpp

@@ -0,0 +1,11 @@
+--- ./inc/preferencesdialog.hpp.orig	2012-01-30 01:27:51.000000000 +0100
++++ ./inc/preferencesdialog.hpp	2014-07-24 13:12:17.000000000 +0200
+@@ -198,7 +198,7 @@
+ 	protected:
+ 		struct LangCompare
+ 		{
+-			bool operator()(GtkSourceLanguage* first, GtkSourceLanguage* second)
++			bool operator()(const GtkSourceLanguage* first, const GtkSourceLanguage* second) const
+ 			{
+ 				return first < second;
+ 			}

editors/speedbar/Makefile

@@ -11,9 +11,10 @@ MASTER_SITES=	SF/cedet/${PORTNAME}/1.4beta4 \
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b/beta/}
 
-MAINTAINER=	dryice@dryice.name
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Quick access to files and tags in an Emacs frame
 
+BROKEN=		Fails to build
 USE_EMACS=	yes
 
 USES=		gmake

editors/wordgrinder/Makefile

@@ -11,6 +11,8 @@ COMMENT=	Simple Unicode-aware console-based word processor
 
 LICENSE=	MIT
 
+BROKEN=		Fails to build
+
 RUN_DEPENDS=	${LUA_MODLIBDIR}/lfs.so:${PORTSDIR}/devel/luafilesystem
 
 USES=		lua:51 tar:bzip2

emulators/vba/Makefile

@@ -35,6 +35,7 @@ OPTIONS_SUB=	yes
 PROFILING_DESC=	Enable profiling
 
 GTK2_CONFIGURE_ON=	--enable-gtk=2.4
+GTK2_USES=		pkgconfig
 PROFILING_CONFIGURE_ENABLE=	profiling
 
 NO_STAGE=	yes

graphics/R-cran-munsell/Makefile

@@ -14,7 +14,7 @@ LICENSE=	MIT CW
 LICENSE_COMB=	multi
 LICENSE_NAME_CW=	Charlotte Wickham COPYRIGHT
 LICENSE_FILE_CW=	${WRKSRC}/LICENSE
-LICENSE_PERMS_CW=	auto-accept
+LICENSE_PERMS_CW=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 RUN_DEPENDS=	R-cran-colorspace>0:${PORTSDIR}/graphics/R-cran-colorspace
 

graphics/iccxml/Makefile

@@ -10,6 +10,8 @@ DISTNAME=	IccXML-${PORTVERSION}
 MAINTAINER=	bsam@FreeBSD.org
 COMMENT=	Tools for reading and writing the ICC profile contents as XML files
 
+BROKEN=		Fails to build with sampleicc 1.6.8
+
 LIB_DEPENDS=	libSampleICC.so:${PORTSDIR}/graphics/sampleicc
 
 USES=		gmake pathfix pkgconfig libtool

graphics/qt4-imageformats/Makefile

@@ -3,6 +3,7 @@
 
 PORTNAME=	imageformats
 DISTVERSION=	${QT4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	graphics
 PKGNAMEPREFIX=	qt4-
 

graphics/qt4-imageformats/files/patch-CVE-2014-0190

@@ -0,0 +1,38 @@
+commit f1b76c126c476c155af8c404b97c42cd1a709333
+Author: Lars Knoll <lars.knoll@digia.com>
+Date:   Thu Apr 24 15:33:27 2014 +0200
+
+    Don't crash on broken GIF images
+    
+    Broken GIF images could set invalid width and height
+    values inside the image, leading to Qt creating a null
+    QImage for it. In that case we need to abort decoding
+    the image and return an error.
+    
+    Initial patch by Rich Moore.
+    
+    Backport of Id82a4036f478bd6e49c402d6598f57e7e5bb5e1e from Qt 5
+    
+    Task-number: QTBUG-38367
+    Change-Id: I0680740018aaa8356d267b7af3f01fac3697312a
+    Security-advisory: CVE-2014-0190
+    Reviewed-by: Richard J. Moore <rich@kde.org>
+
+diff --git a/src/gui/image/qgifhandler.cpp b/src/gui/image/qgifhandler.cpp
+index 3324f04..5199dd3 100644
+--- src/gui/image/qgifhandler.cpp
++++ src/gui/image/qgifhandler.cpp
+@@ -359,6 +359,13 @@ int QGIFFormat::decode(QImage *image, const uchar *buffer, int length,
+                     memset(bits, 0, image->byteCount());
+                 }
+ 
++                // Check if the previous attempt to create the image failed. If it
++                // did then the image is broken and we should give up.
++                if (image->isNull()) {
++                    state = Error;
++                    return -1;
++                }
++
+                 disposePrevious(image);
+                 disposed = false;
+ 

graphics/qt5-imageformats/Makefile

@@ -2,6 +2,7 @@
 
 PORTNAME=	imageformats
 DISTVERSION=	${QT5_VERSION}
+PORTREVISION=	1
 CATEGORIES=	graphics
 PKGNAMEPREFIX=	qt5-
 

graphics/xfpovray/Makefile

@@ -13,6 +13,8 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical interface to POV-Ray
 
+BROKEN=		Fails to link
+
 LIB_DEPENDS=	libforms.so:${PORTSDIR}/x11-toolkits/xforms
 RUN_DEPENDS=	povray:${PORTSDIR}/graphics/povray-meta
 

lang/ghc/bsd.cabal.options.mk

@@ -37,7 +37,7 @@ OPTIONS_DEFINE+=	PROFILE
 OPTIONS_DEFINE+=	LLVM
 .endif
 
-.if (!exists(${GHC_CMD}) || (exists(${HADDOCK_CMD}) && exists(${LOCALBASE}/lib/ghc-${GHC_VERSION}/html))) && !defined(NOPORTDOCS)
+.if ((!exists(${GHC_CMD}) || exists(${LOCALBASE}/lib/ghc-${GHC_VERSION}/html)) || exists(${HADDOCK_CMD})) && !defined(NOPORTDOCS)
 OPTIONS_DEFINE+=	DOCS
 OPTIONS_DEFAULT+=	DOCS
 HADDOCK_AVAILABLE=	yes

lang/maude/Makefile

@@ -3,17 +3,22 @@
 
 PORTNAME=	maude
 PORTVERSION=	2.6
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://maude.cs.uiuc.edu/versions/${PORTVERSION}/
 DISTNAME=	Maude-${PORTVERSION}
 
-MAINTAINER=	joemann@beefree.free.de
-COMMENT=	A high-performance reflective language
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	High-performance reflective language
 
-LIB_DEPENDS=	bdd:${PORTSDIR}/science/buddy \
-		tecla:${PORTSDIR}/devel/libtecla \
-		gmp:${PORTSDIR}/math/gmp \
-		sigsegv:${PORTSDIR}/devel/libsigsegv
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
+LIB_DEPENDS=	libbdd.so:${PORTSDIR}/science/buddy \
+		libtecla.so:${PORTSDIR}/devel/libtecla \
+		libgmp.so:${PORTSDIR}/math/gmp \
+		libsigsegv.so:${PORTSDIR}/devel/libsigsegv
 
 USES=		bison
 USE_AUTOTOOLS=	aclocal autoheader automake
@@ -22,16 +27,22 @@ GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--datadir=${DATADIR}
+MAKE_JOBS_UNSAFE=	yes
 
 FULL_MAUDE_VER=	26b
 
-OPTIONS_DEFINE=	FULL_MAUDE
+OPTIONS_DEFINE=	DOCS FULL_MAUDE
 OPTIONS_DEFAULT=	FULL_MAUDE
 FULL_MAUDE_DESC=	Install full-maude${FULL_MAUDE_VER}
 
-NO_STAGE=	yes
+PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README
+
 .include <bsd.port.options.mk>
 
+.if ${OSVERSION} >= 1000000
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-Mixfix-lexerAux
+.endif
+
 .if ${PORT_OPTIONS:MFULL_MAUDE}
 MASTER_SITES+=	http://maude.lcc.uma.es/FullMaude/FM${FULL_MAUDE_VER}/:fm
 FULL_MAUDE=	full-maude${FULL_MAUDE_VER}.maude
@@ -45,8 +56,8 @@ PLIST_SUB+=	FULL_MAUDE_VER="${FULL_MAUDE_VER}"
 PLIST_SUB+=	FULL_MAUDE="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MFULL_MAUDE}
 post-extract:
+.if ${PORT_OPTIONS:MFULL_MAUDE}
 	${UNZIP_CMD} ${DISTDIR}/${FULL_MAUDE_DIST} ${FULL_MAUDE} -d ${WRKDIR}
 .endif
 
@@ -54,9 +65,11 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' \
 		${WRKSRC}/src/Mixfix/global.hh
 
-.if ${PORT_OPTIONS:MFULL_MAUDE}
 post-install:
-	${INSTALL_DATA} ${WRKDIR}/${FULL_MAUDE} ${DATADIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+.if ${PORT_OPTIONS:MFULL_MAUDE}
+	${INSTALL_DATA} ${WRKDIR}/${FULL_MAUDE} ${STAGEDIR}${DATADIR}
 .endif
 
 .include <bsd.port.mk>

lang/maude/files/extra-patch-Mixfix-lexerAux

@@ -0,0 +1,22 @@
+--- ./src/Mixfix/lexerAux.cc.orig	2014-09-03 02:54:57.000000000 +0200
++++ ./src/Mixfix/lexerAux.cc	2014-09-03 02:55:40.000000000 +0200
+@@ -35,7 +35,7 @@
+ bool fakeNewlineStack[MAX_IN_DEPTH];
+ 
+ void
+-getInput(char* buf, int& result, int max_size)
++getInput(char* buf, size_t& result, size_t max_size)
+ {
+   result = YY_NULL;
+   if (UserLevelRewritingContext::interrupted())
+--- ./src/Mixfix/lexerAux.hh.orig	2014-09-03 02:56:33.000000000 +0200
++++ ./src/Mixfix/lexerAux.hh	2014-09-03 02:57:05.000000000 +0200
+@@ -27,7 +27,7 @@
+ //extern int inStackPtr;
+ //extern YY_BUFFER_STATE inStack[];
+ 
+-void getInput(char* buf, int& result, int max_size);
++void getInput(char* buf, size_t& result, size_t max_size);
+ void lexerIdMode();
+ void lexerTokenTreeMode(int terminatingTokens);
+ void lexerCmdMode();

lang/maude/files/patch-src__BuiltIn__stringOpSymbol.cc

@@ -0,0 +1,11 @@
+--- ./src/BuiltIn/stringOpSymbol.cc.orig	2014-09-03 02:36:06.000000000 +0200
++++ ./src/BuiltIn/stringOpSymbol.cc	2014-09-03 02:32:45.000000000 +0200
+@@ -472,7 +472,7 @@
+ 		const mpz_class& n0 = succSymbol->getNat(a0);
+ 		if (n0 <= 255)
+ 		  {
+-		    char c = n0.get_si();
++		    char c[2] = { n0.get_si(), 0 };
+ 		    return rewriteToString(subject, context, crope(c));
+ 		  }
+ 	      }

lang/maude/files/patch-src__Mixfix__bottom.yy

@@ -0,0 +1,11 @@
+--- ./src/Mixfix/bottom.yy.orig	2014-09-03 02:49:14.000000000 +0200
++++ ./src/Mixfix/bottom.yy	2014-09-03 02:50:56.000000000 +0200
+@@ -23,7 +23,7 @@
+ %%
+ 
+ static void
+-yyerror(char *s)
++yyerror(UserLevelRewritingContext::ParseResult *parseResult, char *s)
+ {
+   if (!(UserLevelRewritingContext::interrupted()))
+     IssueWarning(LineNumber(lineNumber) << ": " << s);

lang/maude/files/patch-src__Mixfix__commands.yy

@@ -0,0 +1,17 @@
+--- ./src/Mixfix/commands.yy.orig	2014-09-03 02:51:54.000000000 +0200
++++ ./src/Mixfix/commands.yy	2014-09-03 02:53:05.000000000 +0200
+@@ -23,12 +23,12 @@
+ /*
+  *	Commands.
+  */
+-command		:	KW_SELECT		{ lexBubble(END_COMMAND, 1) }
++command		:	KW_SELECT		{ lexBubble(END_COMMAND, 1); }
+ 			endBubble
+ 			{
+ 			  interpreter.setCurrentModule(lexerBubble);
+ 			}
+-		|	KW_DUMP			{ lexBubble(END_COMMAND, 1) }
++		|	KW_DUMP			{ lexBubble(END_COMMAND, 1); }
+ 			endBubble
+ 			{
+ 			  if (interpreter.setCurrentModule(lexerBubble))

lang/maude/files/patch-src__Mixfix__interact.cc

@@ -0,0 +1,18 @@
+--- ./src/Mixfix/interact.cc.orig	2014-09-03 02:53:35.000000000 +0200
++++ ./src/Mixfix/interact.cc	2014-09-03 02:54:14.000000000 +0200
+@@ -25,13 +25,14 @@
+ //
+ #include <signal.h>
+ 
++#include "surface.h"
++
+ bool UserLevelRewritingContext::interactiveFlag = true;
+ bool UserLevelRewritingContext::ctrlC_Flag = false;
+ bool UserLevelRewritingContext::stepFlag = false;
+ bool UserLevelRewritingContext::abortFlag = false;
+ int UserLevelRewritingContext::debugLevel = 0;
+ 
+-int yyparse(void*);
+ void cleanUpParser();
+ void cleanUpLexer();
+ 

lang/maude/files/patch-src__Mixfix__modules.yy

@@ -0,0 +1,11 @@
+--- ./src/Mixfix/modules.yy.orig	2014-09-03 02:57:44.000000000 +0200
++++ ./src/Mixfix/modules.yy	2014-09-03 02:58:03.000000000 +0200
+@@ -247,7 +247,7 @@
+ 			  //	press on.
+ 			  //
+ 			  opDescription = lexerBubble;
+-			  lexBubble(END_STATEMENT, 1)
++			  lexBubble(END_STATEMENT, 1);
+ 			}
+ 			endBubble
+ 			{

lang/maude/files/patch-src__Mixfix__token.cc

@@ -0,0 +1,11 @@
+--- ./src/Mixfix/token.cc.orig	2014-09-03 02:58:50.000000000 +0200
++++ ./src/Mixfix/token.cc	2014-09-03 02:59:18.000000000 +0200
+@@ -632,7 +632,7 @@
+ 	      }
+ 	  }
+ 	}
+-      result.append(c);
++      result.push_back(c);
+       seenBackslash = false;
+     }
+   CantHappen("bad end to string");

lang/maude/files/patch-src__Mixfix__top.yy

@@ -0,0 +1,25 @@
+--- ./src/Mixfix/top.yy.orig	2014-09-03 03:00:02.000000000 +0200
++++ ./src/Mixfix/top.yy	2014-09-03 03:02:15.000000000 +0200
+@@ -59,7 +59,6 @@
+ #define store(token)		tokenSequence.append(token)
+ #define fragClear()		fragments.contractTo(0);
+ #define fragStore(token)	fragments.append(token)
+-#define YYPARSE_PARAM	parseResult
+ #define PARSE_RESULT	(*((UserLevelRewritingContext::ParseResult*) parseResult))
+ 
+ #define CM		interpreter.getCurrentModule()
+@@ -91,12 +90,13 @@
+ Int64 number;
+ Int64 number2;
+ 
+-static void yyerror(char *s);
++static void yyerror(UserLevelRewritingContext::ParseResult *parseResult, char *s);
+ 
+ void cleanUpModuleExpression();
+ void cleanUpParser();
+ void missingSpace(const Token& token);
+ %}
++%parse-param { UserLevelRewritingContext::ParseResult *parseResult }
+ %pure_parser
+ 
+ %union

lang/maude/files/patch-src__ObjectSystem__configSymbol.hh

@@ -0,0 +1,11 @@
+--- ./src/ObjectSystem/configSymbol.hh.orig	2014-09-03 02:37:37.000000000 +0200
++++ ./src/ObjectSystem/configSymbol.hh	2014-09-03 02:38:05.000000000 +0200
+@@ -50,7 +50,7 @@
+ private:
+   struct symbolLt
+   {
+-    bool operator()(const Symbol* d1, const Symbol* d2)
++    bool operator()(const Symbol* d1, const Symbol* d2) const
+     {
+       return d1->compare(d2) < 0;
+     }

lang/maude/files/patch-src__ObjectSystem__objectMap.cc

@@ -0,0 +1,11 @@
+--- ./src/ObjectSystem/objectMap.cc.orig	2014-09-03 02:39:09.000000000 +0200
++++ ./src/ObjectSystem/objectMap.cc	2014-09-03 02:39:20.000000000 +0200
+@@ -50,7 +50,7 @@
+ 
+ struct ConfigSymbol::dagNodeLt
+ {
+-  bool operator()(const DagNode* d1, const DagNode* d2)
++  bool operator()(const DagNode* d1, const DagNode* d2) const
+     {
+       return d1->compare(d2) < 0;
+     }

lang/maude/files/patch-src__ObjectSystem__objectSystemRewritingContext.hh

@@ -0,0 +1,11 @@
+--- ./src/ObjectSystem/objectSystemRewritingContext.hh.orig	2014-09-03 02:40:31.000000000 +0200
++++ ./src/ObjectSystem/objectSystemRewritingContext.hh	2014-09-03 02:40:48.000000000 +0200
+@@ -62,7 +62,7 @@
+ private:
+   struct dagNodeLt
+   {
+-    bool operator()(const DagNode* d1, const DagNode* d2)
++    bool operator()(const DagNode* d1, const DagNode* d2) const
+     {
+       return d1->compare(d2) < 0;
+     }

lang/maude/files/patch-src__Utility__ropeStuff.hh

@@ -0,0 +1,20 @@
+--- ./src/Utility/ropeStuff.hh.orig	2014-09-03 02:27:15.000000000 +0200
++++ ./src/Utility/ropeStuff.hh	2014-09-03 02:28:58.000000000 +0200
+@@ -25,6 +25,11 @@
+ //
+ #ifndef _ropeStuff_hh_
+ #define _ropeStuff_hh_
++#include <cstddef>
++#ifdef _LIBCPP_VERSION
++#include <string>
++typedef std::string crope;
++#else
+ #ifdef __GNUC__
+   #if __GNUC__ < 3
+     #include <rope.h>
+@@ -50,3 +55,5 @@
+ #include <rope>
+ #endif
+ #endif
++
++#endif

mail/dspam-devel/Makefile

@@ -7,7 +7,7 @@
 
 PORTNAME=	dspam
 PORTVERSION=	${PORTVER_MAJ}${SNAP_DATE}
-PORTREVISION=	2
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	mail
 MASTER_SITES=	# set later
@@ -131,6 +131,7 @@ CONFIGURE_ARGS+=	--with-dspam-home-mode=${DSPAM_HOME_MODE}
 PLIST_SUB+=	DSPAM_HOME=${DSPAM_HOME} \
 		DSPAM_OWNER=${DSPAM_OWNER} \
 		DSPAM_GROUP=${DSPAM_GROUP} \
+		DSPAM_MODE=${DSPAM_MODE} \
 		DSPAM_HOME_OWNER=${DSPAM_HOME_OWNER} \
 		DSPAM_HOME_GROUP=${DSPAM_HOME_GROUP} \
 		DSPAM_HOME_MODE=${DSPAM_HOME_MODE}

mail/dspam-devel/pkg-plist

@@ -2,7 +2,15 @@
 %%HASH%%bin/csscompress
 %%HASH%%bin/cssclean
 %%HASH%%bin/cssconvert
+@owner %%DSPAM_OWNER%%
+@group %%DSPAM_GROUP%%
+@mode %%DSPAM_MODE%%
 bin/dspam
+@exec chown %%DSPAM_OWNER%%:%%DSPAM_GROUP%% %D/%F
+@exec chmod %%DSPAM_MODE%% %D/%F
+@mode
+@group wheel
+@owner root
 bin/dspamc
 bin/dspam_2sql
 bin/dspam_admin
@@ -15,9 +23,15 @@ bin/dspam_notify
 %%PGSQL%%bin/dspam_pg2int8
 bin/dspam_stats
 bin/dspam_train
+@mode 0640
+@owner %%DSPAM_OWNER%%
+@group %%DSPAM_GROUP%%
 @sample etc/dspam.conf.sample
 @exec chown %%DSPAM_OWNER%%:%%DSPAM_GROUP%% %D/%F
 @exec chmod 0640 %D/%F
+@group wheel
+@owner root
+@mode
 include/dspam/buffer.h
 include/dspam/config.h
 include/dspam/config_shared.h
@@ -228,8 +242,14 @@ firstrun.txt.sample
 firstspam.txt.sample
 quarantinefull.txt.sample
 @cwd /
+@owner %%DSPAM_HOME_OWNER%%
+@group %%DSPAM_HOME_GROUP%%
+@mode %%DSPAM_HOME_MODE%%
+@dirrm %%DSPAM_HOME%%
+@mode
 @exec chown %%DSPAM_HOME_OWNER%%:%%DSPAM_HOME_GROUP%% %%DSPAM_HOME%%
 @exec chmod %%DSPAM_HOME_MODE%% %%DSPAM_HOME%%
-@dirrm %%DSPAM_HOME%%
 @exec chown %%DSPAM_HOME_OWNER%%:%%DSPAM_HOME_GROUP%% %%LOG_DIR%%
 @dirrmtry %%LOG_DIR%%
+@group wheel
+@owner root

mail/dspam/Makefile

@@ -519,7 +519,7 @@ post-install:
 		${INSTALL_DATA} admins ${STAGEDIR}${WWWDIR}/admins.sample
 	${MKDIR} ${STAGEDIR}${WWWDIR}/templates && cd ${WRKSRC}/webui/cgi-bin/templates && \
 		${INSTALL_DATA} *.html ${STAGEDIR}${WWWDIR}/templates/ && \
-		${INSTALL_SCRIPT} strings.pl ${STAGEDIR}${WWWDIR}/templates/ &&
+		${INSTALL_SCRIPT} strings.pl ${STAGEDIR}${WWWDIR}/templates/ && \
 		for _dir in de es-es fr he pt-br ro; do \
 			${INSTALL_DATA} -d ${STAGEDIR}${WWWDIR}/templates/$${_dir} && \
 			cd ${WRKSRC}/webui/cgi-bin/templates/$${_dir} && \

mail/postfixadmin/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	postfixadmin
-PORTVERSION=	2.3.6
+PORTVERSION=	2.3.7
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
@@ -17,6 +17,7 @@ WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 NO_BUILD=	yes
 
 SUB_FILES+=	pkg-message
+SUB_LIST=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
 OPTIONS_SINGLE=	DB
 OPTIONS_SINGLE_DB=	MYSQL MYSQLI PGSQL
@@ -24,8 +25,6 @@ MYSQLI_DESC=	MySQL 4.1+ back-end (use mysqli PHP extension)
 
 OPTIONS_DEFAULT=	MYSQL
 
-NO_STAGE=	yes
-
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
@@ -44,6 +43,8 @@ USE_PHP+=	mysqli
 USE_PHP+=	pgsql
 .endif
 
+WANT_PHP_WEB=	yes
+
 post-patch:
 	@${FIND} ${WRKSRC} -name '*.orig' -delete
 
@@ -51,46 +52,35 @@ pre-install:
 	@${RM} -rf ${WRKSRC}/ADDITIONS/squirrelmail-plugin
 
 do-install:
-	@${MKDIR} ${PREFIX}/www/postfixadmin/VIRTUAL_VACATION
-	@${MKDIR} ${PREFIX}/www/postfixadmin/ADDITIONS
-	@${MKDIR} ${PREFIX}/www/postfixadmin/ADDITIONS/cyrus
-	@${MKDIR} ${PREFIX}/www/postfixadmin/css
-	@${MKDIR} ${PREFIX}/www/postfixadmin/admin
-	@${MKDIR} ${PREFIX}/www/postfixadmin/images
-	@${MKDIR} ${PREFIX}/www/postfixadmin/languages
-	@${MKDIR} ${PREFIX}/www/postfixadmin/model
-	@${MKDIR} ${PREFIX}/www/postfixadmin/templates
-	@${MKDIR} ${PREFIX}/www/postfixadmin/users
+	@${MKDIR} ${STAGEDIR}${WWWDIR}/VIRTUAL_VACATION
+	@${MKDIR} ${STAGEDIR}${WWWDIR}/ADDITIONS
+	@${MKDIR} ${STAGEDIR}${WWWDIR}/ADDITIONS/cyrus
+	@${MKDIR} ${STAGEDIR}${WWWDIR}/css
+	@${MKDIR} ${STAGEDIR}${WWWDIR}/admin
+	@${MKDIR} ${STAGEDIR}${WWWDIR}/images
+	@${MKDIR} ${STAGEDIR}${WWWDIR}/languages
+	@${MKDIR} ${STAGEDIR}${WWWDIR}/model
+	@${MKDIR} ${STAGEDIR}${WWWDIR}/templates
+	@${MKDIR} ${STAGEDIR}${WWWDIR}/users
 	(cd ${WRKSRC}/ && \
-	${COPYTREE_SHARE} \*.php ${PREFIX}/www/postfixadmin "! -name config.inc.php")
-	@${CP} ${WRKSRC}/config.inc.php ${PREFIX}/www/postfixadmin/config.inc.php.sample
-	@${CP} -n ${WRKSRC}/config.inc.php ${PREFIX}/www/postfixadmin/config.inc.php || ${TRUE}
-	@${INSTALL_DATA} ${WRKSRC}/*.txt ${PREFIX}/www/postfixadmin
-	@${INSTALL_DATA} ${WRKSRC}/*.TXT ${PREFIX}/www/postfixadmin
-	@${INSTALL_DATA} ${WRKSRC}/css/* ${PREFIX}/www/postfixadmin/css
-	@${INSTALL_DATA} ${WRKSRC}/admin/* ${PREFIX}/www/postfixadmin/admin
-	@${INSTALL_DATA} ${WRKSRC}/images/* ${PREFIX}/www/postfixadmin/images
-	@${INSTALL_DATA} ${WRKSRC}/languages/* ${PREFIX}/www/postfixadmin/languages
-	@${INSTALL_DATA} ${WRKSRC}/model/* ${PREFIX}/www/postfixadmin/model
-	@${INSTALL_DATA} ${WRKSRC}/templates/* ${PREFIX}/www/postfixadmin/templates
-	@${INSTALL_DATA} ${WRKSRC}/users/* ${PREFIX}/www/postfixadmin/users
-	@${CP} -R ${WRKSRC}/VIRTUAL_VACATION/* ${PREFIX}/www/postfixadmin/VIRTUAL_VACATION
+	${COPYTREE_SHARE} \*.php ${STAGEDIR}${WWWDIR} "! -name config.inc.php")
+	@${CP} ${WRKSRC}/config.inc.php ${STAGEDIR}${WWWDIR}/config.inc.php.sample
+	@${INSTALL_DATA} ${WRKSRC}/*.txt ${STAGEDIR}${WWWDIR}
+	@${INSTALL_DATA} ${WRKSRC}/*.TXT ${STAGEDIR}${WWWDIR}
+	@${INSTALL_DATA} ${WRKSRC}/css/* ${STAGEDIR}${WWWDIR}/css
+	@${INSTALL_DATA} ${WRKSRC}/admin/* ${STAGEDIR}${WWWDIR}/admin
+	@${INSTALL_DATA} ${WRKSRC}/images/* ${STAGEDIR}${WWWDIR}/images
+	@${INSTALL_DATA} ${WRKSRC}/languages/* ${STAGEDIR}${WWWDIR}/languages
+	@${INSTALL_DATA} ${WRKSRC}/model/* ${STAGEDIR}${WWWDIR}/model
+	@${INSTALL_DATA} ${WRKSRC}/templates/* ${STAGEDIR}${WWWDIR}/templates
+	@${INSTALL_DATA} ${WRKSRC}/users/* ${STAGEDIR}${WWWDIR}/users
+	@${CP} -R ${WRKSRC}/VIRTUAL_VACATION/* ${STAGEDIR}${WWWDIR}/VIRTUAL_VACATION
 	(cd ${WRKSRC}/ADDITIONS/ && \
-	${COPYTREE_SHARE} \* ${PREFIX}/www/postfixadmin/ADDITIONS/ "! -name squirrelmail-plugin")
+	${COPYTREE_SHARE} \* ${STAGEDIR}${WWWDIR}/ADDITIONS/ "! -name squirrelmail-plugin")
 
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	(cd ${WRKSRC}/DOCUMENTS && ${COPYTREE_SHARE} \* ${DOCSDIR})
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/DOCUMENTS && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR})
 .endif
 
-post-install:
-	@if [ ! -f ${PREFIX}/www/postfixadmin/config.inc.php ]; then \
-		${CP} -p ${PREFIX}/www/postfixadmin/config.inc.php.sample ${PREFIX}/www/postfixadmin/config.inc.php ; \
-	fi
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/www/postfixadmin
-	@${CHMOD} 640 ${PREFIX}/www/postfixadmin/*.php ${PREFIX}/www/postfixadmin/css/*.css
-	@${CHMOD} 640 ${PREFIX}/www/postfixadmin/admin/*.php
-	@${CHMOD} 640 ${PREFIX}/www/postfixadmin/users/*.php
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.mk>

mail/postfixadmin/distinfo

@@ -1,2 +1,2 @@
-SHA256 (postfixadmin-2.3.6.tar.gz) = ea505281b6c04bda887eb4e6aa6c023b354c4ef4864aa60dcb1425942bf2af63
-SIZE (postfixadmin-2.3.6.tar.gz) = 1597001
+SHA256 (postfixadmin-2.3.7.tar.gz) = 761074e711ab618deda425dc013133b9d5968e0859bb883f10164061fd87006e
+SIZE (postfixadmin-2.3.7.tar.gz) = 1600662

mail/postfixadmin/files/pkg-message.in

@@ -9,7 +9,7 @@ REQUIRED!!
 ----------
 - You are using Postfix 2.0 or higher.
 - You are using Apache 1.3.27 / Lighttpd 1.3.15 or higher.
-- You are using PHP 4.1 or higher (5.X recommended)
+- You are using PHP 5.1.2 or higher.
 - You are using MySQL 3.23 or higher (5.x recommended) OR PostgreSQL 7.4 (or higher)
 
 INSTALL / UPGRADE

mail/postfixadmin/pkg-descr

@@ -2,7 +2,7 @@ Postfix Admin is a web-based management tool written in PHP for
 Postfix with Postfix-style Virtual Domains using MySQL or
 PostgreSQL lookups.  Postfix Admin is known to work on Apache
 and Lighttpd, but is designed to work on any web server with
-PHP 4.1+ support.
+PHP 5.1.2+ support.
 
 Postfix Admin features:
 
@@ -13,4 +13,4 @@ Postfix Admin features:
 - Backup MX;
 - Packaged with over 25 languages.
 
-WWW:	http://www.postfixadmin.org
+WWW: http://www.postfixadmin.org

mail/procmail/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	procmail
 PORTVERSION=	3.22
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.ucsb.edu/pub/mirrors/procmail/ \
 		ftp://ftp.informatik.rwth-aachen.de/pub/packages/procmail/ \

mail/procmail/files/patch-src-formisc.c

@@ -0,0 +1,16 @@
+--- src/formisc.c.orig	2001-06-29 10:20:45.000000000 +0800
++++ src/formisc.c	2014-09-12 00:58:12.989105253 +0800
+@@ -84,12 +84,11 @@
+ 	case '"':*target++=delim='"';start++;
+       }
+      ;{ int i;
+-	do
++	while(*start)
+ 	   if((i= *target++= *start++)==delim)	 /* corresponding delimiter? */
+ 	      break;
+ 	   else if(i=='\\'&&*start)		    /* skip quoted character */
+ 	      *target++= *start++;
+-	while(*start);						/* anything? */
+       }
+      hitspc=2;
+    }

mail/qmail-spamcontrol/Makefile

@@ -2,7 +2,7 @@
 
 PORTNAME=	qmail
 PORTVERSION=	${QMAIL_VERSION}.${SPAMCONTROL_VERSION}
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES+=	http://www.fehcom.de/qmail/spamcontrol/:spamcontrol \
 		${MASTER_SITE_LOCAL:S/$/:spamcontrol/}

mail/qmail/Makefile

@@ -176,8 +176,8 @@ PATCHFILES+=	${TLS_PATCH_NAME}:tls
 .endif
 
 PATCH_SITES+=	${MASTER_SITE_LOCAL:S/$/:dns,sendmail_flagf,rfc2821,ldap,mysql,tls,quota,blockexec,doublebounce,spf,spf_tls,localtime,qmtpc_outgoingip/}
-PATCH_SITE_SUBDIR+=	bdrewery/qmail/:dns,sendmail_flagf,rfc2821,ldap,mysql,quota,blockexec,doublebounce,spf,spf_tls,localtime,qmtpc_outgoingip
-PATCH_SITE_SUBDIR+=	bdrewery/qmail/:tls
+PATCH_SITE_SUBDIR+=	bdrewery/qmail/:dns,sendmail_flagf,rfc2821,ldap,mysql,tls,quota,blockexec,doublebounce,spf,spf_tls,localtime,qmtpc_outgoingip
+PATCH_SITES+=	http://mirror.shatow.net/freebsd/qmail/:DEFAULT,dns,sendmail_flagf,rfc2821,ldap,mysql,tls,quota,blockexec,doublebounce,spf,spf_tls,localtime,qmtpc_outgoingip
 
 .if !defined(BARRIER_SMTP_AUTH_PATCH)
 SMTP_AUTH_VERSION=	0.31
@@ -472,10 +472,10 @@ PATCHFILES+=	qmail-discard-double-bounces.patch:doublebounce
 .if ${PORT_OPTIONS:MSPF_PATCH}
 . if defined(SLAVE_TLS) || defined(SLAVE_SPAMCONTROL)
 .  if defined(SLAVE_SPAMCONTROL)
-SPF_SPAMCONTROL_PATCH=	qmail-spf-rc5.patch-spamcontrol-27
-MASTER_SITES+=		${MASTER_SITE_LOCAL:S/$/:spf_spamcontrol/}
-MASTER_SITE_SUBDIR+=	garga/qmail/:spf_spamcontrol
-DISTFILES+=		${SPF_SPAMCONTROL_PATCH}:spf_spamcontrol
+SPF_SPAMCONTROL_PATCH=	qmail-spf-rc5.patch-spamcontrol-27_2
+PATCH_SITES+=		${MASTER_SITE_LOCAL:S/$/:spf_spamcontrol/}
+PATCH_SITE_SUBDIR+=	garga/qmail/:spf_spamcontrol
+PATCHFILES+=		${SPF_SPAMCONTROL_PATCH}:spf_spamcontrol
 .  else
 # XXX - Move change out of conflicting Makefile hunk
 .    if ${PORT_OPTIONS:MSMTP_AUTH_PATCH}
@@ -506,13 +506,9 @@ DISTFILES+=	${EXT_BIG_TODO_PATCH}:ext_big_todo
 . endif
 
 . if ${PORT_OPTIONS:MSPF_PATCH}
-.  if defined(SLAVE_TLS) || defined(SLAVE_SPAMCONTROL)
-.    if defined(SLAVE_SPAMCONTROL)
-EXTTODO_PATCH=	ext_todo-20030105_spf.patch
-.    else
+.  if defined(SLAVE_TLS)
 # XXX - Move qmail-todo out of conflicting Makefile hunk
 EXTTODO_PATCH=	ext_todo-20030105_spf_tls.patch
-.    endif
 MASTER_SITES+=	${MASTER_SITE_LOCAL:S/$/:exttodo/}
 MASTER_SITE_SUBDIR+=	garga/qmail/:exttodo
 DISTFILES+=	${EXTTODO_PATCH}:exttodo
@@ -557,7 +553,11 @@ PATCHFILES+=	qmailqueue-patch
 PATCHFILES+=	big-todo.103.patch
 .endif
 .if ${PORT_OPTIONS:MBIG_CONCURRENCY_PATCH}
+.  if defined(SLAVE_SPAMCONTROL)
+PATCHFILES+=	big-concurrency-spamcontrol-2731.patch
+.  else
 PATCHFILES+=	big-concurrency.patch
+.  endif
 .endif
 .if !empty(PORT_OPTIONS:MOUTGOINGIP_PATCH) && !empty(PORT_OPTIONS:MQMTPC_PATCH)
 PATCHFILES+=	qmail-1.03-qmtpc_outgoingip_20090630.patch:qmtpc_outgoingip
@@ -684,6 +684,40 @@ post-extract:
 .endif
 
 # XXX - Move all the major patch applications to post-extract
+#
+# Apply main distro patch (which requires building a dependency and
+# running a script) before PATCHFILES get applied.
+.if defined(SLAVE_SPAMCONTROL)
+pre-patch:
+.  if ${OSVERSION} < 900007
+# Prevent applying utmpx patch
+	@${ECHO_CMD} > ${WRKSRC}/qbiff.c.patch
+.  endif
+	@${ECHO_CMD} ${WRKDIR} > ${WRKSRC}/conf-qmail
+	@${ECHO_CMD} "# Generated by qmail-spamcontrol FreeBSD port" \
+		> ${WRKSRC}/conf-spamcontrol
+. for option in ${SELECTED_OPTIONS}
+	@${ECHO_CMD} ${option} >> ${WRKSRC}/conf-spamcontrol
+. endfor
+	@${ECHO_CMD} "${UCSPISRC}/compile" > ${WRKSRC}/conf-ucspissl
+	${ECHO_CMD} "${CC} ${CFLAGS}" > ${UCSPISRC}/src/conf-cc
+	${ECHO_CMD} "${CC} ${STRIP} ${LDFLAGS}" > ${UCSPISRC}/src/conf-ld
+	${ECHO_CMD} "${PREFIX}" > ${UCSPISRC}/src/conf-home
+	${ECHO_CMD} "${PREFIX}/bin" > ${UCSPISRC}/src/conf-tcpbin
+	${ECHO_CMD} "/etc/ssl" > ${UCSPISRC}/src/conf-cadir
+	${ECHO_CMD} "/etc/ssl/cert.pem" > ${UCSPISRC}/src/conf-cafile
+	${ECHO_CMD} "/etc/ssl/dh1024.pem" > ${UCSPISRC}/src/conf-dhfile
+	@cd ${UCSPISRC} && ${SETENV} ${MAKE_ENV} package/compile
+	@cd ${WRKSRC} && ${SH} ./install_spamcontrol.sh
+# Any rejected patches are a failure
+	@if [ "`find ${WRKSRC} -name '*.rej' | wc -l`" -ne 0 ]; then \
+		${ECHO_MSG} "===> Failed to apply spamcontrol patch"; \
+		${FALSE}; \
+	fi
+# Fix trailing whitespace which breaks some patches
+	${SED} -i '' -e 's,^\(binm3 binm3+df\) $$,\1,' ${WRKSRC}/Makefile
+.endif
+
 post-patch:
 .if ${PORT_OPTIONS:MSMTP_AUTH_PATCH}
 	@${CP} ${SMTP_AUTH_DIR}/base64.[ch] ${WRKSRC}
@@ -710,33 +744,6 @@ post-patch:
 	  -e "s,MYSQL_LIBS=.*,MYSQL_LIBS=\`${LOCALBASE}/bin/mysql_config --libs\`," \
 		${WRKSRC}/Makefile
 .elif defined(SLAVE_SPAMCONTROL)
-.  if ${OSVERSION} < 900007
-# Prevent applying utmpx patch
-	@${ECHO_CMD} > ${WRKSRC}/qbiff.c.patch
-.  endif
-	@${ECHO_CMD} ${WRKDIR} > ${WRKSRC}/conf-qmail
-	@${ECHO_CMD} "# Generated by qmail-spamcontrol FreeBSD port" \
-		> ${WRKSRC}/conf-spamcontrol
-. for option in ${SELECTED_OPTIONS}
-	@${ECHO_CMD} ${option} >> ${WRKSRC}/conf-spamcontrol
-. endfor
-	@${ECHO_CMD} "${UCSPISRC}/compile" > ${WRKSRC}/conf-ucspissl
-	${ECHO_CMD} "${CC} ${CFLAGS}" > ${UCSPISRC}/src/conf-cc
-	${ECHO_CMD} "${CC} ${STRIP} ${LDFLAGS}" > ${UCSPISRC}/src/conf-ld
-	${ECHO_CMD} "${PREFIX}" > ${UCSPISRC}/src/conf-home
-	${ECHO_CMD} "${PREFIX}/bin" > ${UCSPISRC}/src/conf-tcpbin
-	${ECHO_CMD} "/etc/ssl" > ${UCSPISRC}/src/conf-cadir
-	${ECHO_CMD} "/etc/ssl/cert.pem" > ${UCSPISRC}/src/conf-cafile
-	${ECHO_CMD} "/etc/ssl/dh1024.pem" > ${UCSPISRC}/src/conf-dhfile
-	@cd ${UCSPISRC} && ${SETENV} ${MAKE_ENV} package/compile
-	@cd ${WRKSRC} && ./install_spamcontrol.sh
-	@${PATCH} -d ${WRKSRC} < ${FILESDIR}/extra-patch-spamcontrol-qmail-smtpd.c
-. if ${PORT_OPTIONS:MSPF_PATCH} && defined(SPF_SPAMCONTROL_PATCH)
-	@${PATCH} -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/${SPF_SPAMCONTROL_PATCH}
-.  if ${PORT_OPTIONS:MEXTTODO_PATCH} && defined(EXTTODO_PATCH)
-	@${PATCH} -p1 -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/${EXTTODO_PATCH}
-.  endif
-. endif
 . if ${PORT_OPTIONS:MSMTPEXTFORK}
 	@${PATCH} -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/${SMTPEXTFORK_PATCH}
 .  if ${PORT_OPTIONS:MXF_QUITASAP}

mail/qmail/distinfo

@@ -10,6 +10,8 @@ SHA256 (qmail/big-todo.103.patch) = afa0a249e3271badd442f0bdae39997d9fe536157d8a
 SIZE (qmail/big-todo.103.patch) = 5546
 SHA256 (qmail/big-concurrency.patch) = 0322991955878e86af495f7317c3a4bd2e60640f9a6dd70ad501fff27242ac2f
 SIZE (qmail/big-concurrency.patch) = 9331
+SHA256 (qmail/big-concurrency-spamcontrol-2731.patch) = 0a9e11a784b1e9b47093aea2c67aef4f8b06d4da5624d5284c978fca0d2c5735
+SIZE (qmail/big-concurrency-spamcontrol-2731.patch) = 9362
 SHA256 (qmail/sendmail-flagf.patch) = 9b3951c22b98c0e5a6ebfa793f052d91dfe01d68a0ad8dc83b8e0bd60c01802e
 SIZE (qmail/sendmail-flagf.patch) = 863
 SHA256 (qmail/patch-qmail-1.03-rfc2821.diff) = c34b331e27882f0596529df14f0e9f24c4dff9f941d04e5df17cc158dddac426
@@ -62,8 +64,8 @@ SHA256 (qmail/ext_todo-20030105_mysql.patch) = 3fc65b91faaaae147dbf6264f93816648
 SIZE (qmail/ext_todo-20030105_mysql.patch) = 33797
 SHA256 (qmail/ext_todo-20030105_tls.patch) = 0924d3d1287200cb4efc1c3ebfa139f715d3a9d75a6d8af17520c5262a192da2
 SIZE (qmail/ext_todo-20030105_tls.patch) = 33795
-SHA256 (qmail/qmail-spf-rc5.patch-spamcontrol-27) = 71e1d204a2f388fa2d0d9902a4289a46988f45119f91eed2ba4733b9e81dd932
-SIZE (qmail/qmail-spf-rc5.patch-spamcontrol-27) = 64059
+SHA256 (qmail/qmail-spf-rc5.patch-spamcontrol-27_2) = bd53c0ce09ce68e9638abcab7f36a1e259ffb41737e27f6b8d9e0315f2d09524
+SIZE (qmail/qmail-spf-rc5.patch-spamcontrol-27_2) = 64058
 SHA256 (qmail/auth.patch.diff) = 1d0f8e0ce139cd00b86f056bc31c1422d30b88cb8b125023d534cc3664f827b8
 SIZE (qmail/auth.patch.diff) = 4412
 SHA256 (qmail/auth.patch.diff-tls-20110119) = 838a35ea92990775fa96567366249f70e7edbfdf127bebbc23b3df58eb086921

mail/rubygem-actionmailer/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	actionmailer
-PORTVERSION=	3.2.17
+PORTVERSION=	3.2.19
 CATEGORIES=	mail rubygems
 MASTER_SITES=	RG
 

mail/rubygem-actionmailer/distinfo

@@ -1,2 +1,2 @@
-SHA256 (rubygem/actionmailer-3.2.17.gem) = 1bf5ab19bc9fe2f83bd77bab7442d1e9ad62434e0db990161ad256eb6bf5f1a4
-SIZE (rubygem/actionmailer-3.2.17.gem) = 21504
+SHA256 (rubygem/actionmailer-3.2.19.gem) = cd9f0b22f755b0adeae13cf949adaf63fa1c068c72d0a100572c6a11aecd3ba7
+SIZE (rubygem/actionmailer-3.2.19.gem) = 21504

math/scilab/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	scilab
 PORTVERSION=	5.3.3
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	math cad parallel java
 MASTER_SITES=	http://www.scilab.org/download/${PORTVERSION}/:scilab \
 		http://www.predatorlabs.net/dl/:jgraphx \
@@ -31,8 +31,8 @@ CONFIGURE_ARGS=	--with-gfortran \
 		--without-hdf5
 CONFIGURE_ENV=	ac_cv_search_pthread_join="${PTHREAD_LIBS}" \
 	BLAS_LIBS="${BLAS_LIBS}" LAPACK_LIBS="${LAPACK_LIBS}"
-# prevert from creating $HOME/.Scilab during build
-MAKE_ENV=	HOME=/dev/null
+MAKE_ENV=	LANG=en_US.UTF-8 \
+		LC_ALL=en_US.UTF-8
 
 OPTIONS_DEFINE=	ATLAS FFTW GUI HELP NLS MATIO OCAML PVM TK UMFPACK
 OPTIONS_DEFAULT=	FFTW GUI HELP
@@ -217,6 +217,7 @@ post-patch:
 	@# Run fixes
 	@${REINPLACE_CMD} -e 's|%%JAVALIBDIR%%|${JAVALIBDIR}|' ${WRKSRC}/etc/librarypath.xml
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/etc/librarypath.xml
+	@${REINPLACE_CMD} -e 's, gfortran, ${FC},' ${WRKSRC}/modules/dynamic_link/src/scripts/configure
 .if ${PORT_OPTIONS:MGUI}
 	@# Configure fixes
 	@${REINPLACE_CMD} -e 's|/usr/lib/java|${JAVALIBDIR}|g' ${WRKSRC}/configure

math/scilab/files/patch-configure

@@ -1,5 +1,23 @@
 --- ./configure.orig	2011-07-20 08:15:42.000000000 +0000
 +++ ./configure	2013-10-23 11:59:48.722499060 +0000
+@@ -10719,7 +10719,7 @@
+                 ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -ljvm"
+                 D=$ac_java_jvm_dir/jre/lib/$machine/native_threads
+                 ac_java_jvm_jni_lib_runtime_path="${ac_java_jvm_jni_lib_runtime_path}:$D"
+-                ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -lhpi"
++                ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -ljvm"
+             fi
+         fi
+ 
+@@ -10850,7 +10850,7 @@
+                 ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -ljvm"
+                 D=$ac_java_jvm_dir/jre/lib/mipsel/native_threads
+                 ac_java_jvm_jni_lib_runtime_path="${ac_java_jvm_jni_lib_runtime_path}:$D"
+-                ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -lhpi"
++                ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -ljvm"
+             fi
+         fi
+ 
 @@ -12226,14 +12226,15 @@
  
  public class conftest {

misc/Makefile

@@ -448,6 +448,7 @@
     SUBDIR += unclutter
     SUBDIR += upclient
     SUBDIR += us-zipcodes
+    SUBDIR += usbids
     SUBDIR += usbrh-libusb
     SUBDIR += utftools
     SUBDIR += valspeak

multimedia/gstreamer-plugins-good/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 #    $MCom: ports/multimedia/gstreamer-plugins-good/Makefile,v 1.14 2008/03/19 14:05:36 ahze Exp $
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 
 COMMENT=	Good gstreamer-plugins
@@ -15,6 +15,8 @@ MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
 BUILD_DEPENDS+=	gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins
 RUN_DEPENDS+=	gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins
 
+USE_XORG+=	xdamage
+
 gst_good_DIST=	good
 GOOD_GST_DIRS=	gst sys po
 PLIST_SUB=	VERSION="${GST_VERSION}"

multimedia/libva/Makefile

@@ -2,6 +2,7 @@
 
 PORTNAME=	libva
 PORTVERSION=	1.3.1
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://cgit.freedesktop.org/${PORTNAME}/snapshot/
 
@@ -40,11 +41,6 @@ CFLAGS+=	-DNDEBUG
 
 .include <bsd.port.pre.mk>
 
-# add strnlen(3) from head/lib/libc/string/strnlen.c
-.if ${OSVERSION} < 800067
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-va-va_trace.c
-.endif
-
 .if ${ARCH} == "sparc64"
 BROKEN=		glXCreateContext fails during configure
 .endif

multimedia/libva/files/extra-patch-va-va_trace.c

@@ -1,21 +0,0 @@
---- va/va_trace.c.orig	2012-10-04 15:30:51.000000000 +0200
-+++ va/va_trace.c	2012-10-09 23:12:35.888197737 +0200
-@@ -137,6 +137,18 @@
-                          VASurfaceID surface
-                          );
- 
-+static size_t
-+strnlen(const char *s, size_t maxlen)
-+{
-+	size_t len;
-+
-+	for (len = 0; len < maxlen; len++, s++) {
-+		if (!*s)
-+			break;
-+	}
-+	return (len);
-+}
-+
- #define FILE_NAME_SUFFIX(env_value)                      \
- do {                                                    \
-     int tmp = strnlen(env_value, sizeof(env_value));    \

multimedia/libva/files/patch-va-va.c

@@ -1,6 +1,6 @@
---- va/va.c~
-+++ va/va.c
-@@ -199,7 +199,7 @@ static VAStatus va_openDriver(VADisplay 
+--- ./va/va.c.orig	2014-05-09 12:38:02.000000000 +0800
++++ ./va/va.c	2014-07-17 19:11:43.977174636 +0800
+@@ -227,7 +227,7 @@
          strncat( driver_path, DRIVER_EXTENSION, strlen(DRIVER_EXTENSION) );
          
          va_infoMessage("Trying to open %s\n", driver_path);
@@ -9,3 +9,22 @@
          handle = dlopen( driver_path, RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE );
  #else
          handle = dlopen( driver_path, RTLD_NOW| RTLD_GLOBAL);
+@@ -515,15 +515,15 @@
+   free(old_ctx->vtable_vpp);
+   old_ctx->vtable_vpp = NULL;
+ 
+-  if (VA_STATUS_SUCCESS == vaStatus)
+-      pDisplayContext->vaDestroy(pDisplayContext);
+-
+   VA_TRACE_LOG(va_TraceTerminate, dpy);
+ 
+   va_TraceEnd(dpy);
+ 
+   va_FoolEnd(dpy);
+ 
++  if (VA_STATUS_SUCCESS == vaStatus)
++      pDisplayContext->vaDestroy(pDisplayContext);
++
+   return vaStatus;
+ }
+ 

multimedia/mlt/files/patch-gite50606c

@@ -0,0 +1,27 @@
+commit e50606ca3f680029b7f16bbbf284adac34f30ded
+Author: Dan Dennedy <dan@dennedy.org>
+Date:   Mon Jun 2 19:18:50 2014 -0700
+
+    Fix compilation with clang.
+
+diff --git a/configure b/configure
+index eb20880..e540704 100755
+--- configure
++++ configure
+@@ -81,10 +81,12 @@ build_config()
+ 		if [ "$optimisations" = "true" ]
+ 		then
+ 			echo "OPTIMISATIONS=-O2 -pipe"
+-			# Since gcc 4.6, this optimization enabled with -O1 causes filter_line_sse2 to crash.
+-			echo "OPTIMISATIONS+=-fno-tree-dominator-opts"
+-			# Since gcc 4.6, this optimization enabled with -O2 causes filter_line_sse2 to crash.
+-			echo "OPTIMISATIONS+=-fno-tree-pre"
++			if $("$CC" --version 2> /dev/null | grep gcc); then
++				# Since gcc 4.6, this optimization enabled with -O1 causes filter_line_sse2 to crash.
++				echo "OPTIMISATIONS+=-fno-tree-dominator-opts"
++				# Since gcc 4.6, this optimization enabled with -O2 causes filter_line_sse2 to crash.
++				echo "OPTIMISATIONS+=-fno-tree-pre"
++			fi
+ 		fi
+ 
+ 		echo "CFLAGS+=-Wall -DPIC \$(TARGETARCH) \$(TARGETCPU) \$(OPTIMISATIONS) \$(MMX_FLAGS) \$(SSE_FLAGS) \$(SSE2_FLAGS) \$(DEBUG_FLAGS) \$(LARGE_FILE)"

net-im/psi/Makefile

@@ -3,13 +3,15 @@
 
 PORTNAME=	psi
 PORTVERSION=	0.15
+PORTREVISION=	2
 CATEGORIES=	net-im
 MASTER_SITES=	SF/${PORTNAME}/Psi/${PORTVERSION}
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Qt 4 based Jabber client
 
-LIB_DEPENDS=	libqca.so:${PORTSDIR}/devel/qca
+LIB_DEPENDS=	libqca.so:${PORTSDIR}/devel/qca \
+		libminizip.so:${PORTSDIR}/archivers/minizip
 RUN_DEPENDS=	qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl \
 		qca-gnupg>=2.0.0.b3:${PORTSDIR}/security/qca-gnupg
 
@@ -27,41 +29,29 @@ DESTDIRNAME=	INSTALL_ROOT
 
 OPTIONS_DEFINE=	ASPELL ENCHANT DBUS DEBUG
 OPTIONS_DEFAULT=	ASPELL DBUS
+OPTIONS_SUB=	yes # DEBUG
+
+DEBUG_CONFIGURE_ON=	--debug
+DEBUG_CONFIGURE_OFF=	--release  --no-separate-debug-info
+
+DBUS_USE=	QT4=dbus
+DBUS_CONFIGURE_OFF=	--disable-qdbus
 
 ASPELL_DESC=	Use aspell for spell checking
-ENCHANT_DESC=	Use Enchant for spell checking
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+=	--debug
-PLIST_SUB+=	DEBUG=""
-.else
-CONFIGURE_ARGS+=	--release  --no-separate-debug-info
-PLIST_SUB+=	DEBUG="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MDBUS}
-USE_QT4+=	dbus
-.else
-CONFIGURE_ARGS+=	--disable-qdbus
-.endif
-
-.if ${PORT_OPTIONS:MASPELL}
-LIB_DEPENDS+=	libaspell.so:${PORTSDIR}/textproc/aspell
-CONFIGURE_ARGS+=	--with-aspell-inc=${LOCALBASE}/include \
+ASPELL_LIB_DEPENDS=	libaspell.so:${PORTSDIR}/textproc/aspell
+ASPELL_CONFIGURE_ON=	--with-aspell-inc=${LOCALBASE}/include \
 			--with-aspell-lib=${LOCALBASE}/lib
-.else
-CONFIGURE_ARGS+=	--disable-aspell
-.endif
+ASPELL_CONFIGURE_OFF=	--disable-aspell
 
-.if ${PORT_OPTIONS:MENCHANT}
-LIB_DEPENDS+=	libenchant.so:${PORTSDIR}/textproc/enchant
-.else
-CONFIGURE_ARGS+=	--disable-enchant
-.endif
+ENCHANT_DESC=	Use Enchant for spell checking
+ENCHANT_LIB_DEPENDS=	libenchant.so:${PORTSDIR}/textproc/enchant
+ENCHANT_CONFIGURE_OFF=	--disable-enchant
 
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/psi
+post-configure:
+# Reorder paths to always include internal socks.h (PR: 192270)
+	${REINPLACE_CMD} -e '/^INCPATH/s,-I\.,-I\. -Icutestuff,' \
+		${WRKSRC}/iris/src/irisnet/noncore/Makefile
+	${REINPLACE_CMD} -e '/^INCPATH/s,-I\.,-I\. -I../irisnet/noncore/cutestuff,' \
+		${WRKSRC}/iris/src/xmpp/Makefile
 
 .include <bsd.port.mk>

net-mgmt/collectd5/Makefile

@@ -204,6 +204,7 @@ CONFIGURE_ARGS+=--disable-debug
 LIB_DEPENDS+=	libdbi.so:${PORTSDIR}/databases/libdbi
 CONFIGURE_ARGS+=--with-libdbi=${LOCALBASE} --enable-dbi
 PLIST_SUB+=	DBI=""
+CFLAGS+=	-Wno-deprecated-declarations
 .else
 CONFIGURE_ARGS+=--without-libdbi --disable-dbi
 PLIST_SUB+=	DBI="@comment "

net-mgmt/isic/Makefile

@@ -19,16 +19,10 @@ USES=		tar:tgz
 
 LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet11-config
 
-.include <bsd.port.pre.mk>
-
 post-patch:
-.if ${OSVERSION} > 900000
-	@${REINPLACE_CMD} -e 's|2147483647|2147483645|' \
-		${WRKSRC}/isic.h
-.endif
 	@${REINPLACE_CMD} -e 's|-lnet|`${LIBNET_CONFIG} --libs`|' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -e 's|libnet-config|${LIBNET_CONFIG}|' \
 		${WRKSRC}/Makefile.in
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

net-mgmt/isic/files/patch-isic.h

@@ -1,5 +1,5 @@
 --- isic.h.orig	2006-12-16 01:08:44.000000000 +0100
-+++ isic.h	2013-02-18 07:36:38.000000000 +0100
++++ isic.h	2014-08-11 16:25:34.551003726 +0200
 @@ -5,11 +5,15 @@
  #endif
  
@@ -16,3 +16,15 @@
  
  #ifndef ETHER_FRAME_SIZE
  #define ETHER_FRAME_SIZE 1500
+@@ -21,11 +25,6 @@
+ #define IP6_FRAGH 8
+ #define ICMP6_H   8
+ 
+-/* We want a random function that returns 0 to 0x7fff */
+-#if ( RAND_MAX != 2147483647 )  /* expect signed long */
+-#error Random IP generation broken: unexpected RAND_MAX.
+-#endif
+-
+ #define RAND8  ((u_int8_t)(rand() & 0xff))
+ #define RAND16 ((u_int16_t)(rand() & 0xffff))
+ #define RAND32 ((u_int32_t)((RAND16 << 16) + RAND16))

net-mgmt/nrpe/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	nrpe
 DISTVERSION=	2.15
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/nagios/${PORTNAME}-2.x/${PORTNAME}-${PORTVERSION}
 

net-mgmt/nrpe/files/patch-src-nrpe.c

@@ -1,6 +1,15 @@
---- src/nrpe.c.orig	2013-07-10 21:18:24.000000000 +0000
-+++ src/nrpe.c	2013-07-10 21:20:25.000000000 +0000
-@@ -89,7 +89,9 @@
+--- ./src/nrpe.c.orig	2013-09-06 17:27:13.000000000 +0200
++++ ./src/nrpe.c	2013-10-05 17:15:33.000000000 +0200
+@@ -30,6 +30,8 @@
+ #include "utils.h"
+ #include "acl.h"
+ 
++#include <poll.h>
++
+ #ifdef HAVE_SSL
+ #include "../include/dh.h"
+ #endif
+@@ -100,7 +102,9 @@
  int     use_src=FALSE; /* Define parameter for SRC option */
  
  
@@ -10,7 +19,38 @@
  
  
  int main(int argc, char **argv){
-@@ -1673,6 +1675,7 @@
+@@ -969,8 +973,14 @@
+ 					continue;
+ 
+ 				/* socket is nonblocking and we don't have a connection yet */
+-				if(errno==EAGAIN)
++				if(errno==EAGAIN) {
++					struct pollfd pfd;
++
++					pfd.fd = sock;
++					pfd.events = POLLIN;
++					poll(&pfd,1,-1);
+ 					continue;
++					}
+ 
+ 				/* fix for HP-UX 11.0 - just retry */
+ 				if(errno==ENOBUFS)
+@@ -1207,9 +1217,13 @@
+ 	if(result==STATE_OK && use_ssl==TRUE){
+ 		if((ssl=SSL_new(ctx))!=NULL){
+ 			SSL_set_fd(ssl,sock);
++			int n = 0;
+ 
+ 			/* keep attempting the request if needed */
+-                        while(((rc=SSL_accept(ssl))!=1) && (SSL_get_error(ssl,rc)==SSL_ERROR_WANT_READ));
++                        while( ((rc=SSL_accept(ssl))!=1) && (SSL_get_error(ssl,rc)==SSL_ERROR_WANT_READ) && n <= 600){
++				usleep(100000);
++				n++;
++			}
+ 
+ 			if(rc!=1){
+ 				syslog(LOG_ERR,"Error: Could not complete SSL handshake. %d\n",SSL_get_error(ssl,rc));
+@@ -1796,6 +1810,7 @@
  	return OK;
          }
  
@@ -18,7 +58,7 @@
  void complete_SSL_shutdown( SSL *ssl) {
  
  	/*  
-@@ -1693,6 +1696,7 @@
+@@ -1816,6 +1831,7 @@
  		if( SSL_shutdown( ssl)) break;
  	}
  }

net/krfb/Makefile

@@ -2,6 +2,7 @@
 
 PORTNAME=	krfb
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	4
 CATEGORIES=	net kde
 MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}