diff options
| author | Beech Rintoul <beech@FreeBSD.org> | 2008-01-07 20:55:35 +0000 |
|---|---|---|
| committer | Beech Rintoul <beech@FreeBSD.org> | 2008-01-07 20:55:35 +0000 |
| commit | c968cbbd6704540f4baa5fc0b32d6fafb7e6b82a (patch) | |
| tree | b4b40d63cef41d2c4eb123ab0328d2b9a2f4c259 /ftp | |
| parent | Revert bad commit. The size was OK for *this* version. (diff) | |
- Fix issue, if compiled with both base and port versions of openssl
installed, mod_tls will fail to load.
- Bump portrevision
PR: ports/119243
Submitted by: Joe Horn <joehorn@gmail.com>
Approved by: linimon (mentor)
Notes
Notes:
svn path=/head/; revision=205188
Diffstat (limited to 'ftp')
| -rw-r--r-- | ftp/proftpd-devel/Makefile | 6 | ||||
| -rw-r--r-- | ftp/proftpd/Makefile | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ftp/proftpd-devel/Makefile b/ftp/proftpd-devel/Makefile index 6828f7f79cfb..819a5754ab62 100644 --- a/ftp/proftpd-devel/Makefile +++ b/ftp/proftpd-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= proftpd DISTVERSION= 1.3.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= ftp MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \ @@ -187,9 +187,9 @@ PLIST_FILES+= include/proftpd/mod_sql.h .endif .if defined(WITH_OPENSSL) -CFLAGS+= -DHAVE_OPENSSL .include <${PORTSDIR}/Mk/bsd.openssl.mk> -PROFTPD_LIBS+= -lssl -lcrypto -L${LOCALBASE}/lib +CFLAGS+= -DHAVE_OPENSSL -I${OPENSSLINC} +PROFTPD_LIBS+= -lssl -lcrypto -L${OPENSSLLIB} MODULES:=${MODULES}:mod_tls .endif diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile index 6828f7f79cfb..819a5754ab62 100644 --- a/ftp/proftpd/Makefile +++ b/ftp/proftpd/Makefile @@ -7,7 +7,7 @@ PORTNAME= proftpd DISTVERSION= 1.3.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= ftp MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \ @@ -187,9 +187,9 @@ PLIST_FILES+= include/proftpd/mod_sql.h .endif .if defined(WITH_OPENSSL) -CFLAGS+= -DHAVE_OPENSSL .include <${PORTSDIR}/Mk/bsd.openssl.mk> -PROFTPD_LIBS+= -lssl -lcrypto -L${LOCALBASE}/lib +CFLAGS+= -DHAVE_OPENSSL -I${OPENSSLINC} +PROFTPD_LIBS+= -lssl -lcrypto -L${OPENSSLLIB} MODULES:=${MODULES}:mod_tls .endif |