svn commit: r359866 - in head/security/libtomcrypt: . files

[Pietro Cerutti]

Author: gahr
Date: Mon Jun 30 15:33:35 2014
New Revision: 359866
URL: http://svnweb.freebsd.org/changeset/ports/359866
QAT: https://qat.redports.org/buildarchive/r359866/

Log:
  - STAGE-clean

Modified:
  head/security/libtomcrypt/Makefile
  head/security/libtomcrypt/files/patch-makefile

Modified: head/security/libtomcrypt/Makefile
==============================================================================
--- head/security/libtomcrypt/Makefile	Mon Jun 30 15:23:28 2014	(r359865)
+++ head/security/libtomcrypt/Makefile	Mon Jun 30 15:33:35 2014	(r359866)
@@ -13,13 +13,13 @@ COMMENT=	Comprehensive, modular, and por
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 MAKEFILE=	makefile
-MAKE_ARGS=	DESTDIR="${PREFIX}" LIBPATH="/lib" INCPATH="/include" \
-		DATAPATH="${DOCSDIR}/pdf"
+MAKE_ARGS=	DESTDIR="${STAGEDIR}" LIBPATH="${PREFIX}/lib" \
+		INCPATH="${PREFIX}/include" DATAPATH="${DOCSDIR}/pdf"
 
 USES=		gmake tar:bzip2
 ALL_TARGET=	library
 
-CFLAGS+=	-I${PREFIX}/include
+CFLAGS+=	-I${LOCALBASE}/include
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_DEFAULT=	LIBTOMMATH
@@ -28,7 +28,6 @@ OPTIONS_MULTI_MATH=	LIBTOMMATH TOMSFASTM
 LIBTOMMATH_DESC=	Use LibTomMath
 TOMSFASTMATH_DESC=	Use TomsFastMath
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MLIBTOMMATH}

Modified: head/security/libtomcrypt/files/patch-makefile
==============================================================================
--- head/security/libtomcrypt/files/patch-makefile	Mon Jun 30 15:23:28 2014	(r359865)
+++ head/security/libtomcrypt/files/patch-makefile	Mon Jun 30 15:33:35 2014	(r359866)
@@ -31,8 +31,8 @@
  	install -g $(GROUP) -o $(USER) $(HEADERS) $(DESTDIR)$(INCPATH)
  ifndef NODOCS
 -	install -g $(GROUP) -o $(USER) doc/crypt.pdf $(DESTDIR)$(DATAPATH)
-+	install -d -g $(GROUP) -o $(USER) $(DATAPATH)
-+	install -g $(GROUP) -o $(USER) doc/crypt.pdf $(DATAPATH)
++	install -d -g $(GROUP) -o $(USER) ${DESTDIR}$(DATAPATH)
++	install -g $(GROUP) -o $(USER) doc/crypt.pdf ${DESTDIR}$(DATAPATH)
  endif
  
  install_test: testprof/$(LIBTEST)