- remove now unnecessary PATCH_LIST tag

- BUILD_DEPENDS -> LIB_DEPENDS, rsaref makes a shared library
- add patch so that pgp respects CC
This commit is contained in:
brad 1999-12-13 03:58:18 +00:00
parent a9c6511db5
commit a968268103
2 changed files with 45 additions and 9 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.13 1999/12/12 22:01:15 dugsong Exp $
# $OpenBSD: Makefile,v 1.14 1999/12/13 03:58:18 brad Exp $
DISTNAME= pgp263is
PKGNAME= pgp-2.6.3
@ -7,8 +7,6 @@ MASTER_SITES= http://the.wiretapped.net/security/cryptography/pgp/2.x/src/ \
ftp://ftp.ifi.uio.no/pub/pgp/2.x/src/ \
ftp://ftp.dk.pgpi.com/mirrors/ftp.ifi.uio.no/pub/pgp/2.x/src/
PATCH_LIST= patch-doc
MAINTAINER= ports@openbsd.org
NO_CDROM= "CRYPTO: Third party crypto not allowed."
@ -22,10 +20,10 @@ CFLAGS+=-DUNIX -DPORTABLE -DMERIT -DIDEA32 -DMAX_NAMELEN=255 \
-DPGP_DOC_DIR=\\\"${PGP_DOC_DIR}\\\"
.if defined(USA_RESIDENT) && ${USA_RESIDENT:U} == YES
BUILD_DEPENDS= ${PREFIX}/lib/librsaref.a:${PORTSDIR}/security/rsaref
LIB_DEPENDS= rsaref.2:${PORTSDIR}/security/rsaref
RSAOBJS= rsaglue2.o
RSAINCDIR= -I${PREFIX}/include
RSALIBS= ${PREFIX}/lib/librsaref.a
RSAINCDIR= -I${LOCALBASE}/include
RSALIBS= -L${LOCALBASE}/lib -lrsaref
CFLAGS+= -DUSA ${RSAINCDIR}
.else
RSAOBJS= rsaglue1.o
@ -76,9 +74,8 @@ pre-build:
fi
do-build:
@(cd ${WRKSRC} && \
env ${MAKE_ENV} make -f makefile all \
RSAOBJS="${RSAOBJS}" RSAINCDIR="${RSAINCDIR}" RSALIBS="${RSALIBS}" \
@(cd ${WRKSRC} && env ${MAKE_ENV} make -f makefile all \
RSAOBJS="${RSAOBJS}" RSALIBS="${RSALIBS}" \
CFLAGS="${CFLAGS} `cat ${WRKDIR}/.endian`" )
do-install:

View File

@ -0,0 +1,39 @@
--- makefile.orig Sun Dec 12 22:09:37 1999
+++ makefile Sun Dec 12 22:14:36 1999
@@ -50,13 +50,13 @@
# -DUSE_SELECT to use select() system call
# -DUSE_NBIO to use non-blocking read()
-CFLAGS= -O -DUNIX -DPORTABLE $(BYTEORDER)
+#CFLAGS= -O -DUNIX -DPORTABLE $(BYTEORDER)
# must set byte order for targets "sysv" and "bsd"
# BYTEORDER= -DHIGHFIRST
-CC = cc
-LD = cc # Link command
+#CC = cc
+LD = $(CC) # Link command
LDFLAGS =
CPP = $(CC) -E
DBG = -O
@@ -97,8 +97,8 @@
all: $(PROJ)
# For a pure MPILIB version, uncomment the following lines
-RSALIBS =
-RSAOBJS = rsaglue1.o
+#RSALIBS =
+#RSAOBJS = rsaglue1.o
# For an RSAREF version, uncomment the following lines
#RSADIR = ../rsaref
@@ -146,7 +146,7 @@
randpool.o noise.o
OBJS = $(OBJ1) $(ZIPOBJS) $(RSAOBJS) $(OBJS_EXT)
-CFLAGS = $(CFLAGS) -I$(RSAINCDIR)
+#CFLAGS = $(CFLAGS) -I$(RSAINCDIR)
$(PROJ): $(OBJS)
$(LD) -o $(PROJ) $(OBJS) $(LDFLAGS) $(LIBS_EXT) $(RSALIBS)