aboutsummaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorKris Kennaway <kris@FreeBSD.org>2000-02-12 09:02:44 +0000
committerKris Kennaway <kris@FreeBSD.org>2000-02-12 09:02:44 +0000
commit9d59123ac1e3d3cd73802fc38422398c7cba9be9 (patch)
treeb71302b6873b06e3b1c3c9b518a3230b457af80c /www
parent63f4bcf9d762b5ad9ad237b2f47a97a712aea2dc (diff)
downloadports-9d59123ac1e3d3cd73802fc38422398c7cba9be9.tar.gz
ports-9d59123ac1e3d3cd73802fc38422398c7cba9be9.zip
Notes
Diffstat (limited to 'www')
-rw-r--r--www/apache13-ssl/Makefile34
-rw-r--r--www/apache13-ssl/files/patch-ar2
2 files changed, 10 insertions, 26 deletions
diff --git a/www/apache13-ssl/Makefile b/www/apache13-ssl/Makefile
index 019d7fbfc446..c2e20e136e19 100644
--- a/www/apache13-ssl/Makefile
+++ b/www/apache13-ssl/Makefile
@@ -37,14 +37,11 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
MAINTAINER= adam@algroup.co.uk
-BUILD_DEPENDS= openssl:${PORTSDIR}/security/openssl
-
-LIB_DEPENDS= crypto.1:${PORTSDIR}/security/openssl \
- ssl.1:${PORTSDIR}/security/openssl
-RUN_DEPENDS= openssl:${PORTSDIR}/security/openssl
+USE_OPENSSL= RSA
+.include <bsd.port.pre.mk>
HAS_CONFIGURE= yes
-CFLAGS+= -I${PREFIX}/include/openssl
+CFLAGS+= -I${OPENSSLINC}/openssl
CONFIGURE_ARGS= \
--prefix=${PREFIX} \
--with-layout=GNU \
@@ -71,14 +68,12 @@ CFLAGS+= -O6 -fomit-frame-pointer
.endif
CONFIGURE_ENV= OPTIM='${OPTIM}'
-.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
-MAKE_ENV+=EXTRA_SSL_LIBS="-lRSAglue -lrsaref"
+.if defined(OPENSSL_RSAREF)
+CONFIGURE_ENV+= EXTRA_SSL_LIBS="-L${OPENSSLLIB} -lRSAglue -L${LOCALBASE}/lib -lrsaref"
.endif
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
-RESTRICTED= "Contains cryptography"
-
MAN1= dbmmanage.1 htdigest.1 htpasswd.1
MAN8= ab.8 httpsdctl.8 apxs.8 httpsd.8 logresolve.8 rotatelogs.8
@@ -86,24 +81,13 @@ post-extract:
@cd ${WRKSRC} && tar xzf ${DISTDIR}/apache_${APACHE}+ssl_${APACHE-SSL}${EXTRACT_SUFX}
post-patch:
- @cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ./FixPatch
-
-pre-configure:
-.if !defined(USA_RESIDENT) || ${USA_RESIDENT} != YES
- @${ECHO}
- @${ECHO} "*** Warning!"
- @${ECHO} You must set variable USA_RESIDENT to YES if you are USA
- @${ECHO} resident and are using RSAREF otherwise package will not link
- @${ECHO} correctly.
- @${ECHO}
- @${ECHO}
-.endif
+ @cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ./FixPatch ${OPENSSLBASE}
certificate:
- @if [ -f ${PREFIX}/lib/openssl.cnf ]; then \
+ @if [ -f ${OPENSSLDIR}/openssl.cnf ]; then \
cd ${WRKSRC}; ${MAKE} ${MAKE_ENV} $@; \
${CP} ${WRKSRC}/SSLconf/conf/httpsd.pem ${PREFIX}/certs/cert.pem; \
else \
- ${ECHO} "You must create the file ${PREFIX}/lib/openssl.cnf first."; \
+ ${ECHO} "You must create the file ${OPENSSLDIR}/openssl.cnf first."; \
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/apache13-ssl/files/patch-ar b/www/apache13-ssl/files/patch-ar
index d1f2bdc79cc9..deb116c2c053 100644
--- a/www/apache13-ssl/files/patch-ar
+++ b/www/apache13-ssl/files/patch-ar
@@ -5,7 +5,7 @@
+SSL_CFLAGS= -DAPACHE_SSL
+SSL_LIB_DIR= $(SSL_BASE)
-+SSL_LIBS= -L$(SSL_LIB_DIR) -lssl -lcrypto
-++SSL_LIBS= -L$(SSL_LIB_DIR) -lssl -lcrypto $(EXTRA_SSL_LIBS)
+++SSL_LIBS= -L$(OPENSSLLIB) -lssl -lcrypto $(EXTRA_SSL_LIBS)
+SSL_APP_DIR= $(SSL_BASE)/apps
+SSL_APP=/usr/home/ben/work/openssl/apps/openssl
+