Index: branches/2015Q3/audio/mixer.app/Makefile
===================================================================
--- branches/2015Q3/audio/mixer.app/Makefile	(revision 395784)
+++ branches/2015Q3/audio/mixer.app/Makefile	(revision 395785)
@@ -1,25 +1,25 @@
 # Created by: Chris Piazza <cpiazza@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	mixer.app
 PORTVERSION=	1.8.0
 PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	DEBIAN_POOL
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	mbeis@xs4all.nl
 COMMENT=	Another mixer intended for the windowmaker dockapp
 
 PLIST_FILES=	bin/Mixer.app
 WRKSRC=		${WRKDIR}/Mixer.app-${PORTVERSION}
 CXXFLAGS+=	-fno-rtti -fno-exceptions -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lXpm -lXext -lX11
 MAKE_ARGS=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
 
 USE_XORG=	xpm xext x11
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/Mixer.app ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
Index: branches/2015Q3/sysutils/wmdiskmon/Makefile
===================================================================
--- branches/2015Q3/sysutils/wmdiskmon/Makefile	(revision 395784)
+++ branches/2015Q3/sysutils/wmdiskmon/Makefile	(revision 395785)
@@ -1,22 +1,22 @@
 # Created by: pat
 # $FreeBSD$
 
 PORTNAME=	wmdiskmon
 PORTVERSION=	0.0.2
 PORTREVISION=	4
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	http://tnemeth.free.fr/projets/programmes/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	mbeis@xs4all.nl
 COMMENT=	Disk usage monitor dockapp
 
 USE_XORG=	x11 xpm
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-prefix=""
 
 PLIST_FILES=	"@(,kmem,2555) bin/${PORTNAME}" man/man1/${PORTNAME}.1.gz
 
 post-patch:
 	@${REINPLACE_CMD} '/SETGID_FLAGS=/d' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
Index: branches/2015Q3
===================================================================
--- branches/2015Q3	(revision 395784)
+++ branches/2015Q3	(revision 395785)

Property changes on: branches/2015Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r395738