Attachment 55080 Details for Bug 83305 – file.diff

[patch] file.diff

file.diff (text/plain), 5.15 KB, created by fmysh on 2005-07-12 00:40:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: fmysh

Created: 2005-07-12 00:40:15 UTC

Size: 5.15 KB

patch

obsolete

>diff -uNr perdition.orig/Makefile perdition/Makefile
>--- perdition.orig/Makefile	Tue Jul 12 06:40:48 2005
>+++ perdition/Makefile	Tue Jul 12 06:40:40 2005
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	perdition
>-PORTVERSION=	1.15
>+PORTVERSION=	1.17
> CATEGORIES=	mail net security
> MASTER_SITES=	http://www.vergenet.net/linux/perdition/download/${PORTVERSION}/
> 
>@@ -28,24 +28,22 @@
> CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" BDB_LIB=db3
> LDFLAGS+=	-L${LOCALBASE}/lib
> MAKE_ENV+=	DOCSDIR=${DOCSDIR}
>-CONFIGURE_ARGS+=	--disable-daemon-map
> 
> INSTALLS_SHLIB=	yes
> 
>-##
>-## Available knobs:
>-##   WITH_BDB: Enable Berkerley database backend
>-##   WITH_DAEMON_MAP: Enable Daemon Map support
>-##   WITH_GDBM: Enable gdbm database backend
>-##   WITH_MYSQL: Enable MySQL database backend
>-##   WITH_NIS: Enable NIS database backend
>-##   WITH_PGSQL: Enable PostgreSQL database backend
>-##   WITH_ODBC: Enable ODBC database backend
>-##   WITH_OPENLDAP: Enable OpenLDAP database backend
>-##
>-##   WITHOUT_SSL: Disable OpenSSL support
>-##   WITHOUT_POSIX_REGEX: Disable native regex support
>-##
>+OPTIONS = \
>+	BDB		"Berkerley database backend" Off \
>+	DAEMON_MAP	"Daemon Map support" Off \
>+	GDBM	 	"gdbm database backend" Off \
>+	MYSQL	 	"MySQL database backend" Off \
>+	NIS	 	"NIS database backend" Off \
>+	PGSQL	 	"PostgreSQL database backend" Off \
>+	ODBC	 	"ODBC database backend" Off \
>+	OPENLDAP	"OpenLDAP database backend" Off \
>+	SSL		"OpenSSL support" On \
>+	POSIX_REGEX	"native regex support" On \
>+
>+.include <bsd.port.pre.mk>
> 
> .if !defined(WITHOUT_SSL)
> CONFIGURE_ARGS+=	--enable-ssl
>@@ -121,7 +119,7 @@
> 
> .if defined(WITH_OPENLDAP)
> USE_OPENLDAP=		YES
>-CONFIGURE_ARGS+=	--enable-ldap --with-ldap-schema-directory=${LOCALBASE}/etc/openldap/schema/
>+CONFIGURE_ARGS+=	--enable-ldap --with-ldap-schema-directory=${LOCALBASE}/etc/openldap/schema/ --disable-ldap-doc
> PLIST_SUB+=		OPENLDAP=""
> MAN8+=			perditiondb_ldap_makedb.8
> .else
>@@ -139,11 +137,6 @@
> PLIST_SUB+=		ODBC="@comment "
> .endif
> 
>-pre-everything:: show-options
>-
>-show-options:
>-	@${SED} -ne 's/^##//p' ${.CURDIR}/Makefile
>-
> post-install:
> .if !defined(NOPORTDOCS)
> 	@${MKDIR} ${DOCSDIR}
>@@ -156,4 +149,4 @@
> 	@${ECHO_MSG} ""
> .endif
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>diff -uNr perdition.orig/distinfo perdition/distinfo
>--- perdition.orig/distinfo	Tue Jul 12 06:40:48 2005
>+++ perdition/distinfo	Tue Jul 12 06:40:40 2005
>@@ -1,2 +1,2 @@
>-MD5 (perdition-1.15.tar.gz) = 7c3aaf30198cf73191a984a76637a940
>-SIZE (perdition-1.15.tar.gz) = 551692
>+MD5 (perdition-1.17.tar.gz) = 6cef90e55bde9eb2d0a17acccb3516f3
>+SIZE (perdition-1.17.tar.gz) = 552149
>diff -uNr perdition.orig/files/patch-etc-Makefile.in perdition/files/patch-etc-Makefile.in
>--- perdition.orig/files/patch-etc-Makefile.in	Tue Jul 12 06:40:48 2005
>+++ perdition/files/patch-etc-Makefile.in	Tue Jul 12 06:40:40 2005
>@@ -1,10 +1,10 @@
>---- etc/Makefile.in.orig	Sun Jun 15 21:50:02 2003
>-+++ etc/Makefile.in	Sun Jun 15 21:50:18 2003
>-@@ -136,7 +136,7 @@
>- ssl_includes = @ssl_includes@
>- ssl_lib = @ssl_lib@
>+--- etc/Makefile.in.orig	Wed Jun 22 15:32:39 2005
>++++ etc/Makefile.in	Sat Jul  2 01:11:26 2005
>+@@ -137,7 +137,7 @@
>  
>--SUBDIRS = perdition @pam_dir@ rc.d sysconfig
>+ @PAM_BUILD_TRUE@PAM_DIR = pam.d
>+ 
>+-SUBDIRS = perdition $(PAM_DIR) rc.d sysconfig
> +SUBDIRS = perdition
>  
>  EXTRA_DIST = 
>diff -uNr perdition.orig/files/patch-perdition-db-postgresql-Makefile.in perdition/files/patch-perdition-db-postgresql-Makefile.in
>--- perdition.orig/files/patch-perdition-db-postgresql-Makefile.in	Thu Jan  1 09:00:00 1970
>+++ perdition/files/patch-perdition-db-postgresql-Makefile.in	Tue Jul 12 06:40:40 2005
>@@ -0,0 +1,13 @@
>+--- perdition/db/postgresql/Makefile.in.orig	Tue Jul 12 03:43:29 2005
>++++ perdition/db/postgresql/Makefile.in	Tue Jul 12 03:43:53 2005
>+@@ -148,8 +148,8 @@
>+ 
>+ libperditiondb_postgresql_la_LDFLAGS = -version-info 0:0:0
>+ 
>+-PG_LIBPATH := $(shell pg_config --libdir)
>+-PG_INCLUDEPATH := $(shell pg_config --includedir)
>++PG_LIBPATH := `pg_config --libdir`
>++PG_INCLUDEPATH := `pg_config --includedir`
>+ 
>+ libperditiondb_postgresql_la_LIBADD = @ssl_lib@ @socket_lib@ @nsl_lib@ @crypt_lib@ -lvanessa_logger -lvanessa_adt -L$(PG_LIBPATH) -lpq
>+ 
>diff -uNr perdition.orig/files/patch-perdition::db::daemon::Makefile.in perdition/files/patch-perdition::db::daemon::Makefile.in
>--- perdition.orig/files/patch-perdition::db::daemon::Makefile.in	Tue Jul 12 06:40:48 2005
>+++ perdition/files/patch-perdition::db::daemon::Makefile.in	Tue Jul 12 06:40:40 2005
>@@ -1,11 +1,11 @@
>---- perdition/db/daemon/Makefile.in.orig	Mon Dec 15 12:24:51 2003
>-+++ perdition/db/daemon/Makefile.in	Mon Dec 15 12:27:20 2003
>-@@ -155,7 +155,7 @@
>+--- perdition/db/daemon/Makefile.in.orig	Wed Jun 22 15:32:38 2005
>++++ perdition/db/daemon/Makefile.in	Sat Jul  2 01:15:08 2005
>+@@ -144,7 +144,7 @@
>+ libperditiondb_daemon_la_SOURCES =  perditiondb_daemon.c perditiondb_daemon.h unix_socket.c unix_socket.h
>  
>  libperditiondb_daemon_la_LDFLAGS = -version-info 0:0:0
>- 
>--libperditiondb_daemon_la_LIBADD = -ldb
>-+libperditiondb_daemon_la_LIBADD = -lgdbm
>+-libperditiondb_daemon_la_LIBADD = -ldb -L. -lperditiondb_daemon_packet
>++libperditiondb_daemon_la_LIBADD = -lgdbm -L. -lperditiondb_daemon_packet
>  
>  noinst_PROGRAMS = client server

Actions: View | Diff

Attachments on bug 83305: 55080