svn commit: r409238 - head/lang/sagittarius-scheme

Dmitry Marakasov amdmi3 at FreeBSD.org
Sat Feb 20 13:50:13 UTC 2016


Author: amdmi3
Date: Sat Feb 20 13:50:12 2016
New Revision: 409238
URL: https://svnweb.freebsd.org/changeset/ports/409238

Log:
  - Remove unneeded CMAKE_ARGS
  - Switch to options helpers
  - Set MAKE_ENV to fix touching filesystem outdire WRKDIR during build:
  
  ====>> Error: Filesystem touched during build:
  extra: root/.sagittarius
  
  Approved by:	portmgr blanket

Modified:
  head/lang/sagittarius-scheme/Makefile

Modified: head/lang/sagittarius-scheme/Makefile
==============================================================================
--- head/lang/sagittarius-scheme/Makefile	Sat Feb 20 13:34:11 2016	(r409237)
+++ head/lang/sagittarius-scheme/Makefile	Sat Feb 20 13:50:12 2016	(r409238)
@@ -25,21 +25,12 @@ MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	ODBC
 
-CMAKE_ARGS+=	-DINSTALL_PREFIX=${PREFIX}
-
 PLIST_SUB=	PORTNAME=sagittarius PORTVERSION=${PORTVERSION}
 
 ODBC_LIB_DEPENDS=	libiodbc.so:${PORTSDIR}/databases/libiodbc
 ODBC_CMAKE_ON=		-DODBC_INCLUDE_DIR:STRING=${LOCALBASE}/include/libiodbc
 OPTIONS_SUB=		ODBC
 
-.include <bsd.port.options.mk>
-
-.if !${PORT_OPTIONS:MODBC}
-post-patch:
-	@${REINPLACE_CMD} -e '/odbc odbc/d' ${WRKSRC}/ext/CMakeLists.txt
-.endif
-
 .include <bsd.port.pre.mk>
 
 .if ${ARCH}=="i386"
@@ -51,10 +42,13 @@ PLIST_ARCH=	x86_64
 
 PLIST_SUB+=	PLIST_ARCH=${PLIST_ARCH}
 
+post-patch-ODBC-off:
+	@${REINPLACE_CMD} -e '/odbc odbc/d' ${WRKSRC}/ext/CMakeLists.txt
+
 post-install:
 	@${LN} -sf ${PREFIX}/bin/sagittarius ${STAGEDIR}${PREFIX}/bin/sash
 
 post-build:
-	@${GMAKE} -C ${WRKSRC} doc
+	@${SETENV} ${MAKE_ENV} ${GMAKE} -C ${WRKSRC} doc
 
 .include <bsd.port.post.mk>


More information about the svn-ports-all mailing list