Bug 31625
| Summary: | New Port: Frontpage v5.0 + language specific ports | ||||||
|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Scot W. Hetzel <hetzels> | ||||
| Component: | Individual Port(s) | Assignee: | Mario Sergio Fujikawa Ferreira <lioux> | ||||
| Status: | Closed FIXED | ||||||
| Severity: | Affects Only Me | ||||||
| Priority: | Normal | ||||||
| Version: | Latest | ||||||
| Hardware: | Any | ||||||
| OS: | Any | ||||||
| Attachments: |
|
||||||
|
Description
Scot W. Hetzel
2001-10-30 05:00:01 UTC
Responsible Changed From-To: freebsd-ports->mbr This should be handled with 31626 > On Thu, 20 Dec 2001 lioux@FreeBSD.org wrote: > > > Synopsis: New Port: Frontpage v5.0 + language specific ports > > > > Responsible-Changed-From-To: freebsd-ports->mbr > > Responsible-Changed-By: lioux > > Responsible-Changed-When: Thu Dec 20 13:14:12 PST 2001 > > Responsible-Changed-Why: > > This should be handled with 31626 > > > > http://www.FreeBSD.org/cgi/query-pr.cgi?pr=31625 > > > Both of these PRs only affect the apache13-fp port, as the current dependencies are set to: frontpage5-<lang> --> frontpage5 --> apache13-fp In further review the dependencies should be switched to: frontpage5-<lang> ---> frontpage5 apache13-fp ---------> frontpage5 The changes needed to accomplish this are: frontpage5: 1. remove apache13-fp dependency from Makefile 2. remove execution of fp_install.sh from pkg-install apache13-fp 1. add dependency on frontpage5 (RUN_DEPENDS) to Makefile 2. execute /usr/local/frontpage/version5.0/fp_install.sh from pkg-install This will allow the apache13-fp port to be upgraded separately from the frontpage5 port, and it will also allow the mod_frontpage port to use the frontpage5 port (when it gets updated to support the v5 Frontpage extensions). mod_frontpage ---+--> frontpage5 +--> apache13[-modssl,..] This will eventually save 7.5-13.5M (FP exts [15-21M], FP lang [7.5M]) on the CD-ROM distributions, as the apache13-fp & mod_frontpage ports wouldn't need to include the FP exts in their packages. I'll see if I can create a patch for apache13-fp & frontpage5 with these changes and submit them to both PRs. Scot PS. Should the frontpage5* ports be renamed to either "frontpage*" or "fp-extension" and "fp-<lang>" before being committed. The below patch removes the dependancy on the apache13-fp port (see PR 31626). Apply this patch after applying the patch in PR 31626. Also remove pkg-install and add pkg-message to frontpage5 port. diff -ruN frontpage5.orig/Makefile frontpage5/Makefile --- frontpage5.orig/Makefile Mon Oct 29 21:02:08 2001 +++ frontpage5/Makefile Fri Dec 21 14:41:06 2001 @@ -14,8 +14,6 @@ MAINTAINER= hetzels@westbend.net -RUN_DEPENDS= ${LOCALBASE}/libexec/apache/mod_frontpage.so:${PORTSDIR}/www/apache13-fp - .include <bsd.port.pre.mk> ONLY_FOR_ARCHS= i386 alpha @@ -114,9 +112,6 @@ s:MOD_FPDOCDIR:${MOD_FPDOCDIR}:g' ${WRKDIR}/${FPINSTALL} .endif -pre-install: - @PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL - do-install: @${ECHO_MSG} "===> Untaring FrontPage Extentions to ${PREFIX}" @(cd ${PREFIX} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${FRONTPAGE} ${EXTRACT_AFTER_ARGS}) @@ -128,11 +123,6 @@ @${INSTALL_SCRIPT} ${WRKDIR}/${FPSETPERM} ${PREFIX}/${FPSETPERM} post-install: - @PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.if ${OSVERSION} < 430001 || ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500014 ) -.if ${ARCH} == i386 @${CAT} ${PKGMESSAGE} -.endif -.endif .include <bsd.port.post.mk> diff -ruN frontpage5.orig/pkg-install frontpage5/pkg-install --- frontpage5.orig/pkg-install Thu Oct 25 21:35:45 2001 +++ frontpage5/pkg-install Wed Dec 31 18:00:00 1969 @@ -1,72 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# Created by: hetzels@westbend.net - -PKG_BATCH=${BATCH:=NO} - -PKG_PREFIX=${PKG_PREFIX} - -FPINSTALL=${PKG_PREFIX}/frontpage/version5.0/fp_install.sh -FPCNF=${PKG_PREFIX}/frontpage/version5.0/frontpage.cnf -IMAGES_VTI=${PKG_PREFIX}/www/data/images/_vti_cnf -AP_LIBEXEC=${PKG_PREFIX}/libexec/apache - -check_version() -{ - FPVER=`strings ${AP_LIBEXEC}/mod_frontpage.so | \ - grep "FrontPage/" 2> /dev/null | \ - sed -e 's%^.*FrontPage/\([0-9]*\).*%\1%' | tail -1` - - if [ -z ${FPVER} ] ; then - FPVER=0 - fi - - if [ ${FPVER} -ne 5 ] ; then - echo "Frontpage 5.0 Exts requires a 5.0 version of mod_frontpage.so" - exit 1 - fi -} - -# Add SendMailCommand to frontpage.cnf -fix_frontpage_cnf() -{ - if [ ! "`grep SendMailCommand ${FPCNF}`" ] ; then - echo "SendMailCommand:/usr/sbin/sendmail" >> ${FPCNF} - fi -} - -# Add the appropriate comment to the images/_vti_cnf file. -comment_files () -{ - if [ -d ${IMAGES_VTI} ]; then - if [ -f ${IMAGES_VTI}/apache_pb.gif ] && \ - [ ! "`grep description ${IMAGES_VTI}/apache_pb.gif`" ] ; then - /bin/echo "vti_description:SW|Apache Webserver" >> ${IMAGES_VTI}/apache_pb.gif - fi - if [ -f ${IMAGES_VTI}/fplogo.gif ] && \ - [ ! "`grep description ${IMAGES_VTI}/fplogo.gif`" ] ; then - /bin/echo "vti_description:SW|Created with Microsoft FrontPage 2002" >> ${IMAGES_VTI}/fplogo.gif - fi - if [ -f ${IMAGES_VTI}/powerlogo.gif ] && \ - [ ! "`grep description ${IMAGES_VTI}/powerlogo.gif`" ] ; then - /bin/echo "vti_description:SW|Powered by FreeBSD" >> ${IMAGES_VTI}/powerlogo.gif - fi - fi -} - -case $2 in - PRE-INSTALL) - check_version - ;; - POST-INSTALL) - # If we are not in batch mode then run the FP install script. - if [ "${PKG_BATCH}" = "NO" ]; then - ${FPINSTALL} - fix_frontpage_cnf - comment_files - fi - ;; - -esac diff -ruN frontpage5.orig/pkg-message frontpage5/pkg-message --- frontpage5.orig/pkg-message Wed Dec 31 18:00:00 1969 +++ frontpage5/pkg-message Fri Dec 21 14:53:10 2001 @@ -0,0 +1,9 @@ +For this port to be usefull you need to install an Apache-Frontpage +enabled web server. Only the following ports/packages qualifies: + +Ports: + www/apache13-fp >=1.3.20_1 + +Packages: + apache_fp >=1.3.20_1 + diff -ruN frontpage5.orig/pkg-message.bsdi frontpage5/pkg-message.bsdi --- frontpage5.orig/pkg-message.bsdi Thu Mar 8 06:35:09 2001 +++ frontpage5/pkg-message.bsdi Fri Dec 21 14:53:28 2001 @@ -2,3 +2,13 @@ libdescrypt.* libraries. The fpsrvadm.exe program can only create DES passwords, but the Apache server is unable to use them when libcrypt.* are linked to the libscrypt.* libraries. + +For this port to be usefull you need to install an Apache-Frontpage +enabled web server. Only the following ports/packages qualifies: + +Ports: + www/apache13-fp >=1.3.20_1 + +Packages: + apache_fp >=1.3.20_1 + diff -ruN frontpage5.orig/pkg-message.freebsd frontpage5/pkg-message.freebsd --- frontpage5.orig/pkg-message.freebsd Fri Dec 21 14:46:26 2001 +++ frontpage5/pkg-message.freebsd Fri Dec 21 14:58:04 2001 @@ -2,3 +2,13 @@ libdescrypt.* libraries. The fpsrvadm.exe program can only create DES passwords, but the Apache server is unable to use them when libcrypt.* are linked to the libscrypt.* libraries. + +For this port to be usefull you need to install an Apache-Frontpage +enabled web server. Only the following ports/packages qualifies: + +Ports: + www/apache13-fp >=1.3.20_1 + +Packages: + apache_fp >=1.3.20_1 + Responsible Changed From-To: mbr->lioux I'm working with originator State Changed From-To: open->closed Committed with slight style changes, thanks! For instance, frontpage-* instead of frontpage5-* |
