Attachment 137148 Details for Bug 182540 – file.diff

[patch] file.diff

file.diff (text/plain), 3.26 KB, created by Koichiro Iwao on 2013-10-01 09:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Koichiro Iwao

Created: 2013-10-01 09:40:01 UTC

Size: 3.26 KB

patch

obsolete

>diff -ruN /usr/ports/net/xrdp/Makefile net/xrdp/Makefile
>--- /usr/ports/net/xrdp/Makefile	2013-09-21 18:59:17.417884816 +0900
>+++ net/xrdp/Makefile	2013-10-01 13:24:24.587750982 +0900
>@@ -2,19 +2,18 @@
> # $FreeBSD$
> 
> PORTNAME=	xrdp
>-PORTVERSION=	0.6.0
>-PORTREVISION=	4
>+PORTVERSION=	0.6.1
>+PORTREVISION=	0
> PORTEPOCH=	1
> CATEGORIES=	net
>-MASTER_SITES=	SF/xrdp/xrdp/${PORTVERSION}
>-DISTNAME=	${PORTNAME}-v${PORTVERSION}
>+MASTER_SITES=	GH
> DIST_SUBDIR?=	${PORTNAME}
> 
> PATCH_SITES=	http://www.club.kyutech.ac.jp/~meta/patches/xrdp/0.6.0/ \
> 		http://key2.jp/~meta/patches/xrdp/0.6.0/
> 
> MAINTAINER=	meta+ports@vmeta.jp
>-COMMENT=	An open source Remote Desktop Protocol (RDP) server
>+COMMENT=	Open source Remote Desktop Protocol (RDP) server
> 
> LICENSE=	GPLv2
> LICENSE_FILE=	${WRKSRC}/COPYING
>@@ -24,6 +23,11 @@
> USE_AUTOTOOLS=	autoconf:env automake:env libtool
> GNU_CONFIGURE=	yes
> USE_RC_SUBR=	xrdp
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	FreeRDP
>+GH_PROJECT=	xrdp
>+GH_COMMIT=	5d53758
>+GH_TAGNAME=	${GH_COMMIT}
> 
> CONFIGURE_ARGS=	--localstatedir=/var --enable-freerdp1
> LDFLAGS+=	-L${LOCALBASE}/lib
>@@ -31,7 +35,7 @@
> CONFLICTS=	xrdp-devel-[0-9]*
> BUILD_DEPENDS+=	freerdp>=1.0.2:${PORTSDIR}/net/freerdp
> 
>-USE_LDCONFIG=	${PREFIX}/lib/xrdp
>+USE_LDCONFIG=	${STAGEDIR}${PREFIX}/lib/xrdp
> 
> OPTIONS_DEFINE=	DEBUG JP106
> OPTIONS_DEFAULT=	JP106 TIGERVNC
>@@ -43,7 +47,6 @@
> TRIDIAVNC_DESC=	Use TridiaVNC
> JP106_DESC=	Install Japanese JP106 keymap
> 
>-NO_STAGE=	yes
> .include <bsd.port.options.mk>
> 
> # Which Xserver to use
>@@ -76,9 +79,6 @@
> PLIST_SUB+=	JP106="@comment "
> .endif
> 
>-MAN5=		sesman.ini.5 xrdp.ini.5
>-MAN8=		xrdp-sesman.8 xrdp-sesrun.8 xrdp.8
>-
> SUB_FILES=	pkg-message
> 
> post-patch:
>@@ -91,10 +91,9 @@
> 
> post-install:
> .for f in sesman.ini startwm.sh xrdp.ini
>-	@if [ ! -f ${PREFIX}/etc/xrdp/$f ]; then \
>-		${CP} -p ${PREFIX}/etc/xrdp/$f.sample ${PREFIX}/etc/xrdp/$f ; \
>+	@if [ ! -f ${STAGEDIR}${PREFIX}/etc/xrdp/$f ]; then \
>+		${CP} -p ${STAGEDIR}${PREFIX}/etc/xrdp/$f.sample ${STAGEDIR}${PREFIX}/etc/xrdp/$f ; \
> 	fi
> .endfor
>-	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
> 
> .include <bsd.port.mk>
>diff -ruN /usr/ports/net/xrdp/distinfo net/xrdp/distinfo
>--- /usr/ports/net/xrdp/distinfo	2013-03-13 20:05:28.742796560 +0900
>+++ net/xrdp/distinfo	2013-09-14 16:27:25.901498996 +0900
>@@ -1,5 +1,5 @@
>-SHA256 (xrdp/xrdp-v0.6.0.tar.gz) = 8b20fe56d935252981d73ac3b70b9b1654a83939824d9962beebb1586e429690
>-SIZE (xrdp/xrdp-v0.6.0.tar.gz) = 322104
>+SHA256 (xrdp/xrdp-0.6.1.tar.gz) = ef9b223cf8a114c05d85f352bbc842468028fed33842698ba09e2bc86c21bcd0
>+SIZE (xrdp/xrdp-0.6.1.tar.gz) = 1559492
> SHA256 (xrdp/patch-instfiles__Makefile.am) = 92e8a1768b63f508bc5b37cdc5723d1e03875af7fbdf064aa86a6b40b1bd2f07
> SIZE (xrdp/patch-instfiles__Makefile.am) = 710
> SHA256 (xrdp/patch-instfiles__km-0411.ini) = 58bcb7f063db4fcde9230be3013d46226b8af5c0060b7faf00250a51aa7da4fd
>diff -ruN /usr/ports/net/xrdp/pkg-plist net/xrdp/pkg-plist
>--- /usr/ports/net/xrdp/pkg-plist	2013-06-20 16:46:56.734961228 +0900
>+++ net/xrdp/pkg-plist	2013-10-01 12:38:50.867752249 +0900
>@@ -37,6 +37,11 @@
> lib/xrdp/libxrdpfreerdp1.a
> lib/xrdp/libxrdpfreerdp1.so
> lib/xrdp/libxrdpfreerdp1.so.0
>+man/man5/sesman.ini.5.gz
>+man/man5/xrdp.ini.5.gz
>+man/man8/xrdp-sesman.8.gz
>+man/man8/xrdp-sesrun.8.gz
>+man/man8/xrdp.8.gz
> etc/pam.d/xrdp-sesman
> etc/xrdp/km-0407.ini
> etc/xrdp/km-0409.ini

Actions: View | Diff

Attachments on bug 182540: 137148