Bug 55333 - [REPOCOPY WAITING] mail/teapop-devel
Summary: [REPOCOPY WAITING] mail/teapop-devel
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: Clement Laforet
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2003-08-07 04:40 UTC by Clement Laforet
Modified: 2003-12-22 11:09 UTC (History)
1 user (show)

See Also:

Attachments
teapop-devel.shar (5.64 KB, text/plain)
2003-08-07 04:40 UTC, Clement Laforet 		no flags Details
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Clement Laforet 2003-08-07 04:40:09 UTC 
	-current version of teapop POP3 server.

How-To-Repeat: 	N/A.
Comment 1 Clement Laforet 2003-08-14 21:34:27 UTC 
Update to be compliant with new openldap2X-client ports.


diff -Nru teapop-devel.old/Makefile teapop-devel/Makefile
--- teapop-devel.old/Makefile	Thu Aug 14 22:26:18 2003
+++ teapop-devel/Makefile	Thu Aug 14 22:26:39 2003
@@ -96,7 +96,7 @@
 
 .if defined(WITH_LDAP)
 CONFIGURE_ARGS+=	--with-ldap=openldap
-LIB_DEPENDS+=		ldap.2:${PORTSDIR}/net/openldap${LDAP_VER}
+LIB_DEPENDS+=		ldap.2:${PORTSDIR}/net/openldap${LDAP_VER}-client
 .endif
 
 show-options:
Comment 2 Clement Laforet 2003-08-14 21:34:27 UTC 
Update to be compliant with new openldap2X-client ports.


diff -Nru teapop-devel.old/Makefile teapop-devel/Makefile
--- teapop-devel.old/Makefile	Thu Aug 14 22:26:18 2003
+++ teapop-devel/Makefile	Thu Aug 14 22:26:39 2003
@@ -96,7 +96,7 @@
 
 .if defined(WITH_LDAP)
 CONFIGURE_ARGS+=	--with-ldap=openldap
-LIB_DEPENDS+=		ldap.2:${PORTSDIR}/net/openldap${LDAP_VER}
+LIB_DEPENDS+=		ldap.2:${PORTSDIR}/net/openldap${LDAP_VER}-client
 .endif
 
 show-options:
Comment 3 Ceri Davies freebsd_committer freebsd_triage 2003-08-15 17:42:25 UTC 
Adding to audit trail, from misfiled PR ports/55586:

Date: Thu, 14 Aug 2003 22:32:18 +0200
From: Clement Laforet <sheepkiller@cultdeadsheep.org>
Message-Id: <20030814223218.21280f5a.sheepkiller@cultdeadsheep.org>

 Update to be use openldap2X-client ports.
 
 
 diff -Nru teapop.old/Makefile teapop/Makefile
 --- teapop.old/Makefile	Thu Aug 14 22:24:02 2003
 +++ teapop/Makefile	Thu Aug 14 22:25:45 2003
 @@ -96,7 +96,7 @@
  
  .if defined(WITH_LDAP)
  CONFIGURE_ARGS+=	--with-ldap=openldap
 -LIB_DEPENDS+=		ldap.2:${PORTSDIR}/net/openldap${LDAP_VER}
 +LIB_DEPENDS+=		ldap.2:${PORTSDIR}/net/openldap${LDAP_VER}-client
  .endif
  
  show-options:
Comment 4 Clement Laforet 2003-08-27 10:45:12 UTC 
Use new USE_OPENLDAP and USE_MYSQL.

--- Makefile.orig	Wed Aug 27 11:37:11 2003
+++ Makefile	Wed Aug 27 11:39:39 2003
@@ -55,48 +55,24 @@
 
 MAN8=		teapop.8
 
-.include <bsd.port.pre.mk>
-
 ## Authentication backend
-##   WITH_LDAP: add support for authentication through OpenLDAP server
-##   WITH_LDAP_VER: OpenLDAP version to use (can be: 20 for 2.0, 21 for 2.1, 22 for 2.2 ; default 21)
+##   WITH_OPENLDAP: add support for authentication through OpenLDAP server
 ##   WITH_MYSQL: enable support for authentication from MySQL database
-##   WITH_MYSQL_VER: MySQL version to use (can be: 323 for 3.23, 40 for 4.0, 4.1 for 4.1 ; default 323)
 ##   WITH_PGSQL: enable support for authentication from PostgreSQL database
 
-MYSQL323_LIBVER=10
-MYSQL40_LIBVER=	12
-MYSQL41_LIBVER=	14
-WITH_LDAP_VER?=	21
-
-# MySQL deps hack (revision 2)
-.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=	323
-.endif
-
-LDAP_VER=	${WITH_LDAP_VER}
-
 .if defined(WITH_PGSQL)
 CONFIGURE_ARGS+=	--with-pgsql
 LIB_DEPENDS+=		pq:${PORTSDIR}/databases/postgresql7
 .endif
 
 .if defined(WITH_MYSQL)
+USE_MYSQL=		YES
 CONFIGURE_ARGS+=	--with-mysql
-LIB_DEPENDS+=		mysqlclient.${MYSQL${MYSQL_VER}_LIBVER}:${PORTSDIR}/databases/mysql${MYSQL_VER}-client
 .endif
 
-.if defined(WITH_LDAP)
+.if defined(WITH_OPENLDAP)
+USE_OPENLDAP=		YES
 CONFIGURE_ARGS+=	--with-ldap=openldap
-LIB_DEPENDS+=		ldap.2:${PORTSDIR}/net/openldap${LDAP_VER}
 .endif
 
 show-options:
@@ -110,4 +86,4 @@
 	@${ECHO} "------------------------------------------------------------------------"
 	@${ECHO} ""
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Comment 5 Clement Laforet 2003-08-27 10:45:12 UTC 
Use new USE_OPENLDAP and USE_MYSQL.

--- Makefile.orig	Wed Aug 27 11:37:11 2003
+++ Makefile	Wed Aug 27 11:39:39 2003
@@ -55,48 +55,24 @@
 
 MAN8=		teapop.8
 
-.include <bsd.port.pre.mk>
-
 ## Authentication backend
-##   WITH_LDAP: add support for authentication through OpenLDAP server
-##   WITH_LDAP_VER: OpenLDAP version to use (can be: 20 for 2.0, 21 for 2.1, 22 for 2.2 ; default 21)
+##   WITH_OPENLDAP: add support for authentication through OpenLDAP server
 ##   WITH_MYSQL: enable support for authentication from MySQL database
-##   WITH_MYSQL_VER: MySQL version to use (can be: 323 for 3.23, 40 for 4.0, 4.1 for 4.1 ; default 323)
 ##   WITH_PGSQL: enable support for authentication from PostgreSQL database
 
-MYSQL323_LIBVER=10
-MYSQL40_LIBVER=	12
-MYSQL41_LIBVER=	14
-WITH_LDAP_VER?=	21
-
-# MySQL deps hack (revision 2)
-.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=	323
-.endif
-
-LDAP_VER=	${WITH_LDAP_VER}
-
 .if defined(WITH_PGSQL)
 CONFIGURE_ARGS+=	--with-pgsql
 LIB_DEPENDS+=		pq:${PORTSDIR}/databases/postgresql7
 .endif
 
 .if defined(WITH_MYSQL)
+USE_MYSQL=		YES
 CONFIGURE_ARGS+=	--with-mysql
-LIB_DEPENDS+=		mysqlclient.${MYSQL${MYSQL_VER}_LIBVER}:${PORTSDIR}/databases/mysql${MYSQL_VER}-client
 .endif
 
-.if defined(WITH_LDAP)
+.if defined(WITH_OPENLDAP)
+USE_OPENLDAP=		YES
 CONFIGURE_ARGS+=	--with-ldap=openldap
-LIB_DEPENDS+=		ldap.2:${PORTSDIR}/net/openldap${LDAP_VER}
 .endif
 
 show-options:
@@ -110,4 +86,4 @@
 	@${ECHO} "------------------------------------------------------------------------"
 	@${ECHO} ""
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Comment 6 Edwin Groothuis freebsd_committer freebsd_triage 2003-10-06 13:46:30 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->edwin

Asked for repocopy.
Comment 7 Clement Laforet freebsd_committer freebsd_triage 2003-12-17 21:43:48 UTC 
Responsible Changed
From-To: edwin->clement

Take my PR back to me (with edwin's approval).
Comment 8 Clement Laforet freebsd_committer freebsd_triage 2003-12-22 11:09:01 UTC 
State Changed
From-To: open->closed

Committed.