Date: Wed, 23 Jul 2003 16:33:59 +0100 (BST) From: Bruce M Simpson <bms@spc.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/54783: [PATCH] ftp/proftpd: fix for mysql41, MODULES_OVERRIDE Message-ID: <20030723153359.61ABC711@saboteur.dek.spc.org> Resent-Message-ID: <200307231540.h6NFeEck025420@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 54783
>Category: ports
>Synopsis: [PATCH] ftp/proftpd: fix for mysql41, MODULES_OVERRIDE
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Wed Jul 23 08:40:13 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Bruce M Simpson
>Release: FreeBSD 5.1-RELEASE i386
>Organization:
>Environment:
System: FreeBSD saboteur.dek.spc.org 5.1-RELEASE FreeBSD 5.1-RELEASE #3: Mon Jun 23 06:55:01 BST 2003 root@saboteur.dek.spc.org:/usr/src/sys/i386/compile/SABOTEUR i386
>Description:
Fix the makefile so that MODULES_OVERRIDE can be used to specify
additional modules without clobbering the other WITH_* options.
I needed this so I could compile with mod_tls and WITH_MYSQL.
Versionize the WITH_MYSQL and WITH_LDAP defines.
>How-To-Repeat:
>Fix:
--- proftpd.patch begins here ---
diff -uN proftpd.orig/Makefile proftpd/Makefile
--- proftpd.orig/Makefile Mon Mar 24 13:33:28 2003
+++ proftpd/Makefile Wed Jul 23 16:22:53 2003
@@ -39,21 +39,36 @@
.endif
#allow user to override
-MODULES?= mod_ratio:mod_readme:mod_wrap
+MODULES_OVERRIDE?= mod_ratio:mod_readme:mod_wrap
+MODULES= ${MODULES_OVERRIDE}
INCLUDEDIRS=
LIBDIRS=
.if defined(WITH_LDAP)
-MODULES:=${MODULES}:mod_ldap
+.if ${WITH_LDAP} == 21
+BUILD_DEPENDS+= ${LOCALBASE}/lib/libldap.a:${PORTSDIR}/net/openldap21
+.elif ${WITH_LDAP} == 20
+BUILD_DEPENDS+= ${LOCALBASE}/lib/libldap.a:${PORTSDIR}/net/openldap20
+.else
BUILD_DEPENDS+= ${LOCALBASE}/lib/libldap.a:${PORTSDIR}/net/openldap12
+.endif
+MODULES:=${MODULES}:mod_ldap
INCLUDEDIRS:=${INCLUDEDIRS}:${PREFIX}/include
LIBDIRS:=${LIBDIRS}:${PREFIX}/lib
.endif
.if defined(WITH_MYSQL)
-MODULES:=${MODULES}:mod_sql:mod_sql_mysql
+.if ${WITH_MYSQL} == 41
+LIB_DEPENDS+= mysqlclient.14:${PORTSDIR}/databases/mysql41-client
+CFLAGS+=-D__MYSQL_VERSION=4
+.elif ${WITH_MYSQL} == 40
+LIB_DEPENDS+= mysqlclient.12:${PORTSDIR}/databases/mysql40-client
+CFLAGS+=-D__MYSQL_VERSION=4
+.else
LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client
+.endif
+MODULES:=${MODULES}:mod_sql:mod_sql_mysql
INCLUDEDIRS:=${INCLUDEDIRS}:${PREFIX}/include
LIBDIRS:=${LIBDIRS}:${PREFIX}/lib/mysql
.endif
Common subdirectories: proftpd.orig/files and proftpd/files
Common subdirectories: proftpd.orig/work and proftpd/work
--- proftpd.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030723153359.61ABC711>