Date: Wed, 26 Sep 2012 02:25:45 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/172044: net/x2goclient: Update to version 3.99.2.2 Message-ID: <20120926022545.c0d23ed10c5269bb194d3d20@yahoo.com> Resent-Message-ID: <201209251810.q8PIAcM9023506@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 172044 >Category: ports >Synopsis: net/x2goclient: Update to version 3.99.2.2 >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: Tue Sep 25 18:10:38 UTC 2012 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 7.4-RELEASE-p10 i386 >Organization: >Environment: >Description: - Update to version 3.99.2.2 New file: files/patch-sshmasterconnection.cpp files/patch-sshprocess.cpp files/patch-sshprocess.h pkg-plist Remove file: files/patch-cupsprint.h >How-To-Repeat: >Fix: diff -urN /usr/ports/net/x2goclient/Makefile net/x2goclient/Makefile --- /usr/ports/net/x2goclient/Makefile 2012-06-06 15:44:13.000000000 +0900 +++ net/x2goclient/Makefile 2012-09-25 03:39:14.000000000 +0900 @@ -1,46 +1,85 @@ -# New ports collection makefile for: x2goclient -# Date created: 2010-08-16 -# Whom: arved -# +# Created by: arved # $FreeBSD: ports/net/x2goclient/Makefile,v 1.9 2012/06/06 06:44:13 miwi Exp $ PORTNAME= x2goclient -DISTVERSION= 3.01-5 -PORTREVISION= 2 +PORTVERSION= 3.99.2.2 CATEGORIES= net -MASTER_SITES= http://code.x2go.org/releases/source/x2goclient/pre-git/ -DISTNAME= ${PORTNAME}_${DISTVERSION} +MASTER_SITES= http://code.x2go.org/releases/source/x2goclient/ MAINTAINER= ports@FreeBSD.org -COMMENT= The x2go perl client +COMMENT= The x2go Qt client LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= cups.2:${PORTSDIR}/print/cups-client +LIB_DEPENDS= cups:${PORTSDIR}/print/cups-client \ + ssh:${PORTSDIR}/security/libssh RUN_DEPENDS= nxproxy:${PORTSDIR}/net/nxproxy \ x2goclient-cli:${PORTSDIR}/net/x2goclient-cli -WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION:S,-5,,} - -USE_QT4= gui network svg qmake_build moc_build uic_build rcc_build -USE_OPENLDAP= yes +OPTIONS_DEFINE= OPENLDAP DOCS +OPTIONS_DEFAULT=OPENLDAP +OPENLDAP_DESC= Enable OpenLDAP support + +USE_XORG= xpm +USE_QT4= gui network svg \ + linguist_build moc_build qmake_build rcc_build uic_build +QMAKEFLAGS= QMAKE_LRELEASE="${QT_PREFIX}/bin/lrelease-qt4" +INSTALLS_ICONS= yes MAKE_JOBS_SAFE= yes -PLIST_FILES= bin/x2goclient +MAN1= x2goclient.1 + +PORTSCOUT= limit:\^3\.0 + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MOPENLDAP} +USE_OPENLDAP= yes +CFLAGS+= -DUSELDAP +QMAKEFLAGS+= LIBS+="-lX11 -lXpm -lcups -lldap" +.else +QMAKEFLAGS+= LIBS+="-lX11 -lXpm -lcups" +.endif post-patch: - cd ${WRKSRC}; ${REINPLACE_CMD} -e "s,Q_OS_LINUX,Q_OS_FREEBSD," \ - embedwidget.cpp onmainwindow.cpp ongetpass.cpp \ - clicklineedit.cpp embedwidget.h clicklineedit.h - ${REINPLACE_CMD} -e "s,#include <linux/fs.h>,," \ - ${WRKSRC}/onmainwindow.cpp - ${REINPLACE_CMD} -e "s,linux,freebsd," ${WRKSRC}/x2goclient.pro + @${FIND} ${WRKSRC} -name "*.cpp" -or -name "*.h" | ${XARGS} \ + ${REINPLACE_CMD} -e \ + 's|Q_OS_LINUX|Q_OS_${OPSYS:U}| ; \ + /<linux\/fs.h>/s|^|//| ; \ + /#define USELDAP/s|^|//|' + @${FIND} ${WRKSRC} -name "*.cpp" -or -name "*.ts" | ${XARGS} \ + ${REINPLACE_CMD} -e \ + 's|authentification|authentication|g' + @${REINPLACE_CMD} -e \ + '/MACOSX/s|^|#|' ${WRKSRC}/x2goclient.pro + @${REINPLACE_CMD} -e \ + 's|/usr/bin/||' ${WRKSRC}/desktop/x2goclient.desktop 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 do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/x2goclient ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/x2goclient ${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/man/man1/x2goclient.1 ${MANPREFIX}/man/man1 + @${MKDIR} ${PREFIX}/share/applications + ${INSTALL_DATA} ${WRKSRC}/desktop/x2goclient.desktop \ + ${PREFIX}/share/applications +.for dir in 16x16 32x32 64x64 128x128 + @${MKDIR} ${PREFIX}/share/icons/hicolor/${dir}/apps + ${INSTALL_DATA} ${WRKSRC}/icons/${dir}/x2goclient.png \ + ${PREFIX}/share/icons/hicolor/${dir}/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 .include <bsd.port.mk> diff -urN /usr/ports/net/x2goclient/distinfo net/x2goclient/distinfo --- /usr/ports/net/x2goclient/distinfo 2011-03-20 21:53:17.000000000 +0900 +++ net/x2goclient/distinfo 2012-08-10 17:29:17.000000000 +0900 @@ -1,2 +1,2 @@ -SHA256 (x2goclient_3.01-5.tar.gz) = ce671a628b17614bdcf443bd5ff22f644ceca1dad634c8823fcad8438a3751e3 -SIZE (x2goclient_3.01-5.tar.gz) = 10274153 +SHA256 (x2goclient-3.99.2.2.tar.gz) = ef3653cb7643ea17a2e5a3beb2d3072e4c6ddff6fcee2021e5d7251a07f6ca6a +SIZE (x2goclient-3.99.2.2.tar.gz) = 1120830 diff -urN /usr/ports/net/x2goclient/files/patch-cupsprint.h net/x2goclient/files/patch-cupsprint.h --- /usr/ports/net/x2goclient/files/patch-cupsprint.h 2011-11-27 18:54:31.000000000 +0900 +++ net/x2goclient/files/patch-cupsprint.h 1970-01-01 09:00:00.000000000 +0900 @@ -1,10 +0,0 @@ ---- cupsprint.h.orig 2009-11-12 06:47:37.000000000 +0900 -+++ cupsprint.h 2011-11-23 03:23:33.000000000 +0900 -@@ -15,6 +15,7 @@ - #ifndef Q_OS_WIN - #include <QStringList> - #include <cups/cups.h> -+#include <cups/ppd.h> - /** - @author Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> - */ diff -urN /usr/ports/net/x2goclient/files/patch-sshmasterconnection.cpp net/x2goclient/files/patch-sshmasterconnection.cpp --- /usr/ports/net/x2goclient/files/patch-sshmasterconnection.cpp 1970-01-01 09:00:00.000000000 +0900 +++ net/x2goclient/files/patch-sshmasterconnection.cpp 2012-07-08 05:48:20.000000000 +0900 @@ -0,0 +1,12 @@ +--- sshmasterconnection.cpp.orig 2011-11-25 21:08:10.000000000 +0900 ++++ sshmasterconnection.cpp 2011-12-20 01:50:14.000000000 +0900 +@@ -25,6 +25,9 @@ + #include <QDir> + #include <QTemporaryFile> + #ifndef Q_OS_WIN ++#include <sys/types.h> ++#include <sys/socket.h> ++#include <netinet/in.h> + #include <arpa/inet.h> + #endif + diff -urN /usr/ports/net/x2goclient/files/patch-sshprocess.cpp net/x2goclient/files/patch-sshprocess.cpp --- /usr/ports/net/x2goclient/files/patch-sshprocess.cpp 1970-01-01 09:00:00.000000000 +0900 +++ net/x2goclient/files/patch-sshprocess.cpp 2012-07-08 05:48:20.000000000 +0900 @@ -0,0 +1,12 @@ +--- sshprocess.cpp.orig 2011-11-25 21:08:10.000000000 +0900 ++++ sshprocess.cpp 2011-12-20 01:53:47.000000000 +0900 +@@ -21,6 +21,9 @@ + #include <QTimer> + + #ifndef Q_OS_WIN ++#include <sys/types.h> ++#include <sys/socket.h> ++#include <netinet/in.h> + #include <arpa/inet.h> + #include <netinet/tcp.h> + #endif diff -urN /usr/ports/net/x2goclient/files/patch-sshprocess.h net/x2goclient/files/patch-sshprocess.h --- /usr/ports/net/x2goclient/files/patch-sshprocess.h 1970-01-01 09:00:00.000000000 +0900 +++ net/x2goclient/files/patch-sshprocess.h 2012-07-08 05:48:20.000000000 +0900 @@ -0,0 +1,15 @@ +--- sshprocess.h.orig 2011-11-25 21:08:10.000000000 +0900 ++++ sshprocess.h 2011-12-20 01:56:29.000000000 +0900 +@@ -17,6 +17,12 @@ + #ifndef SSHPROCESS_H + #define SSHPROCESS_H + ++#ifndef Q_OS_WIN ++#include <sys/types.h> ++#include <sys/socket.h> ++#include <netinet/in.h> ++#include <arpa/inet.h> ++#endif + #include <libssh/libssh.h> + #include <QObject> + diff -urN /usr/ports/net/x2goclient/pkg-plist net/x2goclient/pkg-plist --- /usr/ports/net/x2goclient/pkg-plist 1970-01-01 09:00:00.000000000 +0900 +++ net/x2goclient/pkg-plist 2012-07-08 06:33:04.000000000 +0900 @@ -0,0 +1,24 @@ +bin/x2goclient +share/applications/x2goclient.desktop +%%PORTDOCS%%%%DOCSDIR%%/HOWTO.GPGCARD +share/icons/hicolor/128x128/apps/x2goclient.png +share/icons/hicolor/16x16/apps/x2goclient.png +share/icons/hicolor/32x32/apps/x2goclient.png +share/icons/hicolor/64x64/apps/x2goclient.png +%%DATADIR%%/icons/x2goclient.xpm +%%DATADIR%%/icons/x2goclient.png +%%DATADIR%%/icons/x2gosession.png +@dirrm %%DATADIR%%/icons +@dirrm %%DATADIR%% +@dirrmtry share/icons/hicolor/64x64/apps +@dirrmtry share/icons/hicolor/64x64 +@dirrmtry share/icons/hicolor/32x32/apps +@dirrmtry share/icons/hicolor/32x32 +@dirrmtry share/icons/hicolor/16x16/apps +@dirrmtry share/icons/hicolor/16x16 +@dirrmtry share/icons/hicolor/128x128/apps +@dirrmtry share/icons/hicolor/128x128 +@dirrmtry share/icons/hicolor +@dirrmtry share/icons +%%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrmtry share/applications >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120926022545.c0d23ed10c5269bb194d3d20>