diff options
| author | kris <kris@FreeBSD.org> | 2000-02-10 15:29:40 +0800 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2000-02-10 15:29:40 +0800 |
| commit | 799990bad200409f487271bb79995e7fc60c6828 (patch) | |
| tree | f8613844cbb0ce7bad50867836d787d90f8f55d0 /mail/pine4-ssl | |
| parent | 7a47f363a85ef0896c5196a1cc4dc43731550528 (diff) | |
| download | freebsd-ports-gnome-799990bad200409f487271bb79995e7fc60c6828.tar.gz freebsd-ports-gnome-799990bad200409f487271bb79995e7fc60c6828.tar.zst freebsd-ports-gnome-799990bad200409f487271bb79995e7fc60c6828.zip | |
Add two patch files forgotten in the previous commit, and clean up
a portlint warning.
Submitted by: Jim Bloom <bloom@acm.org>
Diffstat (limited to 'mail/pine4-ssl')
| -rw-r--r-- | mail/pine4-ssl/Makefile | 5 | ||||
| -rw-r--r-- | mail/pine4-ssl/files/extrapatch-aa | 18 | ||||
| -rw-r--r-- | mail/pine4-ssl/files/extrapatch-ab | 12 |
3 files changed, 32 insertions, 3 deletions
diff --git a/mail/pine4-ssl/Makefile b/mail/pine4-ssl/Makefile index a184a63b4a5d..264e29c9635a 100644 --- a/mail/pine4-ssl/Makefile +++ b/mail/pine4-ssl/Makefile @@ -7,7 +7,7 @@ # # I spent a <strong>very frustrating</strong> half hour with portlint # on this one and could never get it to fewer than 8 frigging warnings. -# A bit more work got it down to 2 frigging warnings and added a new one. +# A bit more work got it down to 2 frigging warnings. # The warnings are getting harder to fix. # Good luck to you. :-P @@ -31,8 +31,7 @@ MASTERDIR= ${.CURDIR}/../pine4 FILESDIR= ${.CURDIR}/files -# I cannot use ${PATCHDIR} as it points to the master port, not this one -EXTRA_PATCHES= patches/extrapatch-* +EXTRA_PATCHES= ${FILESDIR}/extrapatch-* USE_OPENSSL= RSA diff --git a/mail/pine4-ssl/files/extrapatch-aa b/mail/pine4-ssl/files/extrapatch-aa new file mode 100644 index 000000000000..fa355b44b208 --- /dev/null +++ b/mail/pine4-ssl/files/extrapatch-aa @@ -0,0 +1,18 @@ +--- imap/src/osdep/unix/Makefile.ssl.orig Fri Jan 14 20:56:16 2000 ++++ imap/src/osdep/unix/Makefile.ssl Tue Feb 1 00:34:17 2000 +@@ -1,12 +1,11 @@ + + # Extended flags needed for additional authenticators. You may need to modify. + +-SSLDIR=/usr/local +-SSLCFLAGS= -I$(SSLDIR)/include +-SSLLDFLAGS= -L$(SSLDIR)/lib -lssl -lcrypto ++SSLCFLAGS= -I$(OPENSSLINC) ++SSLLDFLAGS= -L$(OPENSSLLIB) -lssl -lcrypto $(EXTRA_SSL_LIBS) + + .ifdef RSAREF +-SSLLDFLAGS+= -lRSAglue -lrsaref ++SSLLDFLAGS+= -lRSAglue -L${LOCALBASE}/lib -lrsaref + .endif + + ssl: # SSL flags diff --git a/mail/pine4-ssl/files/extrapatch-ab b/mail/pine4-ssl/files/extrapatch-ab new file mode 100644 index 000000000000..d7ac7cea596b --- /dev/null +++ b/mail/pine4-ssl/files/extrapatch-ab @@ -0,0 +1,12 @@ +--- imap/Makefile.orig Tue Feb 1 00:45:16 2000 ++++ imap/Makefile Tue Feb 1 00:46:24 2000 +@@ -274,7 +274,8 @@ + + BUILDOPTIONS= EXTRACFLAGS='$(EXTRACFLAGS)' EXTRALDFLAGS='$(EXTRALDFLAGS)'\ + EXTRADRIVERS='$(EXTRADRIVERS)' EXTRAAUTHENTICATORS='$(EXTRAAUTHENTICATORS)'\ +- PASSWDTYPE=$(PASSWDTYPE) SPECIALAUTHENTICATORS='$(SPECIALAUTHENTICATORS)' ++ PASSWDTYPE=$(PASSWDTYPE) SPECIALAUTHENTICATORS='$(SPECIALAUTHENTICATORS)'\ ++ OPENSSLLIB=$(OPENSSLLIB) OPENSSLINC=$(OPENSSLINC) + #BUILD=$(MAKE) build $(BUILDOPTIONS) + # *** TEMPORARY FOR PINE 4.10 BUILD *** + BUILD=$(MAKE) build $(BUILDOPTIONS) GSSDIR=$(GSSDIR) |