On 2013/03/14 14:28, Rogier Krieger wrote:
> Attached are diffs for the vanessa libraries (borrowing Stuart's work
> [1], with slightly hand-modified PLISTS) as well as for perdition
> (1.19rc5). Please advise if I shouldn't separate out shared items into
> PFRAG.shared.
In normal cases these can now be merged into PLIST.
> I've shamelessly copied Stuart's approach [2] to renaming strcasestr()
> to avoid clashing with OpenBSD's libc implementation. During testing,
> I ran into a problem with the default value of authenticate_timeout
> (1800s) that causes EDOM on setsockopt() with SO_RCVTIMEO. I've
> changed the default in the code and updated the manual. Is this an
> acceptable fix? I'll happily contact the author otherwise. Anyway,
> 1800 seconds of idle time before authentication seems a bit.. much.
The actual max values depends on the resolution of the kernel timer
(HZ). 60s seems reasonable I think, people can always fiddle with config
if they want.
> -# $OpenBSD: Makefile,v 1.4 2010/11/15 19:46:09 espie Exp $
> +# $OpenBSD$
No need to touch these lines btw, it just adds noise to the diff.
> -SHARED_LIBS= vanessa_adt 0.3 # 0.3
> +SHARED_LIBS = vanessa_adt 0.4 # 0.4
My diffs had the library major version bumped. I don't recall the particular
reason but I will have diffed the two source trees (old and new) to determine
whether any function parameters where changed or whether any functions
were added/removed.
> ? patches/patch-perdition_options_h
> ? patches/patch-perdition_pam_c
> ? patches/patch-perdition_perdition_8
> ? patches/patch-perdition_str_c
> ? patches/patch-perdition_str_h
You can use 'cvs add' / 'cvs rm', then 'cvs diff -uNp' for these.
New diff below incorporating the above, manpage diff tweaked slightly,
lib versions put back, and the perdition port now has dpb-compliant
multipackage handling. I've removed USE_GROFF as well, mandoc can
handle these, and the sys/types.h addition as well, system headers
have now been fixed for that.
Index: mail/perdition/Makefile
===================================================================
RCS file: /cvs/ports/mail/perdition/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- mail/perdition/Makefile 11 Mar 2013 11:23:53 -0000 1.16
+++ mail/perdition/Makefile 14 Mar 2013 14:14:26 -0000
@@ -5,16 +5,12 @@ COMMENT-ldap= LDAP backend for perdition
COMMENT-mysql= MySQL backend for perdition mail proxy
COMMENT-pgsql= PostgreSQL backend for perdition mail proxy
-DISTVER= 1.17.1
+DISTVER= 1.19-rc5
DISTNAME= perdition-${DISTVER}
-PKGNAME-main= ${DISTNAME}
-PKGNAME-ldap= perdition-ldap-${DISTVER}
-REVISION-main = 2
-REVISION-ldap = 1
-REVISION-mysql = 0
-REVISION-pgsql = 0
-PKGNAME-mysql= perdition-mysql-${DISTVER}
-PKGNAME-pgsql= perdition-pgsql-${DISTVER}
+PKGNAME-main= perdition-${DISTVER:S/-//}
+PKGNAME-ldap= perdition-ldap-${DISTVER:S/-//}
+PKGNAME-mysql= perdition-mysql-${DISTVER:S/-//}
+PKGNAME-pgsql= perdition-pgsql-${DISTVER:S/-//}
CATEGORIES= mail
@@ -24,23 +20,27 @@ SHARED_LIBS += perditiondb_nis
SHARED_LIBS += perditiondb_posix_regex 0.0 # .0.0
SHARED_LIBS += perditiondb_daemon 0.0 # .0.0
SHARED_LIBS += perditiondb_daemon_base 0.0 # .0.0
+SHARED_LIBS += perditiondb_ldap 0.0 # .0.0
+SHARED_LIBS += perditiondb_mysql 0.0 # .0.0
+SHARED_LIBS += perditiondb_postgresql 0.0 # .0.0
HOMEPAGE= http://www.vergenet.net/linux/perdition/
-# GPL
+# GPLv2+ (included COPYING is v3, but all files with a
+# copyright claim specify version 2 or above).
PERMIT_PACKAGE_CDROM= Yes
MASTER_SITES= ${HOMEPAGE}download/${DISTVER}/
USE_GMAKE= Yes
USE_LIBTOOL= Yes
-USE_GROFF = Yes
CONFIGURE_STYLE=gnu
CFLAGS+=-I${LOCALBASE}/include -I${LOCALBASE}/include/db4
CONFIGURE_ENV+="LDFLAGS=-L${LOCALBASE}/lib"
-CONFIGURE_ARGS+= --enable-ssl \
+CONFIGURE_ARGS+= --disable-silent-rules \
+ --enable-ssl \
--with-ssl-includes=/usr/include \
--with-ssl-libraries=/usr/lib \
--disable-gdbm \
@@ -48,60 +48,57 @@ CONFIGURE_ARGS+= --enable-ssl \
--with-user=_perdition \
--with-group=_perdition
-NO_TEST=Yes
-
-PSEUDO_FLAVORS= no_ldap no_mysql no_pgsql
+PSEUDO_FLAVORS= no_bdb no_ldap no_mysql no_pgsql
FLAVOR?=
-MULTI_PACKAGES= -main
+MULTI_PACKAGES= -main -mysql -pgsql -ldap
+
+.include <bsd.port.arch.mk>
-WANTLIB-main= c crypto ssl util db>=4.2 vanessa_adt>=0.3 \
- vanessa_logger>=0.3 vanessa_socket>=0.3 popt
+WANTLIB-main= c crypto ssl util db>=4.2 vanessa_adt>=1.0 \
+ vanessa_logger>=1.0 vanessa_socket>=1.0 popt
LIB_DEPENDS-main= databases/db/v4 \
- devel/vanessa/adt \
- devel/vanessa/logger \
- devel/vanessa/socket \
+ vanessa_adt->=0.0.9:devel/vanessa/adt \
+ vanessa_logger->=0.0.10:devel/vanessa/logger \
+ vanessa_socket->=0.0.12:devel/vanessa/socket \
devel/popt
-.if ${FLAVOR:Mno_ldap}
+LIB_DEPENDS-ldap= security/cyrus-sasl2 \
+ openldap-client->=2,<3:databases/openldap
+WANTLIB-ldap= asn1 com_err crypto gssapi krb5 ssl util sasl2 \
+ ldap>=2 lber>=2
+
+.if !${BUILD_PACKAGES:M-ldap}
CONFIGURE_ARGS+= --disable-ldap
.else
-SHARED_LIBS += perditiondb_ldap 0.0 # .0.0
-MULTI_PACKAGES+= -ldap
CONFIGURE_ARGS+= --with-ldap-libraries=${LOCALBASE}/lib \
--with-ldap-includes=${LOCALBASE}/include \
--disable-ldap-doc
-LIB_DEPENDS-ldap= security/cyrus-sasl2 \
- openldap-client->=2,<3:databases/openldap
-WANTLIB-ldap= asn1 com_err crypto gssapi krb5 ssl util sasl2 \
- ldap>=2 lber>=2
.endif
-.if ${FLAVOR:Mno_mysql}
-CONFIGURE_ARGS+= --disable-mysql
-.else
-SHARED_LIBS += perditiondb_mysql 0.0 # .0.0
-MULTI_PACKAGES+= -mysql
-CONFIGURE_ARGS+= --with-mysql-libraries=${LOCALBASE}/lib/mysql \
- --with-mysql-includes=${LOCALBASE}/include/mysql
LIB_DEPENDS-mysql= databases/mysql \
devel/vanessa/adt \
devel/vanessa/logger
WANTLIB-mysql= crypto ssl util m z lib/mysql/mysqlclient>=10 \
vanessa_adt>=0.3 vanessa_logger>=0.3
+
+.if !${BUILD_PACKAGES:M-mysql}
+CONFIGURE_ARGS+= --disable-mysql
+.else
+CONFIGURE_ARGS+= --with-mysql-libraries=${LOCALBASE}/lib/mysql \
+ --with-mysql-includes=${LOCALBASE}/include/mysql
.endif
-.if ${FLAVOR:Mno_pgsql}
-CONFIGURE_ARGS+= --disable-pg
-.else
-SHARED_LIBS += perditiondb_postgresql 0.0 # .0.0
-MULTI_PACKAGES+= -pgsql
-CONFIGURE_ARGS+= --enable-pg
LIB_DEPENDS-pgsql= databases/postgresql \
devel/vanessa/adt \
devel/vanessa/logger
WANTLIB-pgsql= crypto ssl util pq>=2 vanessa_adt>=0.3 \
vanessa_logger>=0.3
+
+.if !${BUILD_PACKAGES:M-pgsql}
+CONFIGURE_ARGS+= --disable-pg
+.else
+CONFIGURE_ARGS+= --enable-pg
.endif
EXAMPLE_DIR= ${PREFIX}/share/examples/perdition/
Index: mail/perdition/distinfo
===================================================================
RCS file: /cvs/ports/mail/perdition/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- mail/perdition/distinfo 8 Jun 2008 10:55:25 -0000 1.3
+++ mail/perdition/distinfo 14 Mar 2013 14:14:26 -0000
@@ -1,5 +1,2 @@
-MD5 (perdition-1.17.1.tar.gz) = VGTFF/i+gQUZthh7aUydmA==
-RMD160 (perdition-1.17.1.tar.gz) = LqNRwYmzMDCKAi6XydzIyb04E3c=
-SHA1 (perdition-1.17.1.tar.gz) = 3f3pA/anf4A1XXie7dVLRjEQZzU=
-SHA256 (perdition-1.17.1.tar.gz) = 4qvVeqdrEGWRBW74NeJoFsccOzncVbw666bf7vrHryY=
-SIZE (perdition-1.17.1.tar.gz) = 638162
+SHA256 (perdition-1.19-rc5.tar.gz) =
dgctaV0Y5VofNOPNOM54HS8Tj4WdCLeu37y1GlxIkrU=
+SIZE (perdition-1.19-rc5.tar.gz) = 642566
Index: mail/perdition/patches/patch-etc_perdition_perdition_conf
===================================================================
RCS file: /cvs/ports/mail/perdition/patches/patch-etc_perdition_perdition_conf,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-etc_perdition_perdition_conf
--- mail/perdition/patches/patch-etc_perdition_perdition_conf 16 Nov 2006
23:26:00 -0000 1.1.1.1
+++ mail/perdition/patches/patch-etc_perdition_perdition_conf 14 Mar 2013
14:14:26 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-etc_perdition_perdition_conf,v 1.1.1.1 2006/11/16 23:26:00 msf
Exp $
---- etc/perdition/perdition.conf.orig Tue Nov 7 11:44:00 2006
-+++ etc/perdition/perdition.conf Tue Nov 7 11:47:50 2006
+--- etc/perdition/perdition.conf.orig Wed Sep 1 08:13:30 2010
++++ etc/perdition/perdition.conf Sat Nov 13 10:09:26 2010
@@ -132,9 +132,9 @@
# g|group GROUP:
@@ -12,9 +12,9 @@ $OpenBSD: patch-etc_perdition_perdition_
+#g _perdition
+#group _perdition
- # I|capability|pop_capability|imap_capability STRING:
- # Capabilities for the protocol.
-@@ -258,9 +258,9 @@
+ # imap_capability STRING:
+ # Capabilities for IMAP4 and IMAP4S
+@@ -296,9 +296,9 @@
# u|username USERNAME:
# User to run as.
Index: mail/perdition/patches/patch-perdition_db_daemon_perditiondb_daemon_c
===================================================================
RCS file:
/cvs/ports/mail/perdition/patches/patch-perdition_db_daemon_perditiondb_daemon_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-perdition_db_daemon_perditiondb_daemon_c
--- mail/perdition/patches/patch-perdition_db_daemon_perditiondb_daemon_c
16 Nov 2006 23:26:00 -0000 1.1.1.1
+++ mail/perdition/patches/patch-perdition_db_daemon_perditiondb_daemon_c
14 Mar 2013 14:14:26 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-perdition_db_daemon_perditiondb_daemon_c,v 1.1.1.1 2006/11/16
23:26:00 msf Exp $
---- perdition/db/daemon/perditiondb_daemon.c.orig Mon Nov 13 13:28:08 2006
-+++ perdition/db/daemon/perditiondb_daemon.c Mon Nov 13 13:29:53 2006
-@@ -176,7 +176,7 @@ dbserver_get2(const char *key_str, const
+--- perdition/db/daemon/perditiondb_daemon.c.orig Wed Sep 1 08:13:30 2010
++++ perdition/db/daemon/perditiondb_daemon.c Sat Nov 13 10:09:27 2010
+@@ -237,7 +237,7 @@ dbserver_get2(const char *key_str, const char *UNUSED(
perdition_un_init(&sock);
Index: mail/perdition/patches/patch-perdition_options_h
===================================================================
RCS file: mail/perdition/patches/patch-perdition_options_h
diff -N mail/perdition/patches/patch-perdition_options_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ mail/perdition/patches/patch-perdition_options_h 14 Mar 2013 14:14:26
-0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Auth timeout used for SO_RECVTIMEO in ssl.c which has a max of
+USHRT_MAX hz otherwise it fails with EDOM.
+
+--- perdition/options.h.orig Thu Mar 14 13:58:46 2013
++++ perdition/options.h Thu Mar 14 14:00:47 2013
+@@ -145,7 +145,7 @@
+ #define DEFAULT_STRIP_DOMAIN STATE_NONE
+ #define DEFAULT_SERVER_RESP_LINE 0
+ #define DEFAULT_TIMEOUT 1800 /*in seconds*/
+-#define DEFAULT_AUTHENTICATE_TIMEOUT DEFAULT_TIMEOUT
++#define DEFAULT_AUTHENTICATE_TIMEOUT 60 /*in seconds*/
+ #ifdef WITH_USER
+ #define DEFAULT_USERNAME WITH_USER
+ #else
Index: mail/perdition/patches/patch-perdition_perdition_8
===================================================================
RCS file: mail/perdition/patches/patch-perdition_perdition_8
diff -N mail/perdition/patches/patch-perdition_perdition_8
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ mail/perdition/patches/patch-perdition_perdition_8 14 Mar 2013 14:14:26
-0000
@@ -0,0 +1,22 @@
+$OpenBSD$
+
+Sync with new options.h default.
+
+--- perdition/perdition.8.orig Thu Mar 14 14:02:11 2013
++++ perdition/perdition.8 Thu Mar 14 14:04:38 2013
+@@ -752,10 +752,11 @@ Perdition allows two idle timeouts to be configured. \
+ is used before the user has been successfully authenticated with the
+ back-end server. And after that \-\-timeout is used.
+
+-The default value for both timeouts is is 1800.
+-A timeout value of 0 means that the timeouts are disabled and clients and
+-back\-end servers can idle indefinitely, though in practice a TCP timeout
+-will be in effect.
++The default value for \-\-authentication_timeout is 60 seconds.
++The default value for \-\-timeout is 1800 seconds.
++A timeout value of 0 means that the timeouts are disabled and clients
++and back\-end servers can idle indefinitely, though in practice a
++TCP timeout will be in effect.
+ .SH LOOP DETECTION
+ The greeting that perdition displays when accepting an incoming connection
+ is "+OK POP3 Ready <hostname>" or "* OK IMAP4 Ready <hostname>" in POP3 and
Index: mail/perdition/patches/patch-perdition_str_c
===================================================================
RCS file: mail/perdition/patches/patch-perdition_str_c
diff -N mail/perdition/patches/patch-perdition_str_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ mail/perdition/patches/patch-perdition_str_c 14 Mar 2013 14:14:26
-0000
@@ -0,0 +1,24 @@
+$OpenBSD$
+
+avoid conflict with string.h
+
+--- perdition/str.c.orig Sat Nov 13 10:41:45 2010
++++ perdition/str.c Sat Nov 13 10:42:12 2010
+@@ -721,7 +721,7 @@ char *str_replace(char *str, size_t n, ...)
+ * the time.
+ **********************************************************************/
+
+-const char *strcasestr(const char *haystack, const char *needle)
++const char *perdition_strcasestr(const char *haystack, const char *needle)
+ {
+ size_t i, haystack_len, needle_len;
+
+@@ -758,7 +758,7 @@ const char *strcasedelimword(const char *haystack, con
+ {
+ const char *found;
+
+- found = strcasestr(haystack, needle);
++ found = perdition_strcasestr(haystack, needle);
+ if (!found)
+ return NULL;
+
Index: mail/perdition/patches/patch-perdition_str_h
===================================================================
RCS file: mail/perdition/patches/patch-perdition_str_h
diff -N mail/perdition/patches/patch-perdition_str_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ mail/perdition/patches/patch-perdition_str_h 14 Mar 2013 14:14:26
-0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+avoid conflict with string.h
+
+--- perdition/str.h.orig Sat Nov 13 10:42:15 2010
++++ perdition/str.h Sat Nov 13 10:42:24 2010
+@@ -351,7 +351,7 @@ char *str_replace(char *str, size_t n, ...);
+ * the time.
+ **********************************************************************/
+
+-const char *strcasestr(const char *haystack, const char *needle);
++const char *perdition_strcasestr(const char *haystack, const char *needle);
+
+ /**********************************************************************
+ * strcasedelimword
Index: mail/perdition/pkg/PFRAG.shared-ldap
===================================================================
RCS file: mail/perdition/pkg/PFRAG.shared-ldap
diff -N mail/perdition/pkg/PFRAG.shared-ldap
--- mail/perdition/pkg/PFRAG.shared-ldap 16 Nov 2006 23:26:00 -0000
1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared-ldap,v 1.1.1.1 2006/11/16 23:26:00 msf Exp $
-@lib lib/libperditiondb_ldap.so.${LIBperditiondb_ldap_VERSION}
Index: mail/perdition/pkg/PFRAG.shared-main
===================================================================
RCS file: mail/perdition/pkg/PFRAG.shared-main
diff -N mail/perdition/pkg/PFRAG.shared-main
--- mail/perdition/pkg/PFRAG.shared-main 8 Jun 2008 10:55:25 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,7 +0,0 @@
-@comment $OpenBSD: PFRAG.shared-main,v 1.2 2008/06/08 10:55:25 simon Exp $
-@lib lib/libjain.so.${LIBjain_VERSION}
-@lib lib/libperditiondb_bdb.so.${LIBperditiondb_bdb_VERSION}
-@lib lib/libperditiondb_daemon.so.${LIBperditiondb_daemon_VERSION}
-@lib lib/libperditiondb_daemon_base.so.${LIBperditiondb_daemon_base_VERSION}
-@lib lib/libperditiondb_nis.so.${LIBperditiondb_nis_VERSION}
-@lib lib/libperditiondb_posix_regex.so.${LIBperditiondb_posix_regex_VERSION}
Index: mail/perdition/pkg/PFRAG.shared-mysql
===================================================================
RCS file: mail/perdition/pkg/PFRAG.shared-mysql
diff -N mail/perdition/pkg/PFRAG.shared-mysql
--- mail/perdition/pkg/PFRAG.shared-mysql 16 Nov 2006 23:26:00 -0000
1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared-mysql,v 1.1.1.1 2006/11/16 23:26:00 msf Exp $
-@lib lib/libperditiondb_mysql.so.${LIBperditiondb_mysql_VERSION}
Index: mail/perdition/pkg/PFRAG.shared-pgsql
===================================================================
RCS file: mail/perdition/pkg/PFRAG.shared-pgsql
diff -N mail/perdition/pkg/PFRAG.shared-pgsql
--- mail/perdition/pkg/PFRAG.shared-pgsql 16 Nov 2006 23:26:00 -0000
1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared-pgsql,v 1.1.1.1 2006/11/16 23:26:00 msf Exp $
-@lib lib/libperditiondb_postgresql.so.${LIBperditiondb_postgresql_VERSION}
Index: mail/perdition/pkg/PLIST-ldap
===================================================================
RCS file: /cvs/ports/mail/perdition/pkg/PLIST-ldap,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST-ldap
--- mail/perdition/pkg/PLIST-ldap 16 Nov 2006 23:26:00 -0000 1.1.1.1
+++ mail/perdition/pkg/PLIST-ldap 14 Mar 2013 14:14:26 -0000
@@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST-ldap,v 1.1.1.1 2006/11/16 23:26:00 msf Exp $
-%%SHARED%%
lib/libperditiondb_ldap.a
lib/libperditiondb_ldap.la
+@lib lib/libperditiondb_ldap.so.${LIBperditiondb_ldap_VERSION}
@man man/man8/perditiondb_ldap_makedb.8
sbin/perditiondb_ldap_makedb
Index: mail/perdition/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/mail/perdition/pkg/PLIST-main,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-main
--- mail/perdition/pkg/PLIST-main 8 Jun 2008 10:55:25 -0000 1.3
+++ mail/perdition/pkg/PLIST-main 14 Mar 2013 14:14:26 -0000
@@ -2,35 +2,38 @@
@pkgpath mail/perdition
@newgroup _perdition:573
@newuser _perdition:573:573:daemon:Perdition proxy:/var/empty:/sbin/nologin
-%%SHARED%%
-bin/makebdb
-include/jain.h
-lib/libjain.a
-lib/libjain.la
+@bin bin/makebdb
lib/libperditiondb_bdb.a
lib/libperditiondb_bdb.la
+@lib lib/libperditiondb_bdb.so.${LIBperditiondb_bdb_VERSION}
lib/libperditiondb_daemon.a
lib/libperditiondb_daemon.la
+@lib lib/libperditiondb_daemon.so.${LIBperditiondb_daemon_VERSION}
lib/libperditiondb_daemon_base.a
lib/libperditiondb_daemon_base.la
+@lib lib/libperditiondb_daemon_base.so.${LIBperditiondb_daemon_base_VERSION}
lib/libperditiondb_nis.a
lib/libperditiondb_nis.la
+@lib lib/libperditiondb_nis.so.${LIBperditiondb_nis_VERSION}
lib/libperditiondb_posix_regex.a
lib/libperditiondb_posix_regex.la
+@lib lib/libperditiondb_posix_regex.so.${LIBperditiondb_posix_regex_VERSION}
@man man/man1/makebdb.1
@man man/man5/perditiondb.5
@man man/man8/perdition.8
@man man/man8/perdition.imap4.8
@man man/man8/perdition.imap4s.8
@man man/man8/perdition.imaps.8
+@man man/man8/perdition.managesieve.8
@man man/man8/perdition.pop3.8
@man man/man8/perdition.pop3s.8
-sbin/perdition
-sbin/perdition.imap4
-sbin/perdition.imap4s
-sbin/perdition.imaps
-sbin/perdition.pop3
-sbin/perdition.pop3s
+@bin sbin/perdition
+@bin sbin/perdition.imap4
+@bin sbin/perdition.imap4s
+@bin sbin/perdition.imaps
+@bin sbin/perdition.managesieve
+@bin sbin/perdition.pop3
+@bin sbin/perdition.pop3s
share/examples/perdition/
@sample ${SYSCONFDIR}/perdition/
share/examples/perdition/Makefile
Index: mail/perdition/pkg/PLIST-mysql
===================================================================
RCS file: /cvs/ports/mail/perdition/pkg/PLIST-mysql,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST-mysql
--- mail/perdition/pkg/PLIST-mysql 16 Nov 2006 23:26:00 -0000 1.1.1.1
+++ mail/perdition/pkg/PLIST-mysql 14 Mar 2013 14:14:26 -0000
@@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST-mysql,v 1.1.1.1 2006/11/16 23:26:00 msf Exp $
-%%SHARED%%
lib/libperditiondb_mysql.a
lib/libperditiondb_mysql.la
+@lib lib/libperditiondb_mysql.so.${LIBperditiondb_mysql_VERSION}
@man man/man8/perditiondb_mysql_makedb.8
sbin/perditiondb_mysql_makedb
Index: mail/perdition/pkg/PLIST-pgsql
===================================================================
RCS file: /cvs/ports/mail/perdition/pkg/PLIST-pgsql,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST-pgsql
--- mail/perdition/pkg/PLIST-pgsql 16 Nov 2006 23:26:00 -0000 1.1.1.1
+++ mail/perdition/pkg/PLIST-pgsql 14 Mar 2013 14:14:26 -0000
@@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST-pgsql,v 1.1.1.1 2006/11/16 23:26:00 msf Exp $
-%%SHARED%%
lib/libperditiondb_postgresql.a
lib/libperditiondb_postgresql.la
+@lib lib/libperditiondb_postgresql.so.${LIBperditiondb_postgresql_VERSION}
@man man/man8/perditiondb_postgresql_makedb.8
sbin/perditiondb_postgresql_makedb
Index: devel/vanessa/Makefile.inc
===================================================================
RCS file: /cvs/ports/devel/vanessa/Makefile.inc,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile.inc
--- devel/vanessa/Makefile.inc 11 Mar 2013 10:50:31 -0000 1.2
+++ devel/vanessa/Makefile.inc 14 Mar 2013 14:14:26 -0000
@@ -1,19 +1,18 @@
# $OpenBSD: Makefile.inc,v 1.2 2013/03/11 10:50:31 espie Exp $
-CATEGORIES?= devel
+CATEGORIES ?= devel
-HOMEPAGE?= http://www.vergenet.net/linux/vanessa/
+HOMEPAGE ?= http://www.vergenet.net/linux/vanessa/
-# GPL
+# LGPLv2+
PERMIT_PACKAGE_CDROM= Yes
-MASTER_SITE_VANESSA?= ${HOMEPAGE}download/
+MASTER_SITE_VANESSA ?= ${HOMEPAGE}download/
-USE_LIBTOOL?= Yes
+USE_LIBTOOL ?= Yes
-CONFIGURE_STYLE?= gnu
+CONFIGURE_STYLE ?= gnu
-NO_TEST?= Yes
-
-CONFIGURE_ENV?= CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ARGS ?= --disable-silent-rules
+CONFIGURE_ENV ?= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
Index: devel/vanessa/adt/Makefile
===================================================================
RCS file: /cvs/ports/devel/vanessa/adt/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- devel/vanessa/adt/Makefile 15 Nov 2010 19:46:09 -0000 1.4
+++ devel/vanessa/adt/Makefile 14 Mar 2013 14:14:26 -0000
@@ -2,14 +2,14 @@
COMMENT= provides abstract data types (ADTs)
-VERSION= 0.0.6
+VERSION= 0.0.9
DISTNAME= vanessa_adt-${VERSION}
-SHARED_LIBS= vanessa_adt 0.3 # 0.3
+SHARED_LIBS= vanessa_adt 1.0 # 1.0
MASTER_SITES= ${MASTER_SITE_VANESSA:=vanessa_adt/${VERSION}/}
-LIB_DEPENDS= devel/vanessa/logger
-WANTLIB = vanessa_logger>=0.3
+LIB_DEPENDS= vanessa_logger->=0.0.10:devel/vanessa/logger
+WANTLIB = vanessa_logger>=1.0
.include <bsd.port.mk>
Index: devel/vanessa/adt/distinfo
===================================================================
RCS file: /cvs/ports/devel/vanessa/adt/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- devel/vanessa/adt/distinfo 5 Apr 2007 15:38:07 -0000 1.2
+++ devel/vanessa/adt/distinfo 14 Mar 2013 14:14:26 -0000
@@ -1,5 +1,2 @@
-MD5 (vanessa_adt-0.0.6.tar.gz) = BpEFdVwcVFDR+nqMMZ4I7Q==
-RMD160 (vanessa_adt-0.0.6.tar.gz) = LJmZQxBdwFp+j6L0zd68lCen8dk=
-SHA1 (vanessa_adt-0.0.6.tar.gz) = SCMjKqG2MAA8pLE1BSnlHN7kmsE=
-SHA256 (vanessa_adt-0.0.6.tar.gz) =
Z6WuGRoGftRqSSLRVTGf08mHLnqDVEwqKMDV+2kgYCQ=
-SIZE (vanessa_adt-0.0.6.tar.gz) = 315242
+SHA256 (vanessa_adt-0.0.9.tar.gz) =
i8u2n2RwIjkBBUHsfX/YZzdXS2ri+kd8qlss2GoSw/E=
+SIZE (vanessa_adt-0.0.9.tar.gz) = 342309
Index: devel/vanessa/adt/pkg/PFRAG.shared
===================================================================
RCS file: devel/vanessa/adt/pkg/PFRAG.shared
diff -N devel/vanessa/adt/pkg/PFRAG.shared
--- devel/vanessa/adt/pkg/PFRAG.shared 6 Nov 2006 10:57:38 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2006/11/06 10:57:38 msf Exp $
-@lib lib/libvanessa_adt.so.${LIBvanessa_adt_VERSION}
Index: devel/vanessa/adt/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/vanessa/adt/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- devel/vanessa/adt/pkg/PLIST 6 Nov 2006 10:57:38 -0000 1.1.1.1
+++ devel/vanessa/adt/pkg/PLIST 14 Mar 2013 14:14:26 -0000
@@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2006/11/06 10:57:38 msf Exp $
-%%SHARED%%
include/vanessa_adt.h
lib/libvanessa_adt.a
lib/libvanessa_adt.la
+@lib lib/libvanessa_adt.so.${LIBvanessa_adt_VERSION}
Index: devel/vanessa/logger/Makefile
===================================================================
RCS file: /cvs/ports/devel/vanessa/logger/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- devel/vanessa/logger/Makefile 18 Oct 2010 17:48:13 -0000 1.3
+++ devel/vanessa/logger/Makefile 14 Mar 2013 14:14:26 -0000
@@ -2,14 +2,13 @@
COMMENT= provides a generic logging layer
-VERSION= 0.0.7
+VERSION= 0.0.10
DISTNAME= vanessa_logger-${VERSION}
-SHARED_LIBS= vanessa_logger 0.3 # 0.3
+SHARED_LIBS= vanessa_logger 1.0 # 0.5
MASTER_SITES= ${MASTER_SITE_VANESSA:=vanessa_logger/${VERSION}/}
-USE_GROFF = Yes
WANTLIB= c
.include <bsd.port.mk>
Index: devel/vanessa/logger/distinfo
===================================================================
RCS file: /cvs/ports/devel/vanessa/logger/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- devel/vanessa/logger/distinfo 5 Apr 2007 15:38:07 -0000 1.2
+++ devel/vanessa/logger/distinfo 14 Mar 2013 14:14:26 -0000
@@ -1,5 +1,2 @@
-MD5 (vanessa_logger-0.0.7.tar.gz) = oyRdsaGBaUBK/+zCQixkpg==
-RMD160 (vanessa_logger-0.0.7.tar.gz) = kdUogXVrAxLqWZOVbJeIliqc3Iw=
-SHA1 (vanessa_logger-0.0.7.tar.gz) = XPDQ/hAxFdwl9ZGQIWocswK3xic=
-SHA256 (vanessa_logger-0.0.7.tar.gz) =
ZTI79nPL6Uxwd/e8R1+V7yWhjVH5alnPpGOhiw5ogdA=
-SIZE (vanessa_logger-0.0.7.tar.gz) = 303977
+SHA256 (vanessa_logger-0.0.10.tar.gz) =
mw4SzdnigYGMKNrsW8RFSnaT3zzJNdwr15NEMWGpBz0=
+SIZE (vanessa_logger-0.0.10.tar.gz) = 328814
Index: devel/vanessa/logger/pkg/PFRAG.shared
===================================================================
RCS file: devel/vanessa/logger/pkg/PFRAG.shared
diff -N devel/vanessa/logger/pkg/PFRAG.shared
--- devel/vanessa/logger/pkg/PFRAG.shared 6 Nov 2006 10:57:38 -0000
1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2006/11/06 10:57:38 msf Exp $
-@lib lib/libvanessa_logger.so.${LIBvanessa_logger_VERSION}
Index: devel/vanessa/logger/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/vanessa/logger/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- devel/vanessa/logger/pkg/PLIST 6 Nov 2006 10:57:38 -0000 1.1.1.1
+++ devel/vanessa/logger/pkg/PLIST 14 Mar 2013 14:14:26 -0000
@@ -1,7 +1,9 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2006/11/06 10:57:38 msf Exp $
-%%SHARED%%
-bin/vanessa_logger_sample
+@bin bin/vanessa_logger_sample
include/vanessa_logger.h
lib/libvanessa_logger.a
lib/libvanessa_logger.la
+@lib lib/libvanessa_logger.so.${LIBvanessa_logger_VERSION}
+lib/pkgconfig/
+lib/pkgconfig/vanessa-logger.pc
@man man/man1/vanessa_logger_sample.1
Index: devel/vanessa/socket/Makefile
===================================================================
RCS file: /cvs/ports/devel/vanessa/socket/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- devel/vanessa/socket/Makefile 15 Nov 2010 19:46:09 -0000 1.5
+++ devel/vanessa/socket/Makefile 14 Mar 2013 14:14:26 -0000
@@ -2,17 +2,17 @@
COMMENT= provides abstract data types (ADTs)
-VERSION= 0.0.7
+VERSION= 0.0.12
DISTNAME= vanessa_socket-${VERSION}
-SHARED_LIBS= vanessa_socket 0.4 # 0.4
+SHARED_LIBS= vanessa_socket 1.0 # 3.0
MASTER_SITES= ${MASTER_SITE_VANESSA:=vanessa_socket/${VERSION}/}
-WANTLIB= c vanessa_logger>=0.3 popt
+MODULES= devel/gettext
+WANTLIB= c vanessa_logger>=1.0 popt
-USE_GROFF = Yes
-LIB_DEPENDS= devel/vanessa/logger \
+LIB_DEPENDS= vanessa_logger->=0.0.10:devel/vanessa/logger \
devel/popt
.include <bsd.port.mk>
Index: devel/vanessa/socket/distinfo
===================================================================
RCS file: /cvs/ports/devel/vanessa/socket/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- devel/vanessa/socket/distinfo 5 Apr 2007 15:38:07 -0000 1.2
+++ devel/vanessa/socket/distinfo 14 Mar 2013 14:14:26 -0000
@@ -1,5 +1,2 @@
-MD5 (vanessa_socket-0.0.7.tar.gz) = kowxisdGAUEv8jEjTh2nyQ==
-RMD160 (vanessa_socket-0.0.7.tar.gz) = OLjCShiVGy8WEYTlXxVssvHxby8=
-SHA1 (vanessa_socket-0.0.7.tar.gz) = zTKYj/1fhGN7t/RyXVqlacw/P+I=
-SHA256 (vanessa_socket-0.0.7.tar.gz) =
2P3FM5EVkRWBx2PSzJv05xwM1MB/YJPwJLt65uO4mQc=
-SIZE (vanessa_socket-0.0.7.tar.gz) = 321042
+SHA256 (vanessa_socket-0.0.12.tar.gz) =
gJ8R2pUHxp1yg55nIUnTkcA2vlfNScyaNaxkve+/Ubw=
+SIZE (vanessa_socket-0.0.12.tar.gz) = 346375
Index: devel/vanessa/socket/pkg/PFRAG.shared
===================================================================
RCS file: devel/vanessa/socket/pkg/PFRAG.shared
diff -N devel/vanessa/socket/pkg/PFRAG.shared
--- devel/vanessa/socket/pkg/PFRAG.shared 6 Nov 2006 10:57:38 -0000
1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2006/11/06 10:57:38 msf Exp $
-@lib lib/libvanessa_socket.so.${LIBvanessa_socket_VERSION}
Index: devel/vanessa/socket/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/vanessa/socket/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- devel/vanessa/socket/pkg/PLIST 6 Nov 2006 10:57:38 -0000 1.1.1.1
+++ devel/vanessa/socket/pkg/PLIST 14 Mar 2013 14:14:26 -0000
@@ -1,7 +1,9 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2006/11/06 10:57:38 msf Exp $
-%%SHARED%%
-bin/vanessa_socket_pipe
+@bin bin/vanessa_socket_pipe
include/vanessa_socket.h
lib/libvanessa_socket.a
lib/libvanessa_socket.la
+@lib lib/libvanessa_socket.so.${LIBvanessa_socket_VERSION}
+lib/pkgconfig/
+lib/pkgconfig/vanessa-socket.pc
@man man/man1/vanessa_socket_pipe.1
