ports/181618: [patch] sysutils/cfengine33: fix build with clang and some more

[Boris Samorodov]

>Number:         181618
>Category:       ports
>Synopsis:       [patch] sysutils/cfengine33: fix build with clang and some more
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 28 14:20:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Boris Samorodov
>Release:        FreeBSD 10.0-CURRENT
>Organization:
BSDprint
>Environment:
FreeBSD bsam.int.wart.ru 10.0-CURRENT FreeBSD 10.0-CURRENT #36 r254961: Wed Aug 28 02:04:00 SAMT 2013     bsam at bsam.int.wart.ru:/usr/obj/usr/src/sys/BB64X  amd64
>Description:
The port does build with clang:
-----
unix.c:530:28: error: implicit declaration of function 'jail_get' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
    while ((fbsd_lastjid = jail_get(fbsd_jparams, 4, 0)) > 0)
                           ^
-----
>How-To-Repeat:

>Fix:
. fix build with clang (CFLAGS+=-Wno-implicit-function-declaration);
. use a space (not tab) at headers;
. trim extra line at header;
. USE_GMAKE=yes -> USES=gmake;
. remove the indefinite article from COMMENT;
. remove --mandir from CONFIGURE_ARGS (already set in bsd.port.mk);
. use new syntax at LIB_DEPENDS;
. include <bsd.port.options.mk> instead of <bsd.port.pre.mk>;
. place unconditionned statements before those conditions.

Patch attached with submission follows:

Index: Makefile
===================================================================
--- Makefile	(revision 325431)
+++ Makefile	(working copy)
@@ -1,6 +1,5 @@
-# Created by:	jrhett at netconsonance.com
+# Created by: jrhett at netconsonance.com
 # $FreeBSD$
-#
 
 PORTNAME=	cfengine
 PORTVERSION=	3.3.8
@@ -11,7 +10,8 @@
 
 MAINTAINER=	cy at FreeBSD.org
 #		gjb at FreeBSD.org is also committer for this port
-COMMENT=	A systems administration tool for networks
+COMMENT=	Systems administration tool for networks
+
 LATEST_LINK=	cfengine33
 FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
 
@@ -22,16 +22,16 @@
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 # EXAMPLESDIR=	${PREFIX}/share/examples/cfengine3
 DOCSDIR=	${PREFIX}/share/doc/cfengine
 CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
 		--htmldir=${DOCSDIR}/html \
-		--mandir=${PREFIX}/man \
 		--with-pcre=${LOCALBASE} \
 		--enable-fhs
+CFLAGS+=	-Wno-implicit-function-declaration
+USES=		gmake
 
-LIB_DEPENDS+=	pcre.3:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre
 
 OPTIONS_DEFINE=	PGSQL MYSQL LIBVIRT
 OPTIONS_SINGLE=	DB
@@ -43,42 +43,42 @@
 LIBVIRT_DESC=	Enable libvirt integration
 OPTIONS_DEFAULT=TOKYOCABINET
 
-.include <bsd.port.pre.mk>
+MAN8=	cf-agent.8	cf-key.8	cf-monitord.8	\
+	cf-report.8	cf-serverd.8	cf-execd.8	\
+	cf-know.8	cf-promises.8	cf-runagent.8
 
+post-patch:
+		@${REINPLACE_CMD} -e '/^htmldir/s!=.*!= @htmldir@!'\
+				  ${WRKSRC}/docs/Makefile.in
+
+.include <bsd.port.options.mk>
+
 .if ${PORT_OPTIONS:MTOKYOCABINET}
 CONFIGURE_ARGS+=	--with-tokyocabinet=${LOCALBASE}
-LIB_DEPENDS+=	tokyocabinet.9:${PORTSDIR}/databases/tokyocabinet
+LIB_DEPENDS+=	libtokyocabinet.so:${PORTSDIR}/databases/tokyocabinet
 .endif
 
 .if ${PORT_OPTIONS:MQDBM}
 CONFIGURE_ARGS+=	--with-qdbm=${LOCALBASE}
-LIB_DEPENDS+=	qdbm.14:${PORTSDIR}/databases/qdbm
+LIB_DEPENDS+=	libqdbm.so:${PORTSDIR}/databases/qdbm
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=		yes
 CONFIGURE_ARGS+=	--with-postgresql=${LOCALBASE}
-LIB_DEPENDS+=		pq:${PORTSDIR}/databases/postgresql${PGSQL_VER}-client
+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+=		mysqlclient:${PORTSDIR}/${_MYSQL_CLIENT}
+LIB_DEPENDS+=		libmysqlclient.so:${PORTSDIR}/${_MYSQL_CLIENT}
 LDFLAGS+=		-L${LOCALBASE}/lib/mysql
 .endif
 
 .if ${PORT_OPTIONS:MLIBVIRT}
 CONFIGURE_ARGS+=	--with-libvirt=${LOCALBASE}
-LIB_DEPENDS+=		virt.1001:${PORTSDIR}/devel/libvirt
+LIB_DEPENDS+=		libvirt.so:${PORTSDIR}/devel/libvirt
 .endif
 
-MAN8=	cf-agent.8	cf-key.8	cf-monitord.8	\
-	cf-report.8	cf-serverd.8	cf-execd.8	\
-	cf-know.8	cf-promises.8	cf-runagent.8
-
-post-patch:
-		@${REINPLACE_CMD} -e '/^htmldir/s!=.*!= @htmldir@!'\
-				  ${WRKSRC}/docs/Makefile.in
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>


>Release-Note:
>Audit-Trail:
>Unformatted: