diff options
| author | sobomax <sobomax@FreeBSD.org> | 2002-04-26 14:23:41 +0800 |
|---|---|---|
| committer | sobomax <sobomax@FreeBSD.org> | 2002-04-26 14:23:41 +0800 |
| commit | e2a688f868ea768807d4d98d82028b973565d241 (patch) | |
| tree | 6c7ee07a5fd5d35fb6eea85aed171dea8fbd195a /security | |
| parent | 7253cb8c88c3fd84eced53af11e66ba617c1b485 (diff) | |
| download | freebsd-ports-graphics-e2a688f868ea768807d4d98d82028b973565d241.tar.gz freebsd-ports-graphics-e2a688f868ea768807d4d98d82028b973565d241.tar.zst freebsd-ports-graphics-e2a688f868ea768807d4d98d82028b973565d241.zip | |
Fix libgmp breakage on -current.
Diffstat (limited to 'security')
| -rw-r--r-- | security/ssh/Makefile | 6 | ||||
| -rw-r--r-- | security/ssh/files/patch-ac | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/security/ssh/Makefile b/security/ssh/Makefile index 13be90b61b0..3dffefc4ca5 100644 --- a/security/ssh/Makefile +++ b/security/ssh/Makefile @@ -66,6 +66,12 @@ CONFIGURE_ARGS+= --without-idea .include <bsd.port.pre.mk> +.if ${OSVERSION} > 500023 +LIB_DEPENDS+= gmp.4:${PORTSDIR}/math/libgmp3 +MAKE_ENV+= GMPINCDIR="${LOCALBASE}/include" \ + GMPLIBDIR="${LOCALBASE}/lib" +.endif + .if (${OSVERSION} >= 400016 && !defined(REALLY_WANT_SSH)) FORBIDDEN= "OpenSSH is a superior version of SSH which has been included in the FreeBSD base system since 4.0-RELEASE. This port is now deprecated and will be removed at some point in the future. To override this warning set the REALLY_WANT_SSH environment variable and rebuild." .endif diff --git a/security/ssh/files/patch-ac b/security/ssh/files/patch-ac index 1f4163606c0..29bdcba285f 100644 --- a/security/ssh/files/patch-ac +++ b/security/ssh/files/patch-ac @@ -1,5 +1,5 @@ ---- Makefile.in.orig Wed May 12 04:19:31 1999 -+++ Makefile.in Sun Sep 17 01:39:40 2000 +--- Makefile.in.orig Wed May 12 14:19:31 1999 ++++ Makefile.in Fri Apr 26 09:19:30 2002 @@ -301,12 +301,17 @@ SHELL = /bin/sh @@ -7,9 +7,9 @@ -GMPLIBS = -L$(GMPDIR) -lgmp -GMPDEP = $(GMPDIR)/gmp.h $(GMPDIR)/libgmp.a +# We have the same libgmp in the system, so use it instead -+GMPINCDIR = /usr/include -+GMPLIBDIR = /usr/lib -+GMPLIBS = -lgmp ++GMPINCDIR ?= /usr/include ++GMPLIBDIR ?= /usr/lib ++GMPLIBS = -L$(GMPLIBDIR) -lgmp +GMPDEP = $(GMPINCDIR)/gmp.h $(GMPLIBDIR)/libgmp.a ZLIBDIR = zlib-1.0.4 @@ -27,7 +27,7 @@ .c.o: - $(CC) -c -I. $(KERBEROS_INCS) -I$(srcdir)/$(GMPDIR) -I$(srcdir)/$(ZLIBDIR) $(DEFS) -DHOST_KEY_FILE=\"$(HOST_KEY_FILE)\" -DHOST_CONFIG_FILE=\"$(HOST_CONFIG_FILE)\" -DSERVER_CONFIG_FILE=\"$(SERVER_CONFIG_FILE)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DETCDIR=\"$(etcdir)\" -DPIDDIR=\"$(piddir)\" -DSSH_BINDIR=\"$(bindir)\" -DTIS_MAP_FILE=\"$(TIS_MAP_FILE)\" $(CFLAGS) $(X_CFLAGS) $< -+ $(CC) -c -I. $(KERBEROS_INCS) -I$(srcdir)/$(GMPINCDIR) -I$(srcdir)/$(ZLIBINCDIR) $(DEFS) -DHOST_KEY_FILE=\"$(HOST_KEY_FILE)\" -DHOST_CONFIG_FILE=\"$(HOST_CONFIG_FILE)\" -DSERVER_CONFIG_FILE=\"$(SERVER_CONFIG_FILE)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DETCDIR=\"$(etcdir)\" -DPIDDIR=\"$(piddir)\" -DSSH_BINDIR=\"$(bindir)\" -DTIS_MAP_FILE=\"$(TIS_MAP_FILE)\" $(CFLAGS) $(X_CFLAGS) $< ++ $(CC) -c -I. $(KERBEROS_INCS) -I$(GMPINCDIR) -I$(srcdir)/$(ZLIBINCDIR) $(DEFS) -DHOST_KEY_FILE=\"$(HOST_KEY_FILE)\" -DHOST_CONFIG_FILE=\"$(HOST_CONFIG_FILE)\" -DSERVER_CONFIG_FILE=\"$(SERVER_CONFIG_FILE)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DETCDIR=\"$(etcdir)\" -DPIDDIR=\"$(piddir)\" -DSSH_BINDIR=\"$(bindir)\" -DTIS_MAP_FILE=\"$(TIS_MAP_FILE)\" $(CFLAGS) $(X_CFLAGS) $< sshd: $(SSHD_OBJS) $(GMPDEP) $(RSAREFDEP) $(ZLIBDEP) -rm -f sshd |