svn commit: r361874 - in head/security/trousers: . files

[Hiroki Sato]

Author: hrs
Date: Tue Jul 15 06:22:55 2014
New Revision: 361874
URL: http://svnweb.freebsd.org/changeset/ports/361874
QAT: https://qat.redports.org/buildarchive/r361874/

Log:
  - Fix build (ranlib: fatal: Failed to open 'libtddl.a') [*].
  - Fix build when EMULATOR is enabled.
  
  Reported by:	John Hein[*] and Andrzej Tobola[*]

Modified:
  head/security/trousers/Makefile
  head/security/trousers/files/extra-patch-src-tcsd-Makefile.am

Modified: head/security/trousers/Makefile
==============================================================================
--- head/security/trousers/Makefile	Tue Jul 15 06:20:43 2014	(r361873)
+++ head/security/trousers/Makefile	Tue Jul 15 06:22:55 2014	(r361874)
@@ -23,7 +23,7 @@ USE_RC_SUBR=	tcsd
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--with-gui=none --enable-static \
 		--localstatedir=${PREFIX}/var \
-		--with-tssuser=${USERS} --with-tssgroup=${GROUPS}
+		--with-tssuser=${USERS} --with-tssgroup=${GROUPS} RANLIB=:
 MAKE_ENV=	PTHREAD_LIBS=${PTHREAD_LIBS} ICONV_LIB=${ICONV_LIB} \
 		ICONV_PREFIX=${ICONV_PREFIX}
 SUB_FILES=	pkg-message

Modified: head/security/trousers/files/extra-patch-src-tcsd-Makefile.am
==============================================================================
--- head/security/trousers/files/extra-patch-src-tcsd-Makefile.am	Tue Jul 15 06:20:43 2014	(r361873)
+++ head/security/trousers/files/extra-patch-src-tcsd-Makefile.am	Tue Jul 15 06:22:55 2014	(r361874)
@@ -5,7 +5,7 @@
  
  tcsd_CFLAGS=-DAPPID=\"TCSD\" -DVAR_PREFIX=\"@localstatedir@\" -DETC_PREFIX=\"@sysconfdir@\" -I${top_srcdir}/src/include -fPIE -DPIE
 -tcsd_LDADD=${top_builddir}/src/tcs/libtcs.a ${top_builddir}/src/tddl/libtddl.a -lpthread @CRYPTOLIB@
-+tcsd_LDADD=${LOCALBASE}/lib/libtcs.a ${LOCALBASE}/lib/libtddl.a ${PTHREAD_LIBS} @CRYPTOLIB@
++tcsd_LDADD=${top_builddir}/src/tcs/libtcs.a -ltddl -L${LOCALBASE}/lib ${PTHREAD_LIBS} @CRYPTOLIB@
  tcsd_LDFLAGS=-pie -Wl,-z,relro -Wl,-z,now
  
  tcsd_SOURCES=svrside.c tcsd_conf.c tcsd_threads.c platform.c