Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 4 Jul 2014 07:41:30 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r360561 - head/net/xrdp
Message-ID:  <201407040741.s647fUW5088289@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Fri Jul  4 07:41:29 2014
New Revision: 360561
URL: http://svnweb.freebsd.org/changeset/ports/360561
QAT: https://qat.redports.org/buildarchive/r360561/

Log:
  - Switch to USES=libtool, drop .la files
  - Fix ldconfig file
  - Remove redundant config handling  from post-install
  
  Approved by:	portmgr blanket

Modified:
  head/net/xrdp/Makefile
  head/net/xrdp/pkg-plist

Modified: head/net/xrdp/Makefile
==============================================================================
--- head/net/xrdp/Makefile	Fri Jul  4 07:40:14 2014	(r360560)
+++ head/net/xrdp/Makefile	Fri Jul  4 07:41:29 2014	(r360561)
@@ -3,7 +3,7 @@
 
 PORTNAME=	xrdp
 PORTVERSION=	0.6.1
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	GH
@@ -14,12 +14,12 @@ COMMENT=	Open source Remote Desktop Prot
 
 LICENSE=	GPLv2
 
-USES=		pkgconfig
+USES=		libtool pkgconfig
 USE_XORG=	x11 xfixes
-USE_AUTOTOOLS=	autoconf:env automake:env libtool
+USE_AUTOTOOLS=	autoconf:env automake:env libtoolize
 GNU_CONFIGURE=	yes
 USE_RC_SUBR=	xrdp
-USE_LDCONFIG=	${STAGEDIR}${PREFIX}/lib/xrdp
+USE_LDCONFIG=	${PREFIX}/lib/xrdp
 USE_GITHUB=	yes
 GH_ACCOUNT=	neutrinolabs
 GH_PROJECT=	xrdp
@@ -90,11 +90,6 @@ pre-configure:
 	@cd ${WRKSRC} && ./bootstrap
 
 post-install:
-.for f in sesman.ini startwm.sh xrdp.ini
-	@if [ ! -f ${STAGEDIR}${PREFIX}/etc/xrdp/$f ]; then \
-		${CP} -p ${STAGEDIR}${PREFIX}/etc/xrdp/$f.sample ${STAGEDIR}${PREFIX}/etc/xrdp/$f ; \
-	fi
-.endfor
 .for f in ${KEYMAP_FILES}
 	${INSTALL_DATA} ${FILESDIR}/$f ${STAGEDIR}${PREFIX}/etc/xrdp
 .endfor

Modified: head/net/xrdp/pkg-plist
==============================================================================
--- head/net/xrdp/pkg-plist	Fri Jul  4 07:40:14 2014	(r360560)
+++ head/net/xrdp/pkg-plist	Fri Jul  4 07:41:29 2014	(r360561)
@@ -6,33 +6,33 @@ bin/xrdp-sesadmin
 bin/xrdp-sesrun
 bin/xrdp-sestest
 lib/xrdp/libcommon.a
-lib/xrdp/libcommon.la
 lib/xrdp/libcommon.so
 lib/xrdp/libcommon.so.0
+lib/xrdp/libcommon.so.0.0.0
 lib/xrdp/libmc.a
-lib/xrdp/libmc.la
 lib/xrdp/libmc.so
 lib/xrdp/libmc.so.0
+lib/xrdp/libmc.so.0.0.0
 lib/xrdp/librdp.a
-lib/xrdp/librdp.la
 lib/xrdp/librdp.so
 lib/xrdp/librdp.so.0
+lib/xrdp/librdp.so.0.0.0
 lib/xrdp/libscp.a
-lib/xrdp/libscp.la
 lib/xrdp/libscp.so
 lib/xrdp/libscp.so.0
+lib/xrdp/libscp.so.0.0.0
 lib/xrdp/libvnc.a
-lib/xrdp/libvnc.la
 lib/xrdp/libvnc.so
 lib/xrdp/libvnc.so.0
+lib/xrdp/libvnc.so.0.0.0
 lib/xrdp/libxrdp.a
-lib/xrdp/libxrdp.la
 lib/xrdp/libxrdp.so
 lib/xrdp/libxrdp.so.0
+lib/xrdp/libxrdp.so.0.0.0
 lib/xrdp/libxup.a
-lib/xrdp/libxup.la
 lib/xrdp/libxup.so
 lib/xrdp/libxup.so.0
+lib/xrdp/libxup.so.0.0.0
 man/man5/sesman.ini.5.gz
 man/man5/xrdp.ini.5.gz
 man/man8/xrdp-sesman.8.gz



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407040741.s647fUW5088289>