Date: Thu, 1 Nov 2012 09:28:54 +0000 (UTC) From: Pawel Pekala <pawel@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r306788 - in head/net/x2goclient: . files Message-ID: <201211010928.qA19SsPT059744@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pawel Date: Thu Nov 1 09:28:54 2012 New Revision: 306788 URL: http://svn.freebsd.org/changeset/ports/306788 Log: - Update to version 3.99.2.2 - Use pkg-plist to register installed files - Add option to disable LDAP support - Don't install copy of GPLv2 license PR: ports/172044 Submitted by: KATO Tsuguru <tkato432@yahoo.com> Feature safe: yes Added: head/net/x2goclient/files/patch-sshmasterconnection.cpp (contents, props changed) head/net/x2goclient/files/patch-sshprocess.cpp (contents, props changed) head/net/x2goclient/files/patch-sshprocess.h (contents, props changed) Deleted: head/net/x2goclient/files/patch-cupsprint.h Modified: head/net/x2goclient/Makefile head/net/x2goclient/distinfo Modified: head/net/x2goclient/Makefile ============================================================================== --- head/net/x2goclient/Makefile Thu Nov 1 09:06:40 2012 (r306787) +++ head/net/x2goclient/Makefile Thu Nov 1 09:28:54 2012 (r306788) @@ -1,46 +1,93 @@ -# New ports collection makefile for: x2goclient -# Date created: 2010-08-16 -# Whom: arved -# +# Created by: arved # $FreeBSD$ 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= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ + pcre:${PORTSDIR}/devel/pcre \ + png15:${PORTSDIR}/graphics/png \ + cups:${PORTSDIR}/print/cups-client \ + freetype:${PORTSDIR}/print/freetype2 \ + ssh:${PORTSDIR}/security/libssh \ + expat:${PORTSDIR}/textproc/expat2 \ + fontconfig:${PORTSDIR}/x11-fonts/fontconfig \ + xcb:${PORTSDIR}/x11/libxcb RUN_DEPENDS= nxproxy:${PORTSDIR}/net/nxproxy \ x2goclient-cli:${PORTSDIR}/net/x2goclient-cli -WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION:S,-5,,} +OPTIONS_DEFINE= LDAP DOCS +OPTIONS_DEFAULT=LDAP -USE_QT4= gui network svg qmake_build moc_build uic_build rcc_build -USE_OPENLDAP= yes +USE_GETTEXT= yes +USE_ICONV= yes +USE_XORG= ice sm x11 xau xdmcp xext xpm xrender +USE_QT4= corelib 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:MLDAP} +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> Modified: head/net/x2goclient/distinfo ============================================================================== --- head/net/x2goclient/distinfo Thu Nov 1 09:06:40 2012 (r306787) +++ head/net/x2goclient/distinfo Thu Nov 1 09:28:54 2012 (r306788) @@ -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 Added: head/net/x2goclient/files/patch-sshmasterconnection.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/x2goclient/files/patch-sshmasterconnection.cpp Thu Nov 1 09:28:54 2012 (r306788) @@ -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 + Added: head/net/x2goclient/files/patch-sshprocess.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/x2goclient/files/patch-sshprocess.cpp Thu Nov 1 09:28:54 2012 (r306788) @@ -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 Added: head/net/x2goclient/files/patch-sshprocess.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/x2goclient/files/patch-sshprocess.h Thu Nov 1 09:28:54 2012 (r306788) @@ -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> +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211010928.qA19SsPT059744>