ports/55044: [update] mail/perdition: update mysql hack to "lastest revision".
Clement Laforet
sheepkiller at cultdeadsheep.org
Wed Jul 30 19:10:22 UTC 2003
The following reply was made to PR ports/55044; it has been noted by GNATS.
From: Clement Laforet <sheepkiller at cultdeadsheep.org>
To: FreeBSD-gnats-submit at FreeBSD.org
Cc:
Subject: Re: ports/55044: [update] mail/perdition: update mysql hack to
"lastest revision".
Date: Wed, 30 Jul 2003 21:00:40 +0200
make "portlint -A" happy
reported by: kirill (krion@)
(overrides previous patch)
diff -Nru perdition.orig/Makefile perdition/Makefile
--- perdition.orig/Makefile Wed Jul 30 20:56:40 2003
+++ perdition/Makefile Wed Jul 30 14:08:50 2003
@@ -7,6 +7,7 @@
PORTNAME= perdition
PORTVERSION= 1.11
+PORTREVISION= 1
CATEGORIES= mail net security
MASTER_SITES= http://www.vergenet.net/linux/perdition/download/${PORTVERSION}/
@@ -25,7 +26,7 @@
- perdition.imap4.8 - perdition.imap4s.8 \
- perdition.imaps.8 - perdition.pop3.8
-MANCOMPRESSED= no
+MANCOMPRESSED= no
USE_LIBTOOL= YES
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
@@ -34,14 +35,6 @@
INSTALLS_SHLIB= yes
-# Dirty hack :)
-MYSQL323_LIBVER=10
-MYSQL40_LIBVER= 12
-MYSQL41_LIBVER= 14
-
-MYSQL_VER?= 323
-LDAP_VER?= 21
-
# Available knobs:
# WITHOUT_SSL: Disable OpenSSL support
# WITHOUT_POSIX_REGEX: Disable native regex support
@@ -49,10 +42,35 @@
# WITH_NIS: Enable NIS database backend
# WITH_GDBM: Enable gdbm database backend
# WITH_MYSQL: Enable MySQL database backend
+# WITH_MYSQL_VER:
+# - 323 use MySQL 3.23.x
+# - 40 use MySQL 4.0.x
+# - 41 use MySQL 4.1.x
# WITH_PGSQL: Enable PostgreSQL database backend
# WITH_OPENLDAP: Enable OpenLDAP database backend
# WITH_ODBC: Enable ODBC database backend
+LDAP_VER?= 21
+
+# MySQL deps hack (revision 2)
+MYSQL323_LIBVER=10
+MYSQL40_LIBVER= 12
+MYSQL41_LIBVER= 14
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_MYSQL_VER)
+MYSQL_VER= ${WITH_MYSQL_VER}
+.elif exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.${MYSQL_323_LIBVER})
+MYSQL_VER= 323
+.elif exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.${MYSQL40_LIBVER})
+MYSQL_VER= 40
+.elif exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.${MYSQL41_LIBVER})
+MYSQL_VER= 41
+.else
+MYSQL_VER= 40
+.endif
+
.if !defined(WITHOUT_SSL)
CONFIGURE_ARGS+= --enable-ssl
USE_OPENSSL= yes
@@ -146,4 +164,4 @@
@${ECHO_MSG} "/********************************************************/"
@${ECHO_MSG} ""
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -Nru perdition.orig/pkg-plist perdition/pkg-plist
--- perdition.orig/pkg-plist Wed Jul 30 20:56:41 2003
+++ perdition/pkg-plist Wed Jul 30 20:56:18 2003
@@ -52,8 +52,6 @@
sbin/perdition.imap4
sbin/perdition.imap4s
sbin/perdition.imaps
-share/doc/perdition/perdition-pam.sample
+%%DOCSDIR%%/perdition-pam.sample
@unexec rmdir %D/etc/perdition 2>/dev/null || echo "If you are permanently removing this port, you should do a ``rm -rf ${PKG_PREFIX}/etc/perdition`` to remove any files left." | fmt
@dirrm share/doc/perdition
- at exec /sbin/ldconfig -m %D/lib
- at unexec /sbin/ldconfig -R %D/lib
More information about the freebsd-ports-bugs
mailing list