Bug 182305

Summary: [PATCH] net/rdesktop: Apply iconv fixxes and convert to new options frameowork
Product: Ports & Packages Reporter: Guido Falsi <madpilot>
Component: Individual Port(s)Assignee: David E. O'Brien <obrien>
Status: Closed FIXED    
Severity: Affects Only Me CC: obrien
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff
none
rdesktop.diff none

Description Guido Falsi freebsd_committer freebsd_triage 2013-09-22 22:10:00 UTC 
Hi,

Fellow committer marino sent me oatches to allow the rdesktop port
to compile correctly also on DragonFly BSD, these are the changes
related to iconv support.

I integrated those and converted the port to the new options
framework, leaving the port's logic the same. I only added
OPTIONS_DEFINE.

While here I also converted to the new LIB_DEPENDS format too.

Can you approve these changes?

Thank you.
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-09-22 22:10:08 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->obrien

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 Guido Falsi freebsd_committer freebsd_triage 2013-10-06 12:14:15 UTC 
Hi,

I'm attaching a new patch which also adds staging support.

Thanks.

-- 
Guido Falsi <madpilot@FreeBSD.org>
Comment 3 dfilter service freebsd_committer freebsd_triage 2013-10-24 17:41:41 UTC 
Author: madpilot
Date: Thu Oct 24 16:41:28 2013
New Revision: 331499
URL: http://svnweb.freebsd.org/changeset/ports/331499

Log:
  - Make iconv dependency unconditional[1]
  
  While here:
  
  - Convert to USES=gmake
  - Convert to new options framework
  - Convert to staging
  - Make portlint happier
  
  PR:		ports/182305
  Submitted by:	me
  Requested by:	marino [1]
  Approved by:	portmgr (bapt, implicit) [1]
  Approved by:	Maintainer timeout

Modified:
  head/net/rdesktop/Makefile
  head/net/rdesktop/pkg-plist   (contents, props changed)

Modified: head/net/rdesktop/Makefile
==============================================================================
--- head/net/rdesktop/Makefile	Thu Oct 24 16:27:22 2013	(r331498)
+++ head/net/rdesktop/Makefile	Thu Oct 24 16:41:28 2013	(r331499)
@@ -11,34 +11,32 @@ MAINTAINER=	obrien@FreeBSD.org
 COMMENT=	RDP client for Windows NT/2000/2003 Terminal Server
 
 LICENSE=	GPLv3
+
 USE_XORG=	x11
-USE_GMAKE=	yes
+USES=		gmake iconv
+CONFIGURE_ARGS+=	${ICONV_CONFIGURE_ARG}
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 DOCS=		doc/AUTHORS doc/TODO doc/*.txt
-MAN1=		rdesktop.1
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	DOCS IPV6 RDESKTOP_DEBUG SAMPLERATE AO
+RDESKTOP_DEBUG_DESC=	Enable debugging
 
-.if exists(${LOCALBASE}/lib/libao.so) || defined(WITH_LIBAO)
-LIB_DEPENDS+=	ao.4:${PORTSDIR}/audio/libao
-.endif
+.include <bsd.port.options.mk>
 
-.if exists(${LOCALBASE}/lib/libsamplerate.so) || defined(WITH_LIBSAMPLERATE)
-LIB_DEPENDS+=	samplerate.1:${PORTSDIR}/audio/libsamplerate
+.if exists(${LOCALBASE}/lib/libao.so) || ${PORT_OPTIONS:MAO}
+LIB_DEPENDS+=	libao.so:${PORTSDIR}/audio/libao
 .endif
 
-.if !defined(WITHOUT_RDESKTOP_IPV6) && !defined(WITHOUT_IPV6)
-CONFIGURE_ARGS+=	--with-ipv6
+.if exists(${LOCALBASE}/lib/libsamplerate.so) || ${PORT_OPTIONS:MSAMPLERATE}
+LIB_DEPENDS+=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
 .endif
 
-.if defined(WITH_ICONV)
-USES+=		iconv
-CONFIGURE_ARGS+=	${ICONV_CONFIGURE_ARG}
+.if ${PORT_OPTIONS:MIPV6}
+CONFIGURE_ARGS+=	--with-ipv6
 .endif
 
-.if defined(WITH_RDESKTOP_DEBUG)
+.if ${PORT_OPTIONS:MRDESKTOP_DEBUG}
 CONFIGURE_ARGS+=	--with-debug\
 			--with-debug-kbd\
 			--with-debug-rdp5\
@@ -52,13 +50,11 @@ post-configure:
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/rdesktop ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/doc/rdesktop.1 ${MAN1PREFIX}/man/man1
-	@${MKDIR} ${DATADIR}/keymaps
-	${INSTALL_DATA} ${WRKSRC}/keymaps/* ${DATADIR}/keymaps
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/rdesktop ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/doc/rdesktop.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	@${MKDIR} ${STAGEDIR}${DATADIR}/keymaps
+	${INSTALL_DATA} ${WRKSRC}/keymaps/* ${STAGEDIR}${DATADIR}/keymaps
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/net/rdesktop/pkg-plist
==============================================================================
--- head/net/rdesktop/pkg-plist	Thu Oct 24 16:27:22 2013	(r331498)
+++ head/net/rdesktop/pkg-plist	Thu Oct 24 16:41:28 2013	(r331499)
@@ -1,5 +1,6 @@
 @comment $FreeBSD$
 bin/rdesktop
+man/man1/rdesktop.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/ipv6.txt
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 4 Guido Falsi freebsd_committer freebsd_triage 2013-10-24 17:41:47 UTC 
State Changed
From-To: open->closed

Committed. Thanks!