[Midnightbsd-cvs] mports: Makefile: Cleanups.

[ctriv at midnightbsd.org]

Log Message:
-----------
Cleanups.  Don't fire off package scripts.
Use bsd.mports.options.mk.

Modified Files:
--------------
    mports/www/squid:
        Makefile (r1.4 -> r1.5)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/www/squid/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -L www/squid/Makefile -L www/squid/Makefile -u -r1.4 -r1.5
--- www/squid/Makefile
+++ www/squid/Makefile
@@ -206,7 +206,7 @@
 		--disable-linux-tproxy \
 		--disable-epoll
 
-.include <bsd.port.pre.mk>
+.include <bsd.mport.options.mk>
 
 # Authentication methods and modules:
 
@@ -291,7 +291,7 @@
 # works when it is defined before bsd.port{.pre}.mk is .included.
 # This makes it currently impossible to combine this macro with OPTIONS to
 # conditionally include OpenSSL support.
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+EXTENSIONS+=		openssl
 CONFIGURE_ARGS+=	--enable-ssl \
 			--with-openssl="${OPENSSLBASE}"
 CFLAGS+=	-I${OPENSSLINC}
@@ -341,40 +341,39 @@
 IGNORE=		pf available only in FreeBSD 5.3 and newer
 .endif
 .endif
-# IPFilter-headers are not installed on FreeBSD 4 since 4.7-RELEASE,
-# they were not installed on FreeBSD 5 from 2002-03-26 (OSVERSION > 500032) to
-# 2003-06-27 (OSVERSION < 501101).
-#
-# Please see PR misc/44148 and the CVS log of src/include/Makefile for further
-# information.
+
 .if defined(WITH_SQUID_IPFILTER)
-.if (${OSVERSION} > 500032 && ${OSVERSION} < 501101)
-IGNORE=		the IPFilter headers are not part of the base system
-.else
 CONFIGURE_ARGS+=	--enable-ipf-transparent
 .endif
-.endif
+
 .if defined(WITH_SQUID_FOLLOW_XFF)
 CONFIGURE_ARGS+=	--enable-follow-x-forwarded-for
 .endif
+
 .if defined(WITH_SQUID_ICAP)
 EXTRA_PATCHES+=		${PATCHDIR}/icap-2.6-bootstrap.patch \
 			${PATCHDIR}/icap-2.6-core.patch
 CONFIGURE_ARGS+=	--enable-icap-support
 error_files+=		ERR_ICAP_FAILURE
 .endif
+
 .if defined(WITHOUT_SQUID_KQUEUE)
 CONFIGURE_ARGS+=	--disable-kqueue
 .endif
+
 .if defined(WITH_SQUID_LARGEFILE)
 CONFIGURE_ARGS+=	--with-large-files --enable-large-cache-files
 .endif
+
 .if defined(WITH_SQUID_STACKTRACES)
 CONFIGURE_ARGS+=	--enable-stacktraces
 CFLAGS+=	-g
 STRIP=
 .endif
 
+
+.include <bsd.port.pre.mk>
+
 # Languages:
 #
 # If you do not define SQUID_LANGUAGES yourself, all available language files
@@ -424,10 +423,6 @@
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
 	@${FIND} ${WRKSRC} -name '*.orig' -delete
 
-pre-su-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX=${PREFIX} \
-	    ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
 post-install:
 .if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}
@@ -441,12 +436,5 @@
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${docs} ${DOCSDIR}
 .endif
-	@${SETENV} PKG_PREFIX=${PREFIX} \
-	    ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-
-	@${ECHO_CMD} "===> post-installation information for ${PKGNAME}:"
-	@${ECHO_CMD} ""
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_CMD} ""
 
 .include <bsd.port.post.mk>