Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 30 Jul 2014 20:13:58 +0000 (UTC)
From:      Cy Schubert <cy@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r363511 - head/sysutils/cfengine36
Message-ID:  <201407302013.s6UKDwut015272@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: cy
Date: Wed Jul 30 20:13:58 2014
New Revision: 363511
URL: http://svnweb.freebsd.org/changeset/ports/363511
QAT: https://qat.redports.org/buildarchive/r363511/

Log:
  Fix muitiple build issues:
  
  - missing pcre.h
  - broken ltmain.sh - causing libpromises shared library naming issues.
  - other cleanup
  
  Submitted by:	bapt

Modified:
  head/sysutils/cfengine36/Makefile

Modified: head/sysutils/cfengine36/Makefile
==============================================================================
--- head/sysutils/cfengine36/Makefile	Wed Jul 30 20:06:24 2014	(r363510)
+++ head/sysutils/cfengine36/Makefile	Wed Jul 30 20:13:58 2014	(r363511)
@@ -29,8 +29,10 @@ USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 USES=		gmake libtool
+USE_AUTOTOOLS=	autoconf:env automake:env libtoolize:env
 CFLAGS+=	-Wno-return-type
 CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 # EXAMPLESDIR=	${PREFIX}/share/examples/cfengine3
 DOCSDIR=	${PREFIX}/share/doc/cfengine
 CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
@@ -42,34 +44,25 @@ CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
 		--with-pcre=${LOCALBASE} \
 		--with-lmdb=${LOCALBASE} \
 		--enable-fhs
+INSTALL_TARGET=	install-strip
 
 LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre \
 		liblmdb.so:${PORTSDIR}/databases/lmdb
 
 OPTIONS_DEFINE=	PGSQL MYSQL LIBVIRT
 
-.include <bsd.port.pre.mk>
+PGSQL_USES=		pgsql
+PGSQL_CONFIGURE_ON=	--with-postgresql=${LOCALBASE}
 
-.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL=		yes
-CONFIGURE_ARGS+=	--with-postgresql=${LOCALBASE}
-LIB_DEPENDS+=		libpq.so:${PORTSDIR}/databases/postgresql${PGSQL_VER}-client
-.endif
-
-.if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL=		yes
-CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
-LIB_DEPENDS+=		libmysqlclient.so:${PORTSDIR}/${_MYSQL_CLIENT}
-LDFLAGS+=		-L${LOCALBASE}/lib/mysql
-.endif
-
-.if ${PORT_OPTIONS:MLIBVIRT}
-CONFIGURE_ARGS+=	--with-libvirt=${LOCALBASE}
-LIB_DEPENDS+=		libvirt.so:${PORTSDIR}/devel/libvirt
-.endif
-
-post-install:
-	@cd ${STAGEDIR}${PREFIX}/libexec/cfengine && \
-		${LN} -s libpromises.so.3.0.6 libpromises.so.3
+MYSQL_USE=		MYSQL=yes
+MYSQL_CONFIGURE_ON=	--with-mysql=${LOCALBASE}
+MYSQL_LIB_DEPENDS=		libmysqlclient.so:${PORTSDIR}/${_MYSQL_CLIENT}
+MYSQL_LDFLAGS=		-L${LOCALBASE}/lib/mysql
 
-.include <bsd.port.post.mk>
+LIBVIRT_CONFIGURE_ON=	--with-libvirt=${LOCALBASE}
+LIBVIRT_LIB_DEPENDS+=		libvirt.so:${PORTSDIR}/devel/libvirt
+
+pre-configure:
+	@cd ${WRKSRC}; autoreconf -Wno-portability --force --install -I m4
+
+.include <bsd.port.mk>



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