[Midnightbsd-cvs] mports: Makefile: use bsd.mport.options.mk

ctriv at midnightbsd.org ctriv at midnightbsd.org
Wed Oct 29 16:06:08 EDT 2008


Log Message:
-----------
use bsd.mport.options.mk

Modified Files:
--------------
    mports/ftp/curl:
        Makefile (r1.6 -> r1.7)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/ftp/curl/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -L ftp/curl/Makefile -L ftp/curl/Makefile -u -r1.6 -r1.7
--- ftp/curl/Makefile
+++ ftp/curl/Makefile
@@ -65,7 +65,7 @@
 		NTLM "NTLM authentication" off \
 		OPENSSL "OpenSSL support" on
 
-.include <bsd.port.pre.mk>
+.include <bsd.mport.options.mk>
 
 .if defined(WITH_GNUTLS) && defined(WITH_OPENSSL)
 IGNORE=		may only use GNU TLS if OpenSSL support is disabled
@@ -94,7 +94,8 @@
 .endif
 
 .if !defined(WITHOUT_OPENSSL)
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+EXTENSIONS+=		openssl
+WITH_OPENSSL_BASE=	yes
 CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE}
 .else
 CONFIGURE_ARGS+=	--without-ssl
@@ -175,6 +176,8 @@
 CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 .endif
 
+.include <bsd.port.pre.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|\$$(libdir)/pkgconfig|\$$(prefix)/libdata/pkgconfig|' \
 		${WRKSRC}/Makefile.in


More information about the Midnightbsd-cvs mailing list