Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 19 Feb 2021 11:49:35 +0000 (UTC)
From:      Bernard Spil <brnrd@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r566051 - head/www/apache24
Message-ID:  <202102191149.11JBnZhL058906@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: brnrd
Date: Fri Feb 19 11:49:35 2021
New Revision: 566051
URL: https://svnweb.freebsd.org/changeset/ports/566051

Log:
  www/apache24: Change strip behavior
  
   * Use the dists build/rules.mk method
   * cleanup of left-over files from strip
  
  PR:		252792
  Submitted by:	meta
  Approved by:	joneum (apache)
  Differential Revision:	https://reviews.freebsd.org/D28217

Modified:
  head/www/apache24/Makefile

Modified: head/www/apache24/Makefile
==============================================================================
--- head/www/apache24/Makefile	Fri Feb 19 11:49:34 2021	(r566050)
+++ head/www/apache24/Makefile	Fri Feb 19 11:49:35 2021	(r566051)
@@ -2,7 +2,7 @@
 
 PORTNAME=	apache24
 PORTVERSION=	2.4.46
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	APACHE_HTTPD
 DISTNAME=	httpd-${PORTVERSION}
@@ -173,6 +173,7 @@ CFLAGS=		${DEBUG_FLAGS}
 CONFIGURE_ARGS+=	--enable-maintainer-mode
 WITH_EXCEPTION_HOOK=	yes
 .else
+CONFIGURE_ENV+=	INSTALL_PROG_FLAGS="-s"
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-server_buildmark.c
 .endif
 .if defined(WITH_EXCEPTION_HOOK)
@@ -220,12 +221,10 @@ post-configure:
 post-install:
 	@${MKDIR} ${ETC_SUBDIRS:S|^|${STAGEDIR}${ETCDIR}/|}
 	${INSTALL_DATA} ${FILESDIR}/no-accf.conf ${STAGEDIR}${ETCDIR}/Includes/
-# place for 3rd party module configuration
 	${INSTALL_DATA} ${FILESDIR}/README_modules.d ${STAGEDIR}${ETCDIR}/modules.d/
-# strip returns an error for non binary files, but we have a big mix
-	-${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/* 2>/dev/null
-	-${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
 	-${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/apache24/mod_*.so
+	# Remove files left behind by strip
+	${RM} ${STAGEDIR}${DATADIR}/build/ecp.???????? 2>/dev/null
 
 post-install-LOG_FORENSIC-on:
 	${INSTALL_SCRIPT} ${WRKSRC}/support/check_forensic ${STAGEDIR}${PREFIX}/sbin



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202102191149.11JBnZhL058906>