Bug 55044 - [update] mail/perdition: update mysql hack to "lastest revision".
Summary: [update] mail/perdition: update mysql hack to "lastest revision".
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: freebsd-ports-bugs (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2003-07-30 12:30 UTC by Clement Laforet
Modified: 2003-07-31 07:40 UTC (History)
1 user (show)

See Also:


Attachments
perdition.diff (1.71 KB, patch)
2003-07-30 12:30 UTC, Clement Laforet
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Clement Laforet 2003-07-30 12:30:10 UTC
	Add simplisitic MySQL auto detection hack to perdition.

How-To-Repeat: 	N/A.
Comment 1 Clement Laforet 2003-07-30 20:00:40 UTC
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
-@exec /sbin/ldconfig -m %D/lib
-@unexec /sbin/ldconfig -R %D/lib
Comment 2 Daichi GOTO freebsd_committer freebsd_triage 2003-07-31 07:40:18 UTC
State Changed
From-To: open->closed

Committed. Thanks!