Attachment 120105 Details for Bug 162854 – file.diff

[patch] file.diff

file.diff (text/plain), 1.76 KB, created by tkato432 on 2011-11-24 18:30:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2011-11-24 18:30:14 UTC

Size: 1.76 KB

patch

obsolete

>diff -urN /usr/ports/net/x2goclient/Makefile net/x2goclient/Makefile
>--- /usr/ports/net/x2goclient/Makefile	2011-11-02 15:37:56.000000000 +0900
>+++ net/x2goclient/Makefile	2011-11-23 03:24:37.000000000 +0900
>@@ -14,20 +14,21 @@
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	The x2go perl client
> 
>+LICENSE=	GPLv2
>+LICENSE_FILE=	${WRKSRC}/COPYING
>+
> LIB_DEPENDS=	cups.2:${PORTSDIR}/print/cups-client
> RUN_DEPENDS=	nxproxy:${PORTSDIR}/net/nxproxy \
> 		x2goclient-cli:${PORTSDIR}/net/x2goclient-cli
> 
>-BROKEN=		does not compile
>-EXPIRATION_DATE=	2011-11-30
>-
>-LICENSE=	GPLv2
>-LICENSE_FILE=	${WRKSRC}/COPYING
>-PLIST_FILES=	bin/x2goclient
> WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION:S,-5,,}
>+
> USE_QT_VER=	4
> QT_COMPONENTS=	gui network svg qmake_build moc_build uic_build rcc_build
> USE_OPENLDAP=	yes
>+MAKE_JOBS_SAFE=	yes
>+
>+PLIST_FILES=	bin/x2goclient
> 
> post-patch:
> 	cd ${WRKSRC}; ${REINPLACE_CMD} -e "s,Q_OS_LINUX,Q_OS_FREEBSD," \
>@@ -38,7 +39,7 @@
> 	${REINPLACE_CMD} -e "s,linux,freebsd," ${WRKSRC}/x2goclient.pro
> 
> do-configure:
>-	cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${QMAKE}
>+	cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS}
> 
> do-install:
> 	${INSTALL_SCRIPT} ${WRKSRC}/x2goclient ${PREFIX}/bin
>diff -urN /usr/ports/net/x2goclient/files/patch-cupsprint.h net/x2goclient/files/patch-cupsprint.h
>--- /usr/ports/net/x2goclient/files/patch-cupsprint.h	1970-01-01 09:00:00.000000000 +0900
>+++ net/x2goclient/files/patch-cupsprint.h	2011-11-23 03:24:22.000000000 +0900
>@@ -0,0 +1,10 @@
>+--- 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>
>+ */

Actions: View | Diff

Attachments on bug 162854: 120105