From mandree@FreeBSD.org  Mon Mar 21 20:32:21 2011
Return-Path: <mandree@FreeBSD.org>
Received: from apollo.emma.line.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28])
	by hub.freebsd.org (Postfix) with ESMTP id D41EA106564A;
	Mon, 21 Mar 2011 20:32:20 +0000 (UTC)
	(envelope-from mandree@FreeBSD.org)
Received: from mandree by apollo.emma.line.org with local (Exim 4.74 (FreeBSD))
	(envelope-from <mandree@FreeBSD.org>)
	id 1Q1lm0-000OLu-0V; Mon, 21 Mar 2011 21:32:20 +0100
Message-Id: <E1Q1lm0-000OLu-0V@apollo.emma.line.org>
Date: Mon, 21 Mar 2011 21:32:20 +0100
From: Matthias Andree <mandree@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: gtodd@bellanet.org
Subject: [PATCH] security/pks: update to 0.9.6.20040312
X-Send-Pr-Version: 3.113
X-GNATS-Notify: gtodd@bellanet.org

>Number:         155760
>Category:       ports
>Synopsis:       [PATCH] security/pks: update to 0.9.6.20040312
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    mandree
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 21 20:40:07 UTC 2011
>Closed-Date:    Tue Apr 12 21:53:04 UTC 2011
>Last-Modified:  Tue Apr 12 22:00:20 UTC 2011
>Originator:     Matthias Andree
>Release:        FreeBSD 8.2-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD apollo.emma.line.org 8.2-RELEASE FreeBSD 8.2-RELEASE #65: Fri Feb 25 01:47:50 CET 2011
>Description:
- Update to 0.9.6.20040312 (actually the latest snapshot)

Purpose is to get rid of Berkeley DB 2 and use a modern version.

Added file(s):
- files/patch-configure.in

Port maintainer (gtodd@bellanet.org) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- pks-0.9.6.20040312.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/security/pks/Makefile,v
retrieving revision 1.13
diff -u -u -r1.13 Makefile
--- Makefile	22 Aug 2009 00:35:01 -0000	1.13
+++ Makefile	21 Mar 2011 20:02:11 -0000
@@ -5,48 +5,45 @@
 # $FreeBSD: ports/security/pks/Makefile,v 1.13 2009/08/22 00:35:01 amdmi3 Exp $
 #
 
-PORTNAME=	pks
-PORTVERSION=	0.9.6
-PORTREVISION=	1
-CATEGORIES=	security www
-MASTER_SITES=	SF
+PORTNAME=		pks
+PORTVERSION=		0.9.6.20040312
+CATEGORIES=		security www
+MASTER_SITES=		http://pks.sourceforge.net/:sf ${MASTER_SITE_LOCAL}:local
+MASTER_SITE_SUBDIR=	.:sf mandree:local
+DISTFILES=		pks-current.tgz:sf,local
 
 MAINTAINER=	gtodd@bellanet.org
 COMMENT=	PGP Public Key Server
 
-USE_BDB=	yes
-WANT_BDB_VER=	2
+USE_BDB=		41 # 42 would be ok
+WRKSRC=			${WRKDIR}/${PORTNAME}
+
+.include <bsd.port.pre.mk>
 
 GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	autoconf
 CONFIGURE_ARGS=	--datadir=${PREFIX}/share/pks --localstatedir=/var/pks \
 		--sysconfdir=${EXAMPLESDIR} \
 		--libdir=${LOCALBASE}/lib --with-libwrap
-CFLAGS+=	-I${BDB_INCLUDE_DIR}
 MAKE_ENV+=	LDFLAGS=-L${LOCALBASE}/lib SUBDIRS=
+CONFIGURE_ENV=	DBLIB="-L${BDB_LIB_DIR} -l${BDB_LIB_NAME}" DBINC=-I${BDB_INCLUDE_DIR} DBHDR=db.h
 
 USE_RC_SUBR=	pksd.sh
 MAN5=		pksd.conf.5
-MAN8=		pks-intro.8 pksclient.8 pksd.8 pksdctl.8
-SUB_FILES=	pkg-message pkg-deinstall
+MAN8=		pks-intro.8 pksclient.8 pksd.8 pksdctl.8 pks-mail.sh.8 \
+		pks-queue-run.sh.8 pgpsplit.8
 
-# remove embedded sleepycat, remove associated build commands, make
-# the build use the headers and libraries from the db2 port
-post-patch:
-	${RM} -rf ${WRKSRC}/db2-sleepycat
-	${REINPLACE_CMD} 's|SUBDIRS =.*|SUBDIRS =|; \
-			  s|LIBDB =.*|LIBDB = -L${LOCALBASE}/lib -l${BDB_LIB_NAME}|; \
-			  s|DBDIR =.*|DBDIR = ${BDB_INCLUDE_DIR}|' \
-			  ${WRKSRC}/Makefile.in
+SUB_FILES=	pkg-message pkg-deinstall
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/pksd.conf ${PREFIX}/etc/pksd.conf.sample
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/pks_help.en ${WRKSRC}/pks_help.es ${WRKSRC}/pks_help.fr \
-       	${WRKSRC}/pks_help.cz ${WRKSRC}/pks_help.de ${WRKSRC}/pks_help.ja \
+	${WRKSRC}/pks_help.cz ${WRKSRC}/pks_help.de ${WRKSRC}/pks_help.ja \
 	${WRKSRC}/mail_intro ${DOCSDIR}
 	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .endif
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/security/pks/distinfo,v
retrieving revision 1.4
diff -u -u -r1.4 distinfo
--- distinfo	24 Jan 2006 01:03:21 -0000	1.4
+++ distinfo	21 Mar 2011 19:39:19 -0000
@@ -1,3 +1,2 @@
-MD5 (pks-0.9.6.tar.gz) = 19427b543972c23fbc1c167d5408d3a9
-SHA256 (pks-0.9.6.tar.gz) = 419fff7df644ac11d92ca5b7981e0a6f1e10f74605eb1602f7b39e272d8b079c
-SIZE (pks-0.9.6.tar.gz) = 559872
+SHA256 (pks-current.tgz) = 839b63c7a4a0a6ef4c933f4205ac425ca5154c39ca32a7d9b79dc86b6d19c8b7
+SIZE (pks-current.tgz) = 217922
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/security/pks/pkg-plist,v
retrieving revision 1.3
diff -u -u -r1.3 pkg-plist
--- pkg-plist	8 Oct 2005 07:44:07 -0000	1.3
+++ pkg-plist	21 Mar 2011 19:57:07 -0000
@@ -6,6 +6,8 @@
 bin/pksdctl
 etc/pksd.conf.sample
 %%DATADIR%%/mail_intro
+%%DATADIR%%/pks-commands.html
+%%DATADIR%%/pks-commands.php
 %%PORTDOCS%%%%DOCSDIR%%/mail_intro
 %%PORTDOCS%%%%DOCSDIR%%/pks_help.en
 %%PORTDOCS%%%%DOCSDIR%%/pks_help.es
Index: files/patch-configure.in
===================================================================
RCS file: files/patch-configure.in
diff -N files/patch-configure.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-configure.in	21 Mar 2011 19:50:45 -0000
@@ -0,0 +1,129 @@
+--- ./configure.in.orig	2011-03-21 20:49:39.000000000 +0100
++++ ./configure.in	2011-03-21 20:50:42.000000000 +0100
+@@ -74,126 +74,6 @@
+ # Checks for libraries.
+ dnl Checks for Berkeley DB
+ AC_MSG_CHECKING(for Berkeley DB)
+-AC_ARG_WITH(db,
+-[  --with-db=DIR           Use Berkeley DB in DIR],
+-[DBINC=NO
+-  DBLIB=NO
+-  DBHDR=NO
+-  S=1
+-  case "$withval" in
+-  yes|no)
+-      AC_ERROR(Berkeley DB was not found. Please check your installation or use --with-db=PATH)
+-     ;;
+-  *)
+-  AC_MSG_RESULT($withval)
+-  if test x${withval} = x ; then
+-          withval=/tmp
+-  fi
+-  if test $S -a -r ${withval}/build_unix/db4.h -a \
+-          -r "`ls ${withval}/build_unix/.libs/libdb-4.*.a 2>/dev/null | tail -1`"; then
+-          DBINC=-I`echo ${withval}/build_unix/`
+-          DBLIB=`ls ${withval}/build_unix/.libs/libdb-4.*.a 2>/dev/null | tail -1`
+-          DBHDR="db4.h"
+-          grep 'DB_VERSION_MAJOR	4$' ${withval}/build_unix/db4.h >/dev/null 2>&1
+-          S=$?
+-  fi
+-  if test $S -a -r ${withval}/build_unix/db.h -a \
+-          -r "`ls ${withval}/build_unix/.libs/libdb-4.*.a 2>/dev/null | tail -1`"; then
+-          DBINC=-I`echo ${withval}/build_unix`
+-          DBLIB=`ls ${withval}/build_unix/.libs/libdb-4.*.a 2>/dev/null | tail -1`
+-          DBHDR="db.h"
+-          grep 'DB_VERSION_MAJOR	4$' ${withval}/build_unix/db.h >/dev/null 2>&1
+-          S=$?
+-  fi
+-  if test $S -a -r ${withval}/include/db4/db.h -a \
+-          -r ${withval}/lib/db4/libdb.a ; then
+-          DBINC="-I${withval}/include/db4"
+-          DBLIB="-L${withval}/lib/db4 -ldb"
+-          DBHDR="db.h"
+-          grep 'DB_VERSION_MAJOR	4$' ${withval}/include/db4/db.h >/dev/null 2>&1
+-          S=$?
+-  fi
+-  if test $S -a -r ${withval}/include/db4.h -a \
+-          -r ${withval}/lib/libdb.a ; then
+-          DBINC="-I${withval}/include"
+-          DBLIB="-L${withval}/lib -ldb"
+-          DBHDR="db4.h"
+-          grep 'DB_VERSION_MAJOR	4$' ${withval}/include/db4.h >/dev/null 2>&1
+-          S=$?
+-  fi
+-  if test $S -a -r ${withval}/include/db.h -a \
+-          -r ${withval}/lib/libdb.a ; then
+-          DBINC="-I${withval}/include"
+-          DBLIB="-L${withval}/lib -ldb"
+-          DBHDR="db.h"
+-          grep 'DB_VERSION_MAJOR	4$' ${withval}/include/db.h >/dev/null 2>&1
+-          S=$?
+-  fi
+-  if test $S -eq 1 ; then
+-      AC_ERROR(Berkeley DB was not found. Please check your installation or use --with-db=DIR)
+-  fi
+-  AC_MSG_RESULT(yes)
+-  esac ],
+-[DBINC=NO
+-  DBLIB=NO
+-  DBHDR=NO
+-  S=1
+-
+-  if test $S -a -r /usr/local/include/db4.h -a \
+-          -r /usr/local/lib/libdb.a ; then
+-          DBINC="-I/usr/local/include"
+-          DBLIB="-L/usr/local/lib -ldb"
+-          DBHDR="db4.h"
+-          grep 'DB_VERSION_MAJOR	4$' /usr/local/include/db4.h >/dev/null 2>&1
+-          S=$?
+-  fi
+-  if test $S -a -r /usr/local/include/db.h -a \
+-          -r /usr/local/lib/libdb.a ; then
+-          DBINC="-I/usr/local/include"
+-          DBLIB="-L/usr/local/lib -ldb"
+-          DBHDR="db.h"
+-          grep 'DB_VERSION_MAJOR	4$' /usr/local/include/db.h >/dev/null 2>&1
+-          S=$?
+-  fi
+-  if test $S -a -r /usr/include/db4.h -a \
+-          -r /usr/lib/libdb.a ; then
+-          DBINC=""
+-          DBLIB="-L/usr/lib -ldb"
+-          DBHDR="db4.h"
+-          grep 'DB_VERSION_MAJOR	4$' /usr/include/db4.h >/dev/null 2>&1
+-          S=$?
+-  fi
+-  if test $S -a -r /usr/include/db.h -a \
+-          -r /usr/lib/libdb.a ; then
+-          DBINC=""
+-          DBLIB="-L/usr/lib -ldb"
+-          DBHDR="db.h"
+-          grep 'DB_VERSION_MAJOR	4$' /usr/include/db.h >/dev/null 2>&1
+-          S=$?
+-  fi
+-  DIR=`ls -d ../db-4.*/. 2>/dev/null | tail -1`
+-  if test $S -a -r ${DIR}/build_unix/db4.h -a \
+-          -r "`ls ${DIR}/build_unix/.libs/libdb-4.*.a 2>/dev/null | tail -1`"; then
+-          DBINC=-I`echo ${DIR}/build_unix/`
+-          DBLIB=`ls ${DIR}/build_unix/.libs/libdb-4.*.a 2>/dev/null | tail -1`
+-          DBHDR="db4.h"
+-          grep 'DB_VERSION_MAJOR	4$' ${DIR}/build_unix/db4.h >/dev/null 2>&1
+-          S=$?
+-  fi
+-  if test $S -a -r ${DIR}/build_unix/db.h -a \
+-          -r "`ls ${DIR}/build_unix/.libs/libdb-4.*.a 2>/dev/null | tail -1`"; then
+-          DBINC=-I`echo ${DIR}/build_unix`
+-          DBLIB=`ls ${DIR}/build_unix/.libs/libdb-4.*.a 2>/dev/null | tail -1`
+-          DBHDR="db.h"
+-          grep 'DB_VERSION_MAJOR	4$' ${DIR}/build_unix/db.h >/dev/null 2>&1
+-          S=$?
+-  fi
+-
+-  if test $S -eq 1 ; then
+-      AC_ERROR(Berkeley DB was not found. Please check your installation or use --with-db=DIR)
+-  fi
+-  AC_MSG_RESULT(yes) ]
+-)
+ AC_SUBST(DBINC)
+ AC_SUBST(DBLIB)
+ AC_SUBST(DBHDR)
Index: files/pkg-message.in
===================================================================
RCS file: /home/ncvs/ports/security/pks/files/pkg-message.in,v
retrieving revision 1.1
diff -u -u -r1.1 pkg-message.in
--- files/pkg-message.in	8 Oct 2005 07:44:07 -0000	1.1
+++ files/pkg-message.in	21 Mar 2011 20:27:41 -0000
@@ -6,6 +6,6 @@
 	  web interface please edit the
 	  configuration file at:
 
-	   %%PREFIX%%/etc/pks/pksd.conf
+	   %%PREFIX%%/etc/pksd.conf
 
 	##################################
--- pks-0.9.6.20040312.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->mandree 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Mar 21 20:40:20 UTC 2011 
Responsible-Changed-Why:  
Submitter has GNATS access (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=155760 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Mon Mar 21 20:40:25 UTC 2011 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=155760 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: gtodd@bellanet.org
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/155760: [PATCH] security/pks: update to 0.9.6.20040312
Date: Mon, 21 Mar 2011 20:40:23 UT

 Maintainer of security/pks,
 
 Please note that PR ports/155760 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/155760
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Graham Todd <gtodd@bellanet.org>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/155760: [PATCH] security/pks: update to 0.9.6.20040312
Date: Tue, 22 Mar 2011 11:27:44 -0400

 On 03/21/2011 16:40, Edwin Groothuis wrote:
 > Maintainer of security/pks,
 >
 > Please note that PR ports/155760 has just been submitted.
 >
 > If it contains a patch for an upgrade, an enhancement or a bug fix
 > you agree on, reply to this email stating that you approve the patch
 > and a committer will take care of it.
 >
 > The full text of the PR can be found at:
 >      http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/155760
 >
 
 The patch applies and pks compiles.  I did not aggressively test the 
 resulting binary.
 
 I approve this patch.
 
 Thanks!
State-Changed-From-To: feedback->analyzed 
State-Changed-By: mandree 
State-Changed-When: Mon Mar 28 11:31:52 UTC 2011 
State-Changed-Why:  
needs further testing 

http://www.freebsd.org/cgi/query-pr.cgi?pr=155760 
State-Changed-From-To: analyzed->closed 
State-Changed-By: mandree 
State-Changed-When: Tue Apr 12 21:53:03 UTC 2011 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=155760 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/155760: commit references a PR
Date: Tue, 12 Apr 2011 21:50:25 +0000 (UTC)

 mandree     2011-04-12 21:50:11 UTC
 
   FreeBSD ports repository
 
   Modified files:
     security/pks         Makefile distinfo pkg-plist 
     security/pks/files   pkg-message.in 
   Added files:
     security/pks/files   patch-configure.in 
   Log:
   Upgrade to a later snapshot, to allow build with newer BDB versions.
   
   PR:             ports/155760
   Submitted by:   mandree
   Approved by:    Graham Todd <gtodd@bellanet.org>
   
   Revision  Changes    Path
   1.14      +17 -20    ports/security/pks/Makefile
   1.5       +2 -3      ports/security/pks/distinfo
   1.1       +129 -0    ports/security/pks/files/patch-configure.in (new)
   1.2       +1 -1      ports/security/pks/files/pkg-message.in
   1.4       +2 -0      ports/security/pks/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
