Attachment #114123 for bug #155760

View | Details | Raw Unified | Return to bug 155760
Collapse All | Expand All




# $FreeBSD: ports/security/pks/Makefile,v 1.13 2009/08/22 00:35:01 amdmi3 Exp $
#

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=		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 pks-mail.sh.8 \
		pks-queue-run.sh.8 pgpsplit.8

SUB_FILES=	pkg-message pkg-deinstall
# 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

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}/mail_intro ${DOCSDIR}
	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.endif
	@${CAT} ${PKGMESSAGE}

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)distinfo (-3 / +2 lines)
1	MD5 (pks-0.9.6.tar.gz) = 19427b543972c23fbc1c167d5408d3a9	1	SHA256 (pks-current.tgz) = 839b63c7a4a0a6ef4c933f4205ac425ca5154c39ca32a7d9b79dc86b6d19c8b7
2	SHA256 (pks-0.9.6.tar.gz) = 419fff7df644ac11d92ca5b7981e0a6f1e10f74605eb1602f7b39e272d8b079c	2	SIZE (pks-current.tgz) = 217922
3	SIZE (pks-0.9.6.tar.gz) = 559872

Lines 6-11 Link Here

(-)pkg-plist (+2 lines)
6	bin/pksdctl	6	bin/pksdctl
7	etc/pksd.conf.sample	7	etc/pksd.conf.sample
8	%%DATADIR%%/mail_intro	8	%%DATADIR%%/mail_intro
		9	%%DATADIR%%/pks-commands.html
		10	%%DATADIR%%/pks-commands.php
9	%%PORTDOCS%%%%DOCSDIR%%/mail_intro	11	%%PORTDOCS%%%%DOCSDIR%%/mail_intro
10	%%PORTDOCS%%%%DOCSDIR%%/pks_help.en	12	%%PORTDOCS%%%%DOCSDIR%%/pks_help.en
11	%%PORTDOCS%%%%DOCSDIR%%/pks_help.es	13	%%PORTDOCS%%%%DOCSDIR%%/pks_help.es




--- ./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)

Lines 6-11 Link Here

(-)files/pkg-message.in (-1 / +1 lines)
6	web interface please edit the	6	web interface please edit the
7	configuration file at:	7	configuration file at:
8		8
9	%%PREFIX%%/etc/pks/pksd.conf	9	%%PREFIX%%/etc/pksd.conf
10		10
11	##################################	11	##################################

Return to bug 155760

Lines 5-52 Link Here

(-)Makefile (-20 / +17 lines)
5	# $FreeBSD: ports/security/pks/Makefile,v 1.13 2009/08/22 00:35:01 amdmi3 Exp $	5	# $FreeBSD: ports/security/pks/Makefile,v 1.13 2009/08/22 00:35:01 amdmi3 Exp $
6	#	6	#
7		7
8	PORTNAME= pks	8	PORTNAME= pks
9	PORTVERSION= 0.9.6	9	PORTVERSION= 0.9.6.20040312
10	PORTREVISION= 1	10	CATEGORIES= security www
11	CATEGORIES= security www	11	MASTER_SITES= http://pks.sourceforge.net/:sf ${MASTER_SITE_LOCAL}:local
12	MASTER_SITES= SF	12	MASTER_SITE_SUBDIR= .:sf mandree:local
		13	DISTFILES= pks-current.tgz:sf,local
13		14
14	MAINTAINER= gtodd@bellanet.org	15	MAINTAINER= gtodd@bellanet.org
15	COMMENT= PGP Public Key Server	16	COMMENT= PGP Public Key Server
16		17
17	USE_BDB= yes	18	USE_BDB= 41 # 42 would be ok
18	WANT_BDB_VER= 2	19	WRKSRC= ${WRKDIR}/${PORTNAME}
		20
		21	.include <bsd.port.pre.mk>
19		22
20	GNU_CONFIGURE= yes	23	GNU_CONFIGURE= yes
		24	USE_AUTOTOOLS= autoconf
21	CONFIGURE_ARGS= --datadir=${PREFIX}/share/pks --localstatedir=/var/pks \	25	CONFIGURE_ARGS= --datadir=${PREFIX}/share/pks --localstatedir=/var/pks \
22	--sysconfdir=${EXAMPLESDIR} \	26	--sysconfdir=${EXAMPLESDIR} \
23	--libdir=${LOCALBASE}/lib --with-libwrap	27	--libdir=${LOCALBASE}/lib --with-libwrap
24	CFLAGS+= -I${BDB_INCLUDE_DIR}
25	MAKE_ENV+= LDFLAGS=-L${LOCALBASE}/lib SUBDIRS=	28	MAKE_ENV+= LDFLAGS=-L${LOCALBASE}/lib SUBDIRS=
		29	CONFIGURE_ENV= DBLIB="-L${BDB_LIB_DIR} -l${BDB_LIB_NAME}" DBINC=-I${BDB_INCLUDE_DIR} DBHDR=db.h
26		30
27	USE_RC_SUBR= pksd.sh	31	USE_RC_SUBR= pksd.sh
28	MAN5= pksd.conf.5	32	MAN5= pksd.conf.5
29	MAN8= pks-intro.8 pksclient.8 pksd.8 pksdctl.8	33	MAN8= pks-intro.8 pksclient.8 pksd.8 pksdctl.8 pks-mail.sh.8 \
30	SUB_FILES= pkg-message pkg-deinstall	34	pks-queue-run.sh.8 pgpsplit.8
31		35
32	# remove embedded sleepycat, remove associated build commands, make	36	SUB_FILES= pkg-message pkg-deinstall
33	# the build use the headers and libraries from the db2 port
34	post-patch:
35	${RM} -rf ${WRKSRC}/db2-sleepycat
36	${REINPLACE_CMD} 's\|SUBDIRS =.*\|SUBDIRS =\|; \
37	s\|LIBDB =.*\|LIBDB = -L${LOCALBASE}/lib -l${BDB_LIB_NAME}\|; \
38	s\|DBDIR =.*\|DBDIR = ${BDB_INCLUDE_DIR}\|' \
39	${WRKSRC}/Makefile.in
40		37
41	post-install:	38	post-install:
42	${INSTALL_DATA} ${WRKSRC}/pksd.conf ${PREFIX}/etc/pksd.conf.sample	39	${INSTALL_DATA} ${WRKSRC}/pksd.conf ${PREFIX}/etc/pksd.conf.sample
43	.if !defined(NOPORTDOCS)	40	.if !defined(NOPORTDOCS)
44	${MKDIR} ${DOCSDIR}	41	${MKDIR} ${DOCSDIR}
45	${INSTALL_DATA} ${WRKSRC}/pks_help.en ${WRKSRC}/pks_help.es ${WRKSRC}/pks_help.fr \	42	${INSTALL_DATA} ${WRKSRC}/pks_help.en ${WRKSRC}/pks_help.es ${WRKSRC}/pks_help.fr \
46	${WRKSRC}/pks_help.cz ${WRKSRC}/pks_help.de ${WRKSRC}/pks_help.ja \	43	${WRKSRC}/pks_help.cz ${WRKSRC}/pks_help.de ${WRKSRC}/pks_help.ja \
47	${WRKSRC}/mail_intro ${DOCSDIR}	44	${WRKSRC}/mail_intro ${DOCSDIR}
48	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL	45	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
49	.endif	46	.endif
50	@${CAT} ${PKGMESSAGE}	47	@${CAT} ${PKGMESSAGE}
51		48
52	.include <bsd.port.mk>	49	.include <bsd.port.post.mk>

Added Link Here

(-)files/patch-configure.in (+129 lines)
1	--- ./configure.in.orig 2011-03-21 20:49:39.000000000 +0100
2	+++ ./configure.in 2011-03-21 20:50:42.000000000 +0100
3	@@ -74,126 +74,6 @@
4	# Checks for libraries.
5	dnl Checks for Berkeley DB
6	AC_MSG_CHECKING(for Berkeley DB)
7	-AC_ARG_WITH(db,
8	-[ --with-db=DIR Use Berkeley DB in DIR],
9	-[DBINC=NO
10	- DBLIB=NO
11	- DBHDR=NO
12	- S=1
13	- case "$withval" in
14	- yes\|no)
15	- AC_ERROR(Berkeley DB was not found. Please check your installation or use --with-db=PATH)
16	- ;;
17	- *)
18	- AC_MSG_RESULT($withval)
19	- if test x${withval} = x ; then
20	- withval=/tmp
21	- fi
22	- if test $S -a -r ${withval}/build_unix/db4.h -a \
23	- -r "`ls ${withval}/build_unix/.libs/libdb-4.*.a 2>/dev/null \| tail -1`"; then
24	- DBINC=-I`echo ${withval}/build_unix/`
25	- DBLIB=`ls ${withval}/build_unix/.libs/libdb-4.*.a 2>/dev/null \| tail -1`
26	- DBHDR="db4.h"
27	- grep 'DB_VERSION_MAJOR 4$' ${withval}/build_unix/db4.h >/dev/null 2>&1
28	- S=$?
29	- fi
30	- if test $S -a -r ${withval}/build_unix/db.h -a \
31	- -r "`ls ${withval}/build_unix/.libs/libdb-4.*.a 2>/dev/null \| tail -1`"; then
32	- DBINC=-I`echo ${withval}/build_unix`
33	- DBLIB=`ls ${withval}/build_unix/.libs/libdb-4.*.a 2>/dev/null \| tail -1`
34	- DBHDR="db.h"
35	- grep 'DB_VERSION_MAJOR 4$' ${withval}/build_unix/db.h >/dev/null 2>&1
36	- S=$?
37	- fi
38	- if test $S -a -r ${withval}/include/db4/db.h -a \
39	- -r ${withval}/lib/db4/libdb.a ; then
40	- DBINC="-I${withval}/include/db4"
41	- DBLIB="-L${withval}/lib/db4 -ldb"
42	- DBHDR="db.h"
43	- grep 'DB_VERSION_MAJOR 4$' ${withval}/include/db4/db.h >/dev/null 2>&1
44	- S=$?
45	- fi
46	- if test $S -a -r ${withval}/include/db4.h -a \
47	- -r ${withval}/lib/libdb.a ; then
48	- DBINC="-I${withval}/include"
49	- DBLIB="-L${withval}/lib -ldb"
50	- DBHDR="db4.h"
51	- grep 'DB_VERSION_MAJOR 4$' ${withval}/include/db4.h >/dev/null 2>&1
52	- S=$?
53	- fi
54	- if test $S -a -r ${withval}/include/db.h -a \
55	- -r ${withval}/lib/libdb.a ; then
56	- DBINC="-I${withval}/include"
57	- DBLIB="-L${withval}/lib -ldb"
58	- DBHDR="db.h"
59	- grep 'DB_VERSION_MAJOR 4$' ${withval}/include/db.h >/dev/null 2>&1
60	- S=$?
61	- fi
62	- if test $S -eq 1 ; then
63	- AC_ERROR(Berkeley DB was not found. Please check your installation or use --with-db=DIR)
64	- fi
65	- AC_MSG_RESULT(yes)
66	- esac ],
67	-[DBINC=NO
68	- DBLIB=NO
69	- DBHDR=NO
70	- S=1
71	-
72	- if test $S -a -r /usr/local/include/db4.h -a \
73	- -r /usr/local/lib/libdb.a ; then
74	- DBINC="-I/usr/local/include"
75	- DBLIB="-L/usr/local/lib -ldb"
76	- DBHDR="db4.h"
77	- grep 'DB_VERSION_MAJOR 4$' /usr/local/include/db4.h >/dev/null 2>&1
78	- S=$?
79	- fi
80	- if test $S -a -r /usr/local/include/db.h -a \
81	- -r /usr/local/lib/libdb.a ; then
82	- DBINC="-I/usr/local/include"
83	- DBLIB="-L/usr/local/lib -ldb"
84	- DBHDR="db.h"
85	- grep 'DB_VERSION_MAJOR 4$' /usr/local/include/db.h >/dev/null 2>&1
86	- S=$?
87	- fi
88	- if test $S -a -r /usr/include/db4.h -a \
89	- -r /usr/lib/libdb.a ; then
90	- DBINC=""
91	- DBLIB="-L/usr/lib -ldb"
92	- DBHDR="db4.h"
93	- grep 'DB_VERSION_MAJOR 4$' /usr/include/db4.h >/dev/null 2>&1
94	- S=$?
95	- fi
96	- if test $S -a -r /usr/include/db.h -a \
97	- -r /usr/lib/libdb.a ; then
98	- DBINC=""
99	- DBLIB="-L/usr/lib -ldb"
100	- DBHDR="db.h"
101	- grep 'DB_VERSION_MAJOR 4$' /usr/include/db.h >/dev/null 2>&1
102	- S=$?
103	- fi
104	- DIR=`ls -d ../db-4.*/. 2>/dev/null \| tail -1`
105	- if test $S -a -r ${DIR}/build_unix/db4.h -a \
106	- -r "`ls ${DIR}/build_unix/.libs/libdb-4.*.a 2>/dev/null \| tail -1`"; then
107	- DBINC=-I`echo ${DIR}/build_unix/`
108	- DBLIB=`ls ${DIR}/build_unix/.libs/libdb-4.*.a 2>/dev/null \| tail -1`
109	- DBHDR="db4.h"
110	- grep 'DB_VERSION_MAJOR 4$' ${DIR}/build_unix/db4.h >/dev/null 2>&1
111	- S=$?
112	- fi
113	- if test $S -a -r ${DIR}/build_unix/db.h -a \
114	- -r "`ls ${DIR}/build_unix/.libs/libdb-4.*.a 2>/dev/null \| tail -1`"; then
115	- DBINC=-I`echo ${DIR}/build_unix`
116	- DBLIB=`ls ${DIR}/build_unix/.libs/libdb-4.*.a 2>/dev/null \| tail -1`
117	- DBHDR="db.h"
118	- grep 'DB_VERSION_MAJOR 4$' ${DIR}/build_unix/db.h >/dev/null 2>&1
119	- S=$?
120	- fi
121	-
122	- if test $S -eq 1 ; then
123	- AC_ERROR(Berkeley DB was not found. Please check your installation or use --with-db=DIR)
124	- fi
125	- AC_MSG_RESULT(yes) ]
126	-)
127	AC_SUBST(DBINC)
128	AC_SUBST(DBLIB)
129	AC_SUBST(DBHDR)