From 45e734b715cad00326e706e4f856af51cb76ca85 Mon Sep 17 00:00:00 2001 From: kris Date: Sun, 6 Feb 2000 22:25:15 +0000 Subject: USE_OPENSSL Assisted by: Jim Bloom --- japanese/w3m-ssl/Makefile | 2 +- security/slush/Makefile | 12 +-------- security/slush/files/patch-aa | 60 ++++++++++++++++--------------------------- www/lynx-ssl/Makefile | 18 +++++-------- www/lynx-ssl/files/patch-aa | 6 ++--- www/w3m-ssl/Makefile | 2 +- www/w3m/Makefile | 21 +++++---------- 7 files changed, 41 insertions(+), 80 deletions(-) diff --git a/japanese/w3m-ssl/Makefile b/japanese/w3m-ssl/Makefile index e5b364c..100b4c2 100644 --- a/japanese/w3m-ssl/Makefile +++ b/japanese/w3m-ssl/Makefile @@ -14,6 +14,6 @@ PKGDIR= ${.CURDIR}/pkg PLIST= ${MASTERDIR}/pkg/PLIST.ja JAPANESE= Yes -USE_SSL= Yes +USE_OPENSSL= RSA .include "${MASTERDIR}/Makefile" diff --git a/security/slush/Makefile b/security/slush/Makefile index 9461a4e..34df7de 100644 --- a/security/slush/Makefile +++ b/security/slush/Makefile @@ -13,25 +13,15 @@ MASTER_SITES= http://violet.ibs.com.au/slush/files/ \ MAINTAINER= shipley@dis.org -BUILD_DEPENDS= openssl:${PORTSDIR}/security/openssl -LIB_DEPENDS= crypto.1:${PORTSDIR}/security/openssl \ - ssl.1:${PORTSDIR}/security/openssl - -#MAN= slush.1 - GNU_CONFIGURE= yes -#NOPROFILE= true +USE_OPENSSL= RSA .include .if ${OSVERSION} <= 300000 BROKEN= does not build .endif -.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES -MAKE_ENV+= EXTRA_SSL_LIBS="-lRSAglue -lrsaref" -.endif - do-install: .if !defined(NOPORTDOCS) @${MKDIR} ${PREFIX}/share/doc/slush diff --git a/security/slush/files/patch-aa b/security/slush/files/patch-aa index 792cb9a..1055033 100644 --- a/security/slush/files/patch-aa +++ b/security/slush/files/patch-aa @@ -1,38 +1,22 @@ -*** Makefile.in.orig Tue Apr 6 03:05:04 1999 ---- Makefile.in Sun May 16 21:37:14 1999 -*************** -*** 9,16 **** - - CC=@CC@ - INSTALL=@INSTALL@ -! CFLAGS=@CFLAGS@ -Wall -DVERSION=\"$(VERSION)\" -I/usr/local/ssl/include -I/usr/include/ssl -! LIBS=@LIBS@ -L/usr/local/ssl/lib -lssl -lcrypto - - all: slush slushd - ---- 9,16 ---- - - CC=@CC@ - INSTALL=@INSTALL@ -! CFLAGS=@CFLAGS@ -Wall -DVERSION=\"$(VERSION)\" -I/usr/local/include -I/usr/local/include/openssl -! LIBS=@LIBS@ -L/usr/local/lib -lssl -lcrypto $(EXTRA_SSL_LIBS) -lutil - - all: slush slushd - -*************** -*** 38,44 **** - install: $(SBINDIR)/slushd $(MANDIR)/slush.8 - - cert: -! ssleay req -new -x509 -nodes \ - -out slushd.pem -days 365 -keyout slushd.pem - - clean: ---- 38,44 ---- - install: $(SBINDIR)/slushd $(MANDIR)/slush.8 - - cert: -! openssl req -new -x509 -nodes \ - -out slushd.pem -days 365 -keyout slushd.pem - - clean: +--- Makefile.in.orig Tue Apr 6 01:05:04 1999 ++++ Makefile.in Sat Jan 29 16:23:51 2000 +@@ -9,8 +9,8 @@ + + CC=@CC@ + INSTALL=@INSTALL@ +-CFLAGS=@CFLAGS@ -Wall -DVERSION=\"$(VERSION)\" -I/usr/local/ssl/include -I/usr/include/ssl +-LIBS=@LIBS@ -L/usr/local/ssl/lib -lssl -lcrypto ++CFLAGS=@CFLAGS@ -Wall -DVERSION=\"$(VERSION)\" -I$(OPENSSLINC) -I$(OPENSSLINC)/openssl -I$(LOCALBASE)/include ++LIBS=@LIBS@ -L$(OPENSSLLIB) -lssl -lcrypto $(EXTRA_SSL_LIBS) -lutil + + all: slush slushd + +@@ -38,7 +38,7 @@ + install: $(SBINDIR)/slushd $(MANDIR)/slush.8 + + cert: +- ssleay req -new -x509 -nodes \ ++ openssl req -new -x509 -nodes \ + -out slushd.pem -days 365 -keyout slushd.pem + + clean: diff --git a/www/lynx-ssl/Makefile b/www/lynx-ssl/Makefile index 418366d..d4045f0 100644 --- a/www/lynx-ssl/Makefile +++ b/www/lynx-ssl/Makefile @@ -11,9 +11,12 @@ PKGNAME= lynx-ssl-2.8.2.1 CATEGORIES= www MASTER_SITES= http://sol.slcc.edu/lynx/current/ -.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES +USE_OPENSSL= RSA + +.include + +.if defined(OPENSSL_RSAREF) PATCH_SITES= http://www.moxienet.com/lynx/ -EXTRA_SSL_LIBS= "-lRSAglue -lrsaref" .else PATCH_SITES= ftp://ftp.musin.de/unix/ .endif @@ -22,18 +25,11 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= sec@42.org -BUILD_DEPENDS= openssl:${PORTSDIR}/security/openssl -LIB_DEPENDS= crypto.1:${PORTSDIR}/security/openssl \ - ssl.1:${PORTSDIR}/security/openssl - -RESTRICTED= "Contains cryptography" - GNU_CONFIGURE= YES -CFLAGS+= -I${PREFIX}/include/openssl +CFLAGS+= -I${OPENSSLINC}/openssl CONFIGURE_ARGS= --with-screen=ncurses --with-zlib --libdir="${PREFIX}/etc" \ --enable-nsl-fork MAKEFILE= makefile -MAKE_ENV+= EXTRA_SSL_LIBS=${EXTRA_SSL_LIBS} INSTALL_TARGET= install install-help MAN1= lynx.1 @@ -43,4 +39,4 @@ post-install: ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/lynx_help ${CHOWN} ${SHAREOWN}:${SHAREGRP} ${PREFIX}/etc/lynx.cfg -.include +.include diff --git a/www/lynx-ssl/files/patch-aa b/www/lynx-ssl/files/patch-aa index 38708c8..c7cfa0b 100644 --- a/www/lynx-ssl/files/patch-aa +++ b/www/lynx-ssl/files/patch-aa @@ -1,5 +1,5 @@ ---- makefile.in.orig Wed Jun 9 23:24:37 1999 -+++ makefile.in Wed Jun 9 23:26:39 1999 +--- makefile.in.orig Sat Jan 29 23:43:49 2000 ++++ makefile.in Sun Jan 30 00:04:17 2000 @@ -54,7 +54,7 @@ DOCDIR= $(DESTDIR)$(docdir) @@ -15,7 +15,7 @@ # ability to make SSL connections. -SSL_DIR= /usr/local/ssl -SSL_LIBS= -L$(SSL_DIR)/lib -lssl -lcrypto -+SSL_DIR= $(prefix) ++SSL_DIR= $(OPENSSLBASE) +SSL_LIBS= -L$(SSL_DIR)/lib -lssl -lcrypto ${EXTRA_SSL_LIBS} SSL_DEFINES= -I$(SSL_DIR)/include -DUSE_SSL diff --git a/www/w3m-ssl/Makefile b/www/w3m-ssl/Makefile index 08947da..dbb81ce 100644 --- a/www/w3m-ssl/Makefile +++ b/www/w3m-ssl/Makefile @@ -13,6 +13,6 @@ MASTERDIR= ${.CURDIR}/../../www/w3m PKGDIR= ${.CURDIR}/pkg PLIST= ${MASTERDIR}/pkg/PLIST -USE_SSL= Yes +USE_OPENSSL= RSA .include "${MASTERDIR}/Makefile" diff --git a/www/w3m/Makefile b/www/w3m/Makefile index 064af9f..2d48a8d 100644 --- a/www/w3m/Makefile +++ b/www/w3m/Makefile @@ -16,10 +16,6 @@ MASTER_SITES= ftp://ei5nazha.yz.yamagata-u.ac.jp/w3m/dev/ \ MAINTAINER= nobutaka@nobutaka.com -.if defined(USE_SSL) -RESTRICTED= "Contains cryptography" -.endif - BUILD_DEPENDS= ${LOCALBASE}/lib/libgc.a:${PORTSDIR}/devel/boehm-gc WRKSRC= ${WRKDIR}/w3m @@ -47,21 +43,16 @@ DOCS_JP= ${DOCS} HISTORY HISTORY.kokb README.keymap README.kokb \ README.menu .endif -.if defined(USE_SSL) -LIB_DEPENDS+= crypto.1:${PORTSDIR}/security/openssl \ - ssl.1:${PORTSDIR}/security/openssl - -SSL_CFLAGS= -I${LOCALBASE}/include/openssl -SSL_LIBS= -lssl -lcrypto -.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES -EXTRA_SSL_LIBS= -lRSAglue -lrsaref -.endif +.if defined(USE_OPENSSL) +SSL_CFLAGS= -I${OPENSSLINC}/openssl -I${OPENSSLINC} +SSL_LIBS= -L${OPENSSLLIB} -lssl -lcrypto SED_CMD+= -e "s,undef USE_SSL,define USE_SSL,g" .endif -MAKE_FLAGS+= DEFS="-I${LOCALBASE}/include ${SSL_CFLAGS}" \ - LIBS="-L${LOCALBASE}/lib ${SSL_LIBS} ${EXTRA_SSL_LIBS}" +EXTRA_SSL_LIBS= -lRSAglue -lrsaref -L${LOCALBASE}/lib +MAKE_FLAGS+= DEFS="${SSL_CFLAGS} -I${LOCALBASE}/include" \ + LIBS="${SSL_LIBS} ${EXTRA_SSL_LIBS}" post-configure: @${CP} ${TARGET} ${TARGET}.in -- cgit v1.1