From owner-svn-ports-all@FreeBSD.ORG Mon Mar 30 18:00:39 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 032EA2E0; Mon, 30 Mar 2015 18:00:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D97B6A7B; Mon, 30 Mar 2015 18:00:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2UI0cLG028331; Mon, 30 Mar 2015 18:00:38 GMT (envelope-from pawel@FreeBSD.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2UI0cYC028330; Mon, 30 Mar 2015 18:00:38 GMT (envelope-from pawel@FreeBSD.org) Message-Id: <201503301800.t2UI0cYC028330@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pawel set sender to pawel@FreeBSD.org using -f From: Pawel Pekala Date: Mon, 30 Mar 2015 18:00:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r382701 - head/mail/tpop3d X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Mar 2015 18:00:39 -0000 Author: pawel Date: Mon Mar 30 18:00:38 2015 New Revision: 382701 URL: https://svnweb.freebsd.org/changeset/ports/382701 QAT: https://qat.redports.org/buildarchive/r382701/ Log: - Fix build when GDBMAUTH=on [1] - Use options helpers - Correct CFLAGS handling - don't append "-g -O2" to our flags - Remove optional installation of DOCS, staging takes care of that PR: 198918 [1] Reported by: vas@mpeks.tomsk.su [1] Modified: head/mail/tpop3d/Makefile Modified: head/mail/tpop3d/Makefile ============================================================================== --- head/mail/tpop3d/Makefile Mon Mar 30 17:58:41 2015 (r382700) +++ head/mail/tpop3d/Makefile Mon Mar 30 18:00:38 2015 (r382701) @@ -41,39 +41,20 @@ PASSWDAUTH_CONFIGURE_ENABLE= auth-passwd MBOXINDICES_CONFIGURE_ENABLE= mbox-bsd-save-indices DRAC_BUILD_DEPENDS= ${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac +GDBMAUTH_CPPFLAGS= -I${LOCALBASE}/include GDBMAUTH_LIB_DEPENDS= libgdbm.so:${PORTSDIR}/databases/gdbm - -.include - -# MySQL authentication -.if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes -CONFIGURE_ARGS+= --enable-auth-mysql \ +MYSQL_USE= MYSQL=yes +MYSQL_CONFIGURE_ON= --enable-auth-mysql \ --with-mysql-lib-dir=${LOCALBASE}/lib/mysql \ --with-mysql-include-dir=${LOCALBASE}/include/mysql -.endif - -.if ${PORT_OPTIONS:MPGSQL} -USES+= pgsql -DEFAULT_PGSQL_VER= 80 -CONFIGURE_ARGS+= --enable-auth-pgsql \ +PGSQL_USES= pgsql +PGSQL_CONFIGURE_ON= --enable-auth-pgsql \ --with-pgsql-lib-dir=${LOCALBASE}/lib \ --with-pgsql-include-dir=${LOCALBASE}/include -.endif - -.if ${PORT_OPTIONS:MLDAP} -USE_OPENLDAP= yes -CONFIGURE_ARGS+= --enable-auth-ldap --with-openldap-root=${LOCALBASE} -.endif - -# Perl authentication -.if ${PORT_OPTIONS:MPERLAUTH} -USES+= perl5 -.endif - -.if ${PORT_OPTIONS:MFIX_PERLAUTH} -EXTRA_PATCHES+=${PATCHDIR}/extra-patch-auth_perl.c -.endif +LDAP_USE= OPENLDAP=yes +LDAP_CONFIGURE_ON= --enable-auth-ldap --with-openldap-root=${LOCALBASE} +PERLAUTH_USES= perl5 +FIX_PERLAUTH_EXTRA_PATCHES=${PATCHDIR}/extra-patch-auth_perl.c USE_RC_SUBR= tpop3d DEFAULT_CONFIG= ${PREFIX}/etc/tpop3d.conf.sample @@ -82,7 +63,7 @@ PORTDOCS= CHANGES CREDITS FAQ HACKING IN README README.POP-before-SMTP README.auth_mysql TODO post-patch: - @${REINPLACE_CMD} 's,^CFLAGS =, CFLAGS = \@CFLAGS\@,' \ + @${REINPLACE_CMD} '/^CFLAGS/ s, -g -O2,,' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} 's,/etc/tpop3d,${PREFIX}/etc/tpop3d,g' \ ${WRKSRC}/tpop3d.conf.5 ${WRKSRC}/tpop3d.8 @@ -93,9 +74,7 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/tpop3d.conf.5 ${STAGEDIR}${MANPREFIX}/man/man5 ${INSTALL_MAN} ${WRKSRC}/tpop3d.8 ${STAGEDIR}${MANPREFIX}/man/man8 ${INSTALL_PROGRAM} ${WRKSRC}/tpop3d ${STAGEDIR}${PREFIX}/sbin -.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} -.endif .include