ports/161011: www/dillo2 includes PORTSDIR/Mk file directly

[Chris Rees]

>Number:         161011
>Category:       ports
>Synopsis:       www/dillo2 includes PORTSDIR/Mk file directly
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Sep 25 16:00:21 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Chris Rees
>Release:        FreeBSD 8.2-RELEASE-p1 i386
>Organization:
>Environment:
System: FreeBSD zeus.bayofrum.net 8.2-RELEASE-p1 FreeBSD 8.2-RELEASE-p1 #0: Sat Apr 30 15:09:06 BST 2011 root at zeus.bayofrum.net:/usr/obj/usr/src/sys/ZEUS i386


	
>Description:
	des@ noticed that dillo2 is one of the many ports that directly includes bsd.openssl.mk rather than using USE_OPENSSL.

	While I was there, I also switched pre.mk for options.mk. I've done some basic tests, and I don't think I broke any OPTIONS, but perhaps you should run your own tests too.

- Use USE_OPENSSL and bsd.port.options.mk

>How-To-Repeat:
	
>Fix:

	

--- dillo2.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/www/dillo2/Makefile,v
retrieving revision 1.53
diff -u -r1.53 Makefile
--- Makefile	30 Jul 2011 08:19:11 -0000	1.53
+++ Makefile	25 Sep 2011 15:54:35 -0000
@@ -38,7 +38,7 @@
 		SSL		"Enable (experimental) https support" On \
 		THREADED_DNS	"Enable re-entrant resolver library" On
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .ifdef(WITH_COOKIES)
 CONFIGURE_ARGS+=	--enable-cookies
@@ -60,7 +60,7 @@
 
 .ifdef(WITH_SSL)
 CONFIGURE_ARGS+=	--enable-ssl
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL=	yes
 .else
 CONFIGURE_ARGS+=	--disable-ssl
 .endif
@@ -94,4 +94,4 @@
 	${INSTALL_MAN} ${WRKSRC}/doc/* ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- dillo2.diff ends here ---



-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.

>Release-Note:
>Audit-Trail:
>Unformatted: