ports/182803: net/x2goclient: Update to version 4.0.1.1

[KATO Tsuguru]

>Number:         182803
>Category:       ports
>Synopsis:       net/x2goclient: Update to version 4.0.1.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 07 18:10:02 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
- Update to version 4.0.1.1

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/net/x2goclient/Makefile net/x2goclient/Makefile
--- /usr/ports/net/x2goclient/Makefile	2013-09-22 00:27:06.000000000 +0900
+++ net/x2goclient/Makefile	2013-10-08 00:00:00.000000000 +0900
@@ -2,7 +2,7 @@
 # $FreeBSD: head/net/x2goclient/Makefile 327755 2013-09-20 22:10:23Z bapt $
 
 PORTNAME=	x2goclient
-PORTVERSION=	4.0.1.0
+PORTVERSION=	4.0.1.1
 CATEGORIES=	net
 MASTER_SITES=	http://code.x2go.org/releases/source/x2goclient/
 
@@ -25,9 +25,6 @@
 QMAKEFLAGS=	QMAKE_LRELEASE="${QT_PREFIX}/bin/lrelease-qt4"
 INSTALLS_ICONS=	yes
 
-MAN1=		x2goclient.1
-
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MLDAP}
@@ -46,30 +43,33 @@
 		 /#define USELDAP/s|^|//|'
 
 do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS}
+	@(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS})
 
 pre-build:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \
-		${MAKEFILE} compiler_TSQM_make_all
+	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
+		${MAKEFILE} compiler_TSQM_make_all)
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/x2goclient ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/man/man1/x2goclient.1 ${MANPREFIX}/man/man1
-	@${MKDIR} ${DESKTOPDIR}
-	${INSTALL_DATA} ${WRKSRC}/desktop/x2goclient.desktop \
-		${DESKTOPDIR}
-.for dir in 16x16 32x32 48x48 64x64 128x128
-	@${MKDIR} ${PREFIX}/share/icons/hicolor/${dir}/apps
-	${INSTALL_DATA} ${WRKSRC}/icons/${dir}/x2goclient.png \
-		${PREFIX}/share/icons/hicolor/${dir}/apps
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} x2goclient \
+		${STAGEDIR}${PREFIX}/bin)
+	(cd ${WRKSRC}/man/man1 && ${INSTALL_MAN} x2goclient.1 \
+		${STAGEDIR}${MANPREFIX}/man/man1)
+	@${MKDIR} ${STAGEDIR}${DESKTOPDIR}
+	(cd ${WRKSRC}/desktop && ${INSTALL_DATA} x2goclient.desktop \
+		${STAGEDIR}${DESKTOPDIR})
+.for i in 16x16 32x32 48x48 64x64 128x128
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}/apps
+	(cd ${WRKSRC}/icons/${i} && ${INSTALL_DATA} x2goclient.png \
+		${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}/apps)
 .endfor
-	@${MKDIR} ${DATADIR}/icons
-	${INSTALL_DATA} ${WRKSRC}/icons/x2goclient.xpm ${DATADIR}/icons
-	${INSTALL_DATA} ${WRKSRC}/icons/128x128/x2goclient.png ${DATADIR}/icons
-	${INSTALL_DATA} ${WRKSRC}/icons/128x128/x2gosession.png ${DATADIR}/icons
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/HOWTO.GPGCARD ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DATADIR}/icons
+	(cd ${WRKSRC}/icons && ${INSTALL_DATA} x2goclient.xpm \
+		${STAGEDIR}${DATADIR}/icons)
+.for i in x2goclient.png x2gosession.png 
+	(cd ${WRKSRC}/icons/128x128 && ${INSTALL_DATA} ${i} \
+		${STAGEDIR}${DATADIR}/icons)
+.endfor
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} HOWTO.GPGCARD ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff -urN /usr/ports/net/x2goclient/distinfo net/x2goclient/distinfo
--- /usr/ports/net/x2goclient/distinfo	2013-06-21 03:41:55.000000000 +0900
+++ net/x2goclient/distinfo	2013-10-08 00:00:00.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (x2goclient-4.0.1.0.tar.gz) = 3c72760f901ef6801529b9b5d8c3333002a53c65bdaeb9832f80d65f44665ed6
-SIZE (x2goclient-4.0.1.0.tar.gz) = 1323833
+SHA256 (x2goclient-4.0.1.1.tar.gz) = dd3877f8830d6085241c60becbd79608a8b2155f941bac258cc5e2079f818be9
+SIZE (x2goclient-4.0.1.1.tar.gz) = 1345719
diff -urN /usr/ports/net/x2goclient/pkg-plist net/x2goclient/pkg-plist
--- /usr/ports/net/x2goclient/pkg-plist	2013-06-21 03:41:55.000000000 +0900
+++ net/x2goclient/pkg-plist	2013-10-08 00:00:00.000000000 +0900
@@ -1,4 +1,5 @@
 bin/x2goclient
+man/man1/x2goclient.1.gz
 share/applications/x2goclient.desktop
 %%PORTDOCS%%%%DOCSDIR%%/HOWTO.GPGCARD
 share/icons/hicolor/128x128/apps/x2goclient.png
>Release-Note:
>Audit-Trail:
>Unformatted: