Date: Tue, 14 Feb 2006 14:20:55 +0100 (CET) From: Ralf van der Enden <tremere@cainites.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/93336: Make portlint happy Message-ID: <20060214132055.E167515D@mail.cainites.net> Resent-Message-ID: <200602141330.k1EDU3oF085711@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 93336 >Category: ports >Synopsis: Make portlint happy >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Feb 14 13:30:03 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Ralf van der Enden >Release: FreeBSD 6.0-RELEASE-p4 i386 >Organization: >Environment: System: FreeBSD lan.cainites.net 6.0-RELEASE-p4 FreeBSD 6.0-RELEASE-p4 #1: Wed Jan 25 13:35:08 CET 2006 root@lan.cainites.net:/usr/obj/usr/src/sys/HELLKERNEL i386 >Description: Add some changes to get rid of portlint errors/warnings >How-To-Repeat: >Fix: --- powerdns.diff begins here --- diff -ruN powerdns.org/Makefile powerdns/Makefile --- powerdns.org/Makefile Fri Nov 25 11:06:36 2005 +++ powerdns/Makefile Tue Feb 14 14:15:08 2006 @@ -8,7 +8,8 @@ PORTNAME= powerdns PORTVERSION= 2.9.19 CATEGORIES= dns ipv6 -MASTER_SITES= http://downloads.powerdns.com/releases/ +MASTER_SITES= http://downloads.powerdns.com/releases/ \ + http://mirrors.evolva.ro/powerdns.com/releases/ DISTNAME= pdns-${PORTVERSION} MAINTAINER= tremere@cainites.net @@ -18,10 +19,9 @@ USE_GMAKE= YES USE_SUBMAKE= YES -USE_REINPLACE= YES USE_AUTOTOOLS= libtool:15 INSTALLS_SHLIB= YES -CXXFLAGS+= -I${LOCALBASE}/include +CXXFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+= --with-modules="${CONFIGURE_MODULES} pipe" \ @@ -38,18 +38,7 @@ .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 500037 -USE_RCORDER= pdns.sh -RC_DIR= /etc/rc.d -RC_SUFX= -.else -USE_RC_SUBR+= pdns.sh -RC_DIR= ${PREFIX}/etc/rc.d -RC_SUFX= .sh -.endif - -PLIST_SUB+= RC_DIR=${RC_DIR} \ - RC_SUFX=${RC_SUFX} +USE_RC_SUBR+= pdns # use user config if possible .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) @@ -102,11 +91,7 @@ .endif .if defined(POWERDNS_WITH_RECURSOR) -.if ${OSVERSION} >= 500037 -USE_RCORDER+= pdns_recursor.sh -.else -USE_RC_SUBR+= pdns_recursor.sh -.endif +USE_RC_SUBR+= pdns_recursor CONFIGURE_ARGS+= --enable-recursor PLIST_SUB+= RECURSOR="" .else @@ -118,7 +103,7 @@ UCONTEXT!= ${AWK} '/setcontext/ { print "YES" }' \ /usr/include/ucontext.h .if ${UCONTEXT} == "" -BROKEN= "setcontext for recursor not found or FreeBSD version lower than 5.0" +BROKEN= setcontext for recursor not found or FreeBSD version lower than 5.0 .endif .endif .endif diff -ruN powerdns.org/Makefile.inc powerdns/Makefile.inc --- powerdns.org/Makefile.inc Thu Jan 1 01:00:00 1970 +++ powerdns/Makefile.inc Tue Feb 14 13:47:22 2006 @@ -0,0 +1 @@ +WITH_POSTGRESQL_DRIVER=YES diff -ruN powerdns.org/files/pdns.in powerdns/files/pdns.in --- powerdns.org/files/pdns.in Thu Jan 1 01:00:00 1970 +++ powerdns/files/pdns.in Tue Feb 14 14:09:00 2006 @@ -0,0 +1,35 @@ +#!/bin/sh +# +# $FreeBSD: ports/dns/powerdns/files/pdns.in,v 1.2 2005/11/04 10:27:39 kwm Exp $ +# + +# PROVIDE: pdns_server +# REQUIRE: DAEMON +# KEYWORD: FreeBSD shutdown + +# +# Add the following lines to /etc/rc.conf to enable powerdns: +# +#pdns_enable="YES" +# +# See pdns_server(8) for flags. +# + +. %%RC_SUBR%% + +name=pdns +rcvar=`set_rcvar` + +command=%%PREFIX%%/sbin/pdns_server + +# set defaults + +pdns_enable=${pdns_enable:-"NO"} +pdns_conf=${pdns_conf:-"%%PREFIX%%/etc/pdns.conf"} +pdns_flags=${pdns_flags:-""} + +load_rc_config ${name} + +required_files=${pdns_conf} + +run_rc_command "$1" diff -ruN powerdns.org/files/pdns.sh.in powerdns/files/pdns.sh.in --- powerdns.org/files/pdns.sh.in Fri Nov 4 11:27:39 2005 +++ powerdns/files/pdns.sh.in Thu Jan 1 01:00:00 1970 @@ -1,35 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: ports/dns/powerdns/files/pdns.sh.in,v 1.2 2005/11/04 10:27:39 kwm Exp $ -# - -# PROVIDE: pdns_server -# REQUIRE: DAEMON -# KEYWORD: FreeBSD shutdown - -# -# Add the following lines to /etc/rc.conf to enable powerdns: -# -#pdns_enable="YES" -# -# See pdns_server(8) for flags. -# - -. %%RC_SUBR%% - -name=pdns -rcvar=`set_rcvar` - -command=%%PREFIX%%/sbin/pdns_server - -# set defaults - -pdns_enable=${pdns_enable:-"NO"} -pdns_conf=${pdns_conf:-"%%PREFIX%%/etc/pdns.conf"} -pdns_flags=${pdns_flags:-""} - -load_rc_config ${name} - -required_files=${pdns_conf} - -run_rc_command "$1" diff -ruN powerdns.org/files/pdns_recursor.in powerdns/files/pdns_recursor.in --- powerdns.org/files/pdns_recursor.in Thu Jan 1 01:00:00 1970 +++ powerdns/files/pdns_recursor.in Tue Feb 14 14:09:12 2006 @@ -0,0 +1,35 @@ +#!/bin/sh +# +# $FreeBSD: ports/dns/powerdns/files/pdns_recursor.in,v 1.2 2005/11/04 10:27:39 kwm Exp $ +# + +# PROVIDE: pdns_recursor +# REQUIRE: DAEMON +# KEYWORD: FreeBSD shutdown + +# +# Add the following lines to /etc/rc.conf to enable pdns_recursor: +# +#pdns_recursor_enable="YES" +# +# See http://rtfm.powerdns.com for flags. +# + +. %%RC_SUBR%% + +name=pdns_recursor +rcvar=`set_rcvar` + +command=%%PREFIX%%/sbin/pdns_recursor + +# set defaults + +pdns_recursor_enable=${pdns_recursor_enable:-"NO"} +pdns_recursor_conf=${pdns_recursor_conf:-"%%PREFIX%%/etc/recursor.conf"} +pdns_recursor_flags=${pdns_recursor_flags:-""} + +load_rc_config ${name} + +required_files=${pdns_recursor_conf} + +run_rc_command "$1" diff -ruN powerdns.org/files/pdns_recursor.sh.in powerdns/files/pdns_recursor.sh.in --- powerdns.org/files/pdns_recursor.sh.in Fri Nov 4 11:27:39 2005 +++ powerdns/files/pdns_recursor.sh.in Thu Jan 1 01:00:00 1970 @@ -1,35 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: ports/dns/powerdns/files/pdns_recursor.sh.in,v 1.2 2005/11/04 10:27:39 kwm Exp $ -# - -# PROVIDE: pdns_recursor -# REQUIRE: DAEMON -# KEYWORD: FreeBSD shutdown - -# -# Add the following lines to /etc/rc.conf to enable pdns_recursor: -# -#pdns_recursor_enable="YES" -# -# See http://rtfm.powerdns.com for flags. -# - -. %%RC_SUBR%% - -name=pdns_recursor -rcvar=`set_rcvar` - -command=%%PREFIX%%/sbin/pdns_recursor - -# set defaults - -pdns_recursor_enable=${pdns_recursor_enable:-"NO"} -pdns_recursor_conf=${pdns_recursor_conf:-"%%PREFIX%%/etc/recursor.conf"} -pdns_recursor_flags=${pdns_recursor_flags:-""} - -load_rc_config ${name} - -required_files=${pdns_recursor_conf} - -run_rc_command "$1" --- powerdns.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060214132055.E167515D>