FreeBSD Bugzilla – Attachment 158003 Details for
Bug 201067
[maintainer update] net/xrdp: convert to options helpers, etc
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch
patch-xrdp-0.6.1_7.txt (text/plain), 3.46 KB, created by
Koichiro Iwao
on 2015-06-23 06:16:59 UTC
(
hide
)
Description:
patch
Filename:
MIME Type:
Creator:
Koichiro Iwao
Created:
2015-06-23 06:16:59 UTC
Size:
3.46 KB
patch
obsolete
>diff -ruN /usr/ports/net/xrdp/Makefile net/xrdp/Makefile >--- /usr/ports/net/xrdp/Makefile 2015-05-08 09:17:37.850357118 +0900 >+++ net/xrdp/Makefile 2015-06-23 15:07:44.364078948 +0900 >@@ -3,14 +3,17 @@ > > PORTNAME= xrdp > PORTVERSION= 0.6.1 >-PORTREVISION= 6 >+DISTVERSIONPREFIX= v >+PORTREVISION= 7 > PORTEPOCH= 1 > CATEGORIES= net >+DIST_SUBDIR= ${PORTNAME} > > MAINTAINER= meta+ports@vmeta.jp > COMMENT= Open source Remote Desktop Protocol (RDP) server > > LICENSE= GPLv2 >+LICENSE_FILE= ${WRKSRC}/COPYING > > GNU_CONFIGURE= yes > USES= autoreconf:build libtool pkgconfig >@@ -21,17 +24,17 @@ > > USE_GITHUB= yes > GH_ACCOUNT= neutrinolabs >-GH_TAGNAME= 5d53758 > > CONFIGURE_ARGS= --localstatedir=/var > CPPFLAGS+= -I${LOCALBASE}/include > LIBS+= -L${LOCALBASE}/lib >+SUB_FILES= pkg-message > > OPTIONS_DEFINE= DEBUG > OPTIONS_DEFAULT= JP106 X11RDP > OPTIONS_GROUP= KEYMAP XSERVER >-OPTIONS_GROUP_KEYMAP= JP106 >-OPTIONS_GROUP_XSERVER= X11RDP >+OPTIONS_GROUP_KEYMAP= JP106 >+OPTIONS_GROUP_XSERVER= X11RDP > OPTIONS_RADIO= XVNC > OPTIONS_RADIO_XVNC= REALVNC TIGERVNC TIGHTVNC TRIDIAVNC > REALVNC_DESC= Use RealVNC >@@ -41,42 +44,27 @@ > X11RDP_DESC= Use X11rdp (most recommended) > JP106_DESC= Install Japanese JP106 keymap > >-.include <bsd.port.options.mk> >- >-# Which Xserver to use >-.if ${PORT_OPTIONS:MREALVNC} >-RUN_DEPENDS= Xvnc:${PORTSDIR}/net/vnc >-.endif >-.if ${PORT_OPTIONS:MTIGERVNC} >-RUN_DEPENDS= Xvnc:${PORTSDIR}/net/tigervnc >-.endif >-.if ${PORT_OPTIONS:MTIGHTVNC} >-RUN_DEPENDS= Xvnc:${PORTSDIR}/net/tightvnc >-.endif >-.if ${PORT_OPTIONS:MTRIDIAVNC} >-RUN_DEPENDS= Xvnc:${PORTSDIR}/net/tridiavnc >-.endif >+# Debug >+DEBUG_CONFIGURE_ENABLE= xrdpdebug >+# Xvnc >+REALVNC_RUN_DEPENDS= Xvnc:${PORTSDIR}/net/vnc >+TIGERVNC_RUN_DEPENDS= Xvnc:${PORTSDIR}/net/tigervnc >+TIGHTVNC_RUN_DEPENDS= Xvnc:${PORTSDIR}/net/tightvnc >+TRIDIAVNC_RUN_DEPENDS= Xvnc:${PORTSDIR}/net/tridiavnc > # X11rdp >-.if ${PORT_OPTIONS:MX11RDP} || exists(${LOCALBASE}/bin/X11rdp) >-RUN_DEPENDS+= X11rdp:${PORTSDIR}/x11-servers/x11rdp >-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-x11rdp_xrdp.ini >-.endif >+X11RDP_RUN_DEPENDS= X11rdp:${PORTSDIR}/x11-servers/x11rdp >+X11RDP_EXTRA_PATCHES= ${FILESDIR}/extra-patch-x11rdp_xrdp.ini >+# JP106 keymap >+JP106_PLIST_SUB= JP106="" >+JP106_PLIST_SUB_OFF= JP106="@comment" > >-.if ${PORT_OPTIONS:MDEBUG} >-CONFIGURE_ARGS+= --enable-xrdpdebug >-CFLAGS+= -DXRDP_DEBUG >-.endif >+.include <bsd.port.options.mk> > > .if ${PORT_OPTIONS:MJP106} > KEYMAP_FILES+= km-0411.ini km-e0010411.ini \ > km-e0200411.ini km-e0210411.ini >-PLIST_SUB+= JP106="" >-.else >-PLIST_SUB+= JP106="@comment " > .endif > >-SUB_FILES= pkg-message >- > post-patch: > .for f in sesman/sesman.ini sesman/startwm.sh xrdp/rsakeys.ini xrdp/xrdp.ini > @${MV} ${WRKSRC}/$f ${WRKSRC}/$f.sample >diff -ruN /usr/ports/net/xrdp/distinfo net/xrdp/distinfo >--- /usr/ports/net/xrdp/distinfo 2015-05-08 09:17:37.851356719 +0900 >+++ net/xrdp/distinfo 2015-06-23 15:07:55.938078800 +0900 >@@ -1,2 +1,2 @@ >-SHA256 (neutrinolabs-xrdp-0.6.1-5d53758_GH0.tar.gz) = fd3c9d1c6fb953d71c8184e384f9043039cea514f7791134546fb52444757d5c >-SIZE (neutrinolabs-xrdp-0.6.1-5d53758_GH0.tar.gz) = 1559409 >+SHA256 (xrdp/neutrinolabs-xrdp-v0.6.1_GH0.tar.gz) = 7b5a91fc5aa5a36bebff2b5ed19854486bf8836b7d01ad7bb00caa4e6b107c5b >+SIZE (xrdp/neutrinolabs-xrdp-v0.6.1_GH0.tar.gz) = 1559359 >diff -ruN /usr/ports/net/xrdp/pkg-plist net/xrdp/pkg-plist >--- /usr/ports/net/xrdp/pkg-plist 2015-03-25 11:01:25.743482087 +0900 >+++ net/xrdp/pkg-plist 2015-06-18 17:30:50.308203277 +0900 >@@ -1,4 +1,3 @@ >-@stopdaemon xrdp > bin/xrdp-dis > bin/xrdp-genkeymap > bin/xrdp-keygen
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 201067
: 158003 |
158004