svn commit: r360562 - head/net/xrdp-devel

[Dmitry Marakasov]

Author: amdmi3
Date: Fri Jul  4 07:41:35 2014
New Revision: 360562
URL: http://svnweb.freebsd.org/changeset/ports/360562
QAT: https://qat.redports.org/buildarchive/r360562/

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-devel/Makefile
  head/net/xrdp-devel/pkg-plist

Modified: head/net/xrdp-devel/Makefile
==============================================================================
--- head/net/xrdp-devel/Makefile	Fri Jul  4 07:41:29 2014	(r360561)
+++ head/net/xrdp-devel/Makefile	Fri Jul  4 07:41:35 2014	(r360562)
@@ -3,7 +3,7 @@
 
 PORTNAME=	xrdp
 PORTVERSION=	0.7.0.b20130912
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	GH
@@ -15,12 +15,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
@@ -96,11 +96,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-devel/pkg-plist
==============================================================================
--- head/net/xrdp-devel/pkg-plist	Fri Jul  4 07:41:29 2014	(r360561)
+++ head/net/xrdp-devel/pkg-plist	Fri Jul  4 07:41:35 2014	(r360562)
@@ -7,37 +7,37 @@ 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
 lib/xrdp/libxrdpapi.so
 lib/xrdp/libxrdpapi.a
 lib/xrdp/libxrdpapi.so.0
-lib/xrdp/libxrdpapi.la
+lib/xrdp/libxrdpapi.so.0.0.0
 etc/pam.d/xrdp-sesman
 etc/xrdp/km-0407.ini
 etc/xrdp/km-0409.ini