From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Mar 20 21:00:08 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 47CBE16A4CE for ; Sun, 20 Mar 2005 21:00:08 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E660343D2F for ; Sun, 20 Mar 2005 21:00:07 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j2KL072f054707 for ; Sun, 20 Mar 2005 21:00:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j2KL07J1054705; Sun, 20 Mar 2005 21:00:07 GMT (envelope-from gnats) Resent-Date: Sun, 20 Mar 2005 21:00:07 GMT Resent-Message-Id: <200503202100.j2KL07J1054705@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jose M Rodriguez Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 10DB916A4CE; Sun, 20 Mar 2005 20:52:00 +0000 (GMT) Received: from 62-15-215-140.inversas.jazztel.es (62-15-215-140.inversas.jazztel.es [62.15.215.140]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2608B43D41; Sun, 20 Mar 2005 20:51:58 +0000 (GMT) (envelope-from josemi@freebsd.jazztel.es) Received: from redesjm.local (orion.redesjm.local [192.168.254.16]) j2KKpwgi010604; Sun, 20 Mar 2005 21:51:59 +0100 (CET) (envelope-from freebsd@redesjm.local) Received: (from freebsd@localhost) by redesjm.local (8.13.3/8.13.3/Submit) id j2KKqEiS006633; Sun, 20 Mar 2005 21:52:14 +0100 (CET) (envelope-from freebsd) Message-Id: <200503202052.j2KKqEiS006633@redesjm.local> Date: Sun, 20 Mar 2005 21:52:14 +0100 (CET) From: Jose M Rodriguez To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: oliver@FreeBSD.org Subject: ports/79062: [PATCH] courier-authlib linting X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Jose M Rodriguez List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Mar 2005 21:00:08 -0000 >Number: 79062 >Category: ports >Synopsis: [PATCH] courier-authlib linting >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Mar 20 21:00:07 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Jose M Rodriguez >Release: FreeBSD 5.4-PRERELEASE i386 >Organization: Redes JM >Environment: System: FreeBSD orion.redesjm.local 5.4-PRERELEASE FreeBSD 5.4-PRERELEASE #0: Sat Mar 19 12:40:13 CET 2005 root@orion.redesjm.local:/usr/obj/usr/src/sys/ORION i386 >Description: - Makefile linting - Merge sysconfdir and userdb configurable from courier-imap - Make the port conflicts with mail/courier >How-To-Repeat: >Fix: attached patch --- patch-courier-authlib begins here --- diff -Nru /usr/HEAD/ports/mail/courier-authlib/Makefile mail/courier-authlib/Makefile --- /usr/HEAD/ports/mail/courier-authlib/Makefile Tue Mar 15 21:16:05 2005 +++ mail/courier-authlib/Makefile Sun Mar 20 21:40:26 2005 @@ -5,24 +5,26 @@ # $FreeBSD: ports/mail/courier-authlib/Makefile,v 1.12 2005/03/15 19:41:40 oliver Exp $ # -PORTNAME= courier-authlib -PORTVERSION= 0.55 -PORTREVISION= 1 -CATEGORIES= mail -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +PORTNAME= courier-authlib +PORTVERSION= 0.55 +PORTREVISION= 1 +CATEGORIES= mail +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= courier MAINTAINER= oliver@FreeBSD.org COMMENT= Authentication library used by courier ports -USE_BZIP2= yes -USE_REINPLACE= yes -USE_PERL5= yes -GNU_CONFIGURE= yes -USE_GMAKE= yes -USE_RC_SUBR= yes -USE_LIBTOOL_VER=15 -USE_LIBLTDL= yes +CONFLICTS= courier-0.* + +USE_BZIP2= yes +USE_REINPLACE= yes +USE_PERL5= yes +GNU_CONFIGURE= yes +USE_GMAKE= yes +USE_RC_SUBR= yes +USE_LIBTOOL_VER= 15 +USE_LIBLTDL= yes # # options available: @@ -40,16 +42,21 @@ GDBM "Use gdbm files instead of bdb" off \ AUTHUSERDB "Build with authuserdb" on -VPOPMAILDIR?= ${LOCALBASE}/vpopmail -WITH_MAILUSER?= daemon -WITH_MAILGROUP?=daemon +VPOPMAILDIR?= ${LOCALBASE}/vpopmail +WITH_MAILUSER?= daemon +WITH_MAILGROUP?= daemon +CONFDIR?= ${PREFIX}/etc +USERDB?= ${PREFIX}/etc/userdb + +PLIST_SUB= CONFDIR=${CONFDIR:S,^${PREFIX}/,,} \ CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ CXXFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ LIBS="${LDFLAGS} -L${LOCALBASE}/lib" CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --without-authshadow \ +CONFIGURE_ARGS= --sysconfdir=${CONFDIR} \ + --without-authshadow \ --without-authcustom \ --enable-unicode \ --enable-ltdl-install=no \ @@ -60,69 +67,71 @@ .include .if defined(WITH_SYSLOG_FACILITY) -CONFIGURE_ARGS+=--with-syslog=${WITH_SYSLOG_FACILITY} +CONFIGURE_ARGS+= --with-syslog=${WITH_SYSLOG_FACILITY} .endif .if defined(WITH_GDBM) -LIB_DEPENDS+= gdbm.3:${PORTSDIR}/databases/gdbm -CONFIGURE_ARGS+=--with-db=gdbm +LIB_DEPENDS+= gdbm.3:${PORTSDIR}/databases/gdbm +CONFIGURE_ARGS+= --with-db=gdbm .else -CONFIGURE_ARGS+=--with-db=db +CONFIGURE_ARGS+= --with-db=db .endif .if !defined(WITH_VPOPMAIL) -CONFIGURE_ARGS+=--without-authvchkpw -PLIST_SUB+= VPOPMAILFLAG="@comment " +CONFIGURE_ARGS+= --without-authvchkpw +PLIST_SUB+= VPOPMAILFLAG="@comment " .else -CONFIGURE_ARGS+=--with-authvchkpw +CONFIGURE_ARGS+= --with-authvchkpw BUILD_DEPENDS+= ${VPOPMAILDIR}/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail PLIST_SUB+= VPOPMAILFLAG="" .endif .if defined(WITH_LDAP) -USE_OPENLDAP= yes -CONFIGURE_ARGS+=--with-authldap -PLIST_SUB+= LDAPFLAG="" +USE_OPENLDAP= yes +CONFIGURE_ARGS+= --with-authldap +PLIST_SUB+= LDAPFLAG="" .else -CONFIGURE_ARGS+=--without-authldap -PLIST_SUB+= LDAPFLAG="@comment " +CONFIGURE_ARGS+= --without-authldap +PLIST_SUB+= LDAPFLAG="@comment " .endif .if !defined(WITH_MYSQL) -CONFIGURE_ARGS+=--without-authmysql -PLIST_SUB+= MYSQLFLAG="@comment " +CONFIGURE_ARGS+= --without-authmysql +PLIST_SUB+= MYSQLFLAG="@comment " .else -USE_MYSQL= YES -PLIST_SUB+= MYSQLFLAG="" -CONFIGURE_ARGS+=--with-authmysql \ - --with-mysql-libs=${LOCALBASE}/lib/mysql \ - --with-mysql-includes=${LOCALBASE}/include/mysql +USE_MYSQL= YES +PLIST_SUB+= MYSQLFLAG="" +CONFIGURE_ARGS+= --with-authmysql \ + --with-mysql-libs=${LOCALBASE}/lib/mysql \ + --with-mysql-includes=${LOCALBASE}/include/mysql .endif .if !defined(WITH_POSTGRESQL) -CONFIGURE_ARGS+=--without-authpgsql -PLIST_SUB+= PGSQLFLAG="@comment " +CONFIGURE_ARGS+= --without-authpgsql +PLIST_SUB+= PGSQLFLAG="@comment " .else -USE_PGSQL= YES -PLIST_SUB+= PGSQLFLAG="" +USE_PGSQL= YES +PLIST_SUB+= PGSQLFLAG="" .endif .if !defined(WITHOUT_PAM) -CONFIGURE_ARGS+=--with-authpam -PLIST_SUB+= PAMFLAG="" +CONFIGURE_ARGS+= --with-authpam +PLIST_SUB+= PAMFLAG="" .else -CONFIGURE_ARGS+=--without-authpam -PLIST_SUB+= PAMFLAG="@comment " +CONFIGURE_ARGS+= --without-authpam +PLIST_SUB+= PAMFLAG="@comment " .endif .if defined(WITHOUT_AUTHUSERDB) -CONFIGURE_ARGS+=--without-authuserdb -PLIST_SUB+= AUTHUSERDBFLAG="@comment " +CONFIGURE_ARGS+= --without-authuserdb +PLIST_SUB+= AUTHUSERDBFLAG="@comment " .else -PLIST_SUB+= AUTHUSERDBFLAG="" +CONFIGURE_ARGS+= --with-userdb=${USERDB} +PLIST_SUB+= AUTHUSERDBFLAG="" +PLIST_SUB+= USERDB=${USERDB:S,^${PREFIX}/,,} .endif -RC_SCRIPTS_SUB=PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} MAILUSER=${WITH_MAILUSER} MAILGROUP=${WITH_MAILGROUP} +RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} MAILUSER=${WITH_MAILUSER} MAILGROUP=${WITH_MAILGROUP} MAN1= courierlogger.1 diff -Nru /usr/HEAD/ports/mail/courier-authlib/pkg-plist mail/courier-authlib/pkg-plist --- /usr/HEAD/ports/mail/courier-authlib/pkg-plist Tue Mar 15 21:16:05 2005 +++ mail/courier-authlib/pkg-plist Sun Mar 20 19:08:13 2005 @@ -1,11 +1,11 @@ @unexec [ ! -f /var/run/authdaemond/pid ] || %D/etc/rc.d/courier-authdaemond.sh stop || true bin/courierauthconfig etc/rc.d/courier-authdaemond.sh -%%MYSQLFLAG%%etc/authlib/authmysqlrc.dist -%%PGSQLFLAG%%etc/authlib/authpgsqlrc.dist -%%LDAPFLAG%%etc/authlib/authldaprc.dist -@unexec if cmp -s %D/etc/authlib/authdaemonrc.dist %D/etc/authlib/authdaemonrc; then rm -f %D/etc/authlib/authdaemonrc; fi -etc/authlib/authdaemonrc.dist +%%MYSQLFLAG%%%%CONFDIR%%/authlib/authmysqlrc.dist +%%PGSQLFLAG%%%%CONFDIR%%/authlib/authpgsqlrc.dist +%%LDAPFLAG%%%%CONFDIR%%/authlib/authldaprc.dist +@unexec if cmp -s %D/%%CONFDIR%%/authlib/authdaemonrc.dist %D/%%CONFDIR%%/authlib/authdaemonrc; then rm -f %D/%%CONFDIR%%/authlib/authdaemonrc; fi +%%CONFDIR%%/authlib/authdaemonrc.dist include/courier_auth_config.h include/courierauth.h include/courierauthsasl.h @@ -62,6 +62,6 @@ %%PORTDOCS%%%%DOCSDIR%%/README_authlib.html %%PORTDOCS%%@dirrm %%DOCSDIR%% @unexec rmdir /var/run/authdaemond 2>/dev/null || true -@unexec rmdir %D/etc/authlib 2>/dev/null || true +@unexec rmdir %D/%%CONFDIR%%/authlib 2>/dev/null || true @dirrm lib/courier-authlib @dirrm libexec/courier-authlib --- patch-courier-authlib ends here --- >Release-Note: >Audit-Trail: >Unformatted: