Index: branches/2016Q1/deskutils/xpad/Makefile
===================================================================
--- branches/2016Q1/deskutils/xpad/Makefile	(revision 411681)
+++ branches/2016Q1/deskutils/xpad/Makefile	(revision 411682)
@@ -1,45 +1,46 @@
 # Created by: Jaosn Helfman <jgh@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	xpad
-PORTVERSION=	4.5.0
-PORTREVISION=	1
+PORTVERSION=	4.7.0
 CATEGORIES=	deskutils
-MASTER_SITES=	http://launchpad.net/${PORTNAME}/trunk/4.5/+download/
+MASTER_SITES=	https://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/
 
 MAINTAINER=	jgh@FreeBSD.org
 COMMENT=	Virtual note-pad system for your X11 desktop
 
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme
 
 OPTIONS_DEFINE=	NLS DOCS
 OPTIONS_SUB=	yes
 
 CONFLICTS_INSTALL=	xpad3-[0-9]*
 USE_XORG=	x11 sm
 USE_GNOME=	gtk30 intltool gtksourceview3
 USES=	pkgconfig gmake tar:bzip2 autoreconf
 INSTALLS_ICONS=	yes
 CPPFLAGS+=	${CXXFLAGS} -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
 PORTDOCS=	*
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|glib/glist.h|glib.h|g' \
 		${WRKSRC}/src/xpad-undo.c
+	@${REINPLACE_CMD} -e 's|/etc/xdg/autostart|${LOCALBASE}/etc/xdg/autostart|g' \
+		${WRKSRC}/Makefile.am
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in AUTHORS ChangeLog INSTALL NEWS README TODO THANKS
 	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
Index: branches/2016Q1/deskutils/xpad/distinfo
===================================================================
--- branches/2016Q1/deskutils/xpad/distinfo	(revision 411681)
+++ branches/2016Q1/deskutils/xpad/distinfo	(revision 411682)
@@ -1,2 +1,2 @@
-SHA256 (xpad-4.5.0.tar.bz2) = f870cefc92593febf266bb0f90ceb0feeb4af7eb1033625fca50933701a7b9e8
-SIZE (xpad-4.5.0.tar.bz2) = 1907957
+SHA256 (xpad-4.7.0.tar.bz2) = 4b11963077e265d8ca8396b2a8e841c068a95f538197397631fdd75ab195b13c
+SIZE (xpad-4.7.0.tar.bz2) = 240374
Index: branches/2016Q1
===================================================================
--- branches/2016Q1	(revision 411681)
+++ branches/2016Q1	(revision 411682)

Property changes on: branches/2016Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r409470,411680