Upgrade to the latest and greatest apache/frontpage combo.

PR:		ports/16974
Submitted by:	maintainer

1 files changed, 59 insertions, 77 deletions

diff --git a/www/apache13-fp/Makefile b/www/apache13-fp/Makefile
index 502ff2ee9ef..fb3493f01e4 100644
--- a/www/apache13-fp/Makefile
+++ b/www/apache13-fp/Makefile
@@ -35,65 +35,52 @@ MAINTAINER=	hetzels@westbend.net
 #PATCH_SITES=	http://www.apache.org/dist/patches/apply_to_${AP_VERS}/
 #PATCHFILES=
 
-.if defined(PATCH_DEBUG)
-PATCH_DIST_ARGS=	-d ${WRKSRC}/src -E ${PATCH_DIST_STRIP}
-.else
-PATCH_DIST_ARGS=	-d ${WRKSRC}/src --forward --quiet -E ${PATCH_DIST_STRIP}
-.endif
-
-AP_VERS=	1.3.9
+AP_VERS=	1.3.12
 APACHE=		${DISTNAME}${EXTRACT_SUFX}
 FRONTPAGE=	fp40.bsdi.tar.Z
 
 EXTRACT_ONLY=	${APACHE}
 
-IS_INTERACTIVE=	YES
-NO_PACKAGE=	\
-   "The FrontPage Installer needs to create FrontPage Admin user and password"
-
-FPINSTALL=	frontpage/version4.0/fp_install.sh
-CHANGESERVER=	frontpage/version4.0/change_server.sh
-README=		frontpage/version4.0/readme.htm
-SERK=		frontpage/version4.0/serk
-MOD_FPDOCDIR=	share/doc/apache/manual/mod/mod_frontpage
+BATCH?=		NO
+CHMOD?=		/bin/chmod
+FP_REV=		version4.0
+FPINSTALL=	frontpage/${FP_REV}/fp_install.sh
+CHANGESERVER=	frontpage/${FP_REV}/change_server.sh
+FPSETPERM=	frontpage/${FP_REV}/set_default_perms.sh
+README=		frontpage/${FP_REV}/readme.htm
+SERK=		frontpage/${FP_REV}/serk
+FPHTTPD=	${PREFIX}/frontpage/${FP_REV}/apache-fp
+AP_SHARE=	${PREFIX}/share/doc/apache
+MOD_FPDOCDIR=	${AP_SHARE}/manual/mod/mod_frontpage
 MOD_FP=		${FILESDIR}/mod_frontpage.c
-IMAGES_DIR=	share/doc/apache/manual/images
+IMAGES_DIR=	${AP_SHARE}/manual/images
 IMAGES_VTI=	${PREFIX}/www/data/images/_vti_cnf
 
-INSTALL_FILE=${INSTALL} -c -m 555 -o bin -g bin
+INSTALL_FILE=	${INSTALL} -c -m 555 -o bin -g bin
 
 Y2K=		http://www.apache.org/foundation/Y2K.html
 Y2K+=		http://computingcentral.msn.com/guide/year2000/msy2k/productinfo/frontpage.asp
 
 PLIST=		${WRKDIR}/PLIST
-PLIST_SUB=	FP_REV=version4.0
+PLIST_SUB=	FP_REV=${FP_REV}
 
 #
 # Set APACHE_PERF_TUNING env. variable to YES to get maximum performance
 #
 
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	 --prefix=${PREFIX} \
-		 --with-layout=GNU \
-		 --with-perl=${PERL} \
-		 --bindir=${PREFIX}/bin \
-		 --sbindir=${PREFIX}/sbin \
-		 --libexecdir=${PREFIX}/libexec/apache \
-		 --mandir=${PREFIX}/man \
-		 --sysconfdir=${PREFIX}/etc/apache \
-		 --datadir=${PREFIX}/www \
-		 --includedir=${PREFIX}/include/apache \
-		 --localstatedir=/var \
-		 --runtimedir=/var/run \
-		 --logfiledir=/var/log \
-		 --proxycachedir=/var/spool/proxy \
-		 --without-confadjust \
-		 --enable-module=most \
-		 --enable-module=auth_db \
-		 --disable-module=auth_dbm \
-		 --add-module=${MOD_FP} \
-		 --enable-shared=frontpage \
-		 --enable-shared=max
+CONFIGURE_ARGS=	 \
+		  --prefix=${PREFIX} \
+		  --server-gid=nogroup \
+		  --with-perl=${PERL} \
+		  --with-layout=${FILESDIR}/FreeBSD.layout:FreeBSD \
+		  --without-confadjust \
+		  --enable-shared=max \
+		  --enable-module=most \
+		  --enable-module=auth_db \
+		  --disable-module=auth_dbm \
+		  --add-module=${MOD_FP} \
+		  --enable-shared=frontpage
 
 # Currently perl version doesn't matter
 USE_PERL5=	YES
@@ -102,7 +89,12 @@ OPTIM=		-DHARD_SERVER_LIMIT=512 \
 		-DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \
 		-DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\"
 
-.if defined(APACHE_PERF_TUNING)
+#By default create an Optimized package.
+.if ${BATCH} == YES
+APACHE_PERF_TUNING= YES
+.endif
+
+.if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES
 OPTIM+= 	-DBUFFERED_LOGS -DFD_SETSIZE=1024
 CFLAGS+=	-O6 -funroll-loops -fstrength-reduce -fomit-frame-pointer \
 		-fexpensive-optimizations -ffast-math
@@ -131,17 +123,22 @@ pre-extract:
 	@if ! ${LDCONFIG} -r | ${GREP} -q -e "-ldescrypt"; then \
 	   ${ECHO} ; \
 	   ${ECHO} "WARNING: MS FrontPage Extentions require the DES Library"; \
-	   ${ECHO} "WARNING: Install the DES Library, then build apache-fp"; \
+	   ${ECHO} "  Install the DES Library, then build apache-fp"; \
+	   ${ECHO} ; \
+	   ${ECHO} "  FreeBSD Handbook - Security (chapter 6)"; \
+	   ${ECHO} "    http://www.freebsd.org/handbook/security.html#CRYPT"; \
+	   ${ECHO} "  FAQ - I live outside the US. Can I use DES encryption?"; \
+	   ${ECHO} "    http://www.freebsd.org/FAQ/install.html#AEN629"; \
 	   ${ECHO} ; \
 	   ${FALSE} ; \
 	fi
 
 post-extract:
 	@${ECHO} "===>  Extracting FrontPage install scripts"
-	@cd ${WRKSRC} && \
+	cd ${WRKSRC} && \
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${FRONTPAGE} \
 		${EXTRACT_AFTER_ARGS} ${FPINSTALL} ${CHANGESERVER} \
-		${README}
+		${README} ${FPSETPERM}
 
 .if !defined(PATCH_DEBUG)
 post-patch:
@@ -153,7 +150,7 @@ post-configure:
 .if defined(SUEXEC)
 	${CP} ${PKGDIR}/PLIST ${PLIST}
 .else
-	${CAT} ${PKGDIR}/PLIST | ${GREP} -v sbin/suexec >${PLIST}
+	${CAT} ${PKGDIR}/PLIST | ${GREP} -v sbin/suexec > ${PLIST}
 .endif
 
 IMAGES=		apache_pb.gif fplogo.gif powerlogo.gif
@@ -161,45 +158,30 @@ IMAGES=		apache_pb.gif fplogo.gif powerlogo.gif
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
 		${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh file."; \
-		${CAT} ${FILESDIR}/apache.sh.tmpl | \
-			${SED}	-e 's;PREFIX;${PREFIX};' \
-				-e 's;PERL5;${PERL};' \
-				> ${PREFIX}/etc/rc.d/apache.sh; \
+		${SED}	-e 's;PREFIX;${PREFIX};' \
+			-e 's;PERL5;${PERL};' \
+		< ${FILESDIR}/apache.sh.tmpl > ${PREFIX}/etc/rc.d/apache.sh; \
 		${CHMOD} 751 ${PREFIX}/etc/rc.d/apache.sh; \
 	fi
-	@${INSTALL} -c -m 644 ${DISTDIR}/powerlogo.gif ${PREFIX}/${IMAGES_DIR}
-	@${INSTALL} -c -m 644 ${DISTDIR}/fplogo.gif ${PREFIX}/${IMAGES_DIR}
-	@${INSTALL} -c -m 644 ${PREFIX}/share/doc/apache/apache_pb.gif ${PREFIX}/${IMAGES_DIR}
+	@${INSTALL} -c -m 644 ${DISTDIR}/powerlogo.gif ${IMAGES_DIR}
+	@${INSTALL} -c -m 644 ${DISTDIR}/fplogo.gif ${IMAGES_DIR}
+	@${INSTALL} -c -m 644 ${AP_SHARE}/apache_pb.gif ${IMAGES_DIR}
 	@mkdir -p ${PREFIX}/www/data/images
 	@( cd ${PREFIX}/share/doc/apache ; if [ -h images ] ; then ${RM} -f images ; fi ; ln -fs manual/images images)
 .for file in ${IMAGES}
 	@if [ ! -f ${PREFIX}/www/data/images/${file} ]; then \
-		${CP} -rp ${PREFIX}/${IMAGES_DIR}/${file} ${PREFIX}/www/data/images ; \
+		${CP} -rp ${IMAGES_DIR}/${file} ${PREFIX}/www/data/images ; \
 	fi
 .endfor
-	@${CAT} ${WRKSRC}/${FPINSTALL} | \
-		${SED}  -e 's;PREFIX;${PREFIX};' \
-			-e 's;MOD_FPDOCDIR;${PREFIX}/${MOD_FPDOCDIR};' \
-			> ${WRKDIR}/tmp.fpinstall
-	@${SH} ${WRKDIR}/tmp.fpinstall
-#Add the appropriate comment to the images/_vti_cnf file.
-	@if [ -d ${IMAGES_VTI} ]; then \
-		if [ ! "`grep description ${IMAGES_VTI}/apache_pb.gif`" ] ; then \
-			${ECHO} "vti_description:SW|Apache Webserver" >> ${IMAGES_VTI}/apache_pb.gif ;\
-		fi ; \
-		if [ ! "`grep description ${IMAGES_VTI}/fplogo.gif`" ] ; then \
-			${ECHO} "vti_description:SW|Created with Microsoft FrontPage 2000" >> ${IMAGES_VTI}/fplogo.gif ; \
-		fi ; \
-		if [ ! "`grep description ${IMAGES_VTI}/powerlogo.gif`" ] ; then \
-			${ECHO} "vti_description:SW|Powered by FreeBSD" >> ${IMAGES_VTI}/powerlogo.gif ; \
-		fi ; \
-	fi
-	@${INSTALL_FILE} ${WRKDIR}/tmp.fpinstall ${PREFIX}/${FPINSTALL}
-	@${CAT} ${WRKSRC}/${CHANGESERVER} | \
-		${SED} -e 's;PREFIX;${PREFIX};' > ${WRKDIR}/tmp.changeserver
-	@${INSTALL_FILE} ${WRKDIR}/tmp.changeserver ${PREFIX}/${CHANGESERVER}
-	@${MKDIR} ${PREFIX}/${MOD_FPDOCDIR}
-	@${CP} ${PREFIX}/${README} ${PREFIX}/${MOD_FPDOCDIR}/index.html
-	@${LN} -s ${PREFIX}/${SERK} ${PREFIX}/${MOD_FPDOCDIR}/serk
+	# Untar frontpage extentions
+	@(cd ${PREFIX} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${FRONTPAGE} ${EXTRACT_AFTER_ARGS})
+	@${RM} ${FPHTTPD}/httpd ${FPHTTPD}/httpd.Compat
+	@${MKDIR} ${MOD_FPDOCDIR}
+	@${CP} ${PREFIX}/${README} ${MOD_FPDOCDIR}/index.html
+	@${LN} -fs ${PREFIX}/${SERK} ${MOD_FPDOCDIR}/serk
+	@${INSTALL_FILE} ${WRKSRC}/${FPINSTALL} ${PREFIX}/${FPINSTALL}-dist
+	@${INSTALL_FILE} ${WRKSRC}/${CHANGESERVER} ${PREFIX}/${CHANGESERVER}-dist
+	@${INSTALL_FILE} ${WRKSRC}/${FPSETPERM} ${PREFIX}/${FPSETPERM}
+	@PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>