Date: Sat, 24 Jun 2006 08:12:25 -0500 From: "Scot Hetzel" <swhetzel@gmail.com> To: FreeBSD-gnats-submit@freebsd.org, freebsd-bugs@freebsd.org Subject: Re: misc/99325: maintainer-update: Update www/frontpage to 5.0.2.4803 Message-ID: <790a9fff0606240612u1585704eh1851f11836ac7d90@mail.gmail.com> In-Reply-To: <200606222150.k5MLoUE4098120@freefall.freebsd.org> References: <200606222113.k5MLDlQn059193@www.freebsd.org> <200606222150.k5MLoUE4098120@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] Attached is the missing patch. Scot -- DISCLAIMER: No electrons were mamed while sending this message. Only slightly bruised. [-- Attachment #2 --] Index: www/frontpage/Makefile =================================================================== RCS file: /home/ncvs/ports/www/frontpage/Makefile,v retrieving revision 1.17 diff -u -r1.17 Makefile --- www/frontpage/Makefile 23 May 2006 19:23:47 -0000 1.17 +++ www/frontpage/Makefile 18 Jun 2006 06:05:10 -0000 @@ -6,21 +6,15 @@ # PORTNAME= frontpage -PORTVERSION= 5.0.2.2635 -PORTREVISION= 2 +PORTVERSION= 5.0.2.4803 CATEGORIES= www MASTER_SITES= # Needs to be manually fetched from http://www.rtr.com DISTFILES= ${FRONTPAGE} -DIST_SUBDIR= fp${PORTVERSION:S/.//g} MAINTAINER= swhetzel@gmail.com COMMENT= Microsoft Frontpage 2002 Extensions -FORBIDDEN= http://vuxml.FreeBSD.org/c0171f59-ea8a-11da-be02-000c6ec775d9.html - -ONLY_FOR_ARCHS= i386 ia64 amd64 alpha sparc - EXTRACT_ONLY= NO_WRKSUBDIR= yes NO_BUILD= yes @@ -31,15 +25,21 @@ USE_RC_SUBR= yes RC_SCRIPTS= frontpage:0010 RC_SCRIPT_PREFIX= ${RC_SCRIPTS:S/${RC_SCRIPTS:C/:[^:]+$//}//:S/://} -RC_SCRIPT= ${RC_SCRIPTS:C/:[^:]+$//}.sh +RC_SCRIPT= ${RC_SCRIPTS:C/:[^:]+$//} -SUB_FILES= ${RC_SCRIPT} +SUB_FILES= ${RC_SCRIPT}.sh SUB_LIST+= RC_SUBR=${RC_SUBR} PERL5=${PERL} FP_VER=${FP_VER} .include <bsd.port.pre.mk> .include "${.CURDIR}/Makefile.fp.common" -FP_DIR= frontpage/version${FP_VER} +.if (${OSVERSION} >= 700007 || ( ${OSVERSION} < 700000 && ${OSVERSION} >= 600101 )) +RCD_SCRIPT= ${RC_SCRIPT} +.else +RCD_SCRIPT= ${RC_SCRIPT_PREFIX}.${RC_SCRIPT}.sh +.endif +PLIST_SUB+= RCD_SCRIPT=${RCD_SCRIPT} + FP_INSTALL= ${FP_DIR}/fp_install.sh FP_SETPERM= ${FP_DIR}/set_default_perms.sh FP_DOCS= readme.htm readme_apache_dso.txt LICENSE.TXT @@ -47,15 +47,22 @@ EXTRACT_FILES= ${FP_INSTALL} ${FP_SETPERM} .if ${ARCH} == alpha -EXTRA_PATCHES= fp_install.alpha +FP_MACHINE= alpha .elif ${ARCH} == sparc64 -EXTRA_PATCHES= fp_install.sparc +FP_MACHINE= solaris .elif defined(WANT_BSDI_EXTENSIONS) -EXTRA_PATCHES= fp_install.bsdi +FP_MACHINE= bsdi .elif ${ARCH} == i386 .if ${OSVERSION} >= 500000 LIB_DEPENDS+= c.4:${PORTSDIR}/misc/compat4x +FP_MACHINE= freebsd +.endif +.elif ${ARCH} == amd64 +.if ${OSVERSION} >= 500000 +LIB_DEPENDS+= crypt.2:${PORTSDIR}/misc/compat4x +BROKEN= misc/compat4x missing libcrypt.so.2 .endif +FP_MACHINE= freebsd .endif do-extract: @@ -69,7 +76,8 @@ post-patch: .if !defined(PATCH_DEBUG) - @${REINPLACE_CMD} -e 's:PREFIX:${PREFIX}:g' \ + @${REINPLACE_CMD} -E -e 's:PREFIX:${PREFIX}:g' \ + -e 's:(machine=\")freebsd\":\1${FP_MACHINE}\":g' \ -e 's:DOCSDIR:${DOCSDIR}:g' ${WRKDIR}/${FP_INSTALL} .endif @@ -91,8 +99,8 @@ .endfor post-install: - ${INSTALL_SCRIPT} ${WRKDIR}/${RC_SCRIPT} \ - ${PREFIX}/etc/rc.d/${RC_SCRIPT_PREFIX}.${RC_SCRIPT} + ${INSTALL_SCRIPT} ${WRKDIR}/${RC_SCRIPT}.sh \ + ${PREFIX}/etc/rc.d/${RCD_SCRIPT} @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> Index: www/frontpage/Makefile.fp.common =================================================================== RCS file: /home/ncvs/ports/www/frontpage/Makefile.fp.common,v retrieving revision 1.1 diff -u -r1.1 Makefile.fp.common --- www/frontpage/Makefile.fp.common 9 Feb 2005 20:11:11 -0000 1.1 +++ www/frontpage/Makefile.fp.common 18 Jun 2006 06:04:32 -0000 @@ -5,8 +5,13 @@ # $FreeBSD: ports/www/frontpage/Makefile.fp.common,v 1.1 2005/02/09 20:11:11 pav Exp $ # +DIST_SUBDIR= fp${PORTVERSION:S/.//g} + +ONLY_FOR_ARCH= i386 amd64 alpha sparc64 ia64 + FP_VER= ${PORTVERSION:C|^([0-9]+)\.([0-9]+).*|\1.\2|} PLIST_SUB+= FP_VER=${FP_VER} +FP_DIR= frontpage/version${FP_VER} .if defined(ALL_FP) FRONTPAGE= fp${FP_VER:S/.//}.alpha${EXTRACT_SUFX} \ @@ -24,7 +29,14 @@ FRONTPAGE= fp${FP_VER:S/.//}.freebsd${EXTRACT_SUFX} .endif -.elif ${ARCH}== ia64 || ${ARCH} == amd64 +.elif ${ARCH} == amd64 +.if ${OSVERSION} < 500000 +IGNORE= "The Frontpage extensions require FreeBSD-${ARCH} 5.0 or better" +.endif +FRONTPAGE= fp${FP_VER:S/.//}.freebsd${EXTRACT_SUFX} +LDCONFIG= /sbin/ldconfig -32 + +.elif ${ARCH} == ia64 || ${ARCH} == amd64 .if ${OSVERSION} < 500000 IGNORE= "The Frontpage Extensions require FreeBSD-${ARCH} 5.0 or better" .endif @@ -38,8 +50,8 @@ FRONTPAGE= fp${FP_VER:S/.//}.solaris${EXTRACT_SUFX} .endif -.if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64 -IGNORE= "The Frontpage Extensions haven't been tested on this ${ARCH}. If the Frontpage Extensions work on your ${ARCH}, please submit a pr to remove this warning from ${PORTSDIR}/www/frontpage/Makefile.fp.common for your ${ARCH}" +.if ${ARCH} == ia64 || ${ARCH} == sparc64 +IGNORE= "The Frontpage Extensions haven't been tested on this ${ARCH}. If the Frontpage Extensions work on your ${ARCH}, please submit a PR to remove this warning from ${PORTSDIR}/www/frontpage/Makefile.fp.common for your ${ARCH}" .endif .for fpdist in ${FRONTPAGE} @@ -50,3 +62,18 @@ NO_CDROM= "Redistribution is not permitted" RESTRICTED= ${NO_CDROM} + +TODAY!= /bin/date -u "+%Y%m%d" + +.if ${TODAY} < 20060701 + +pre-everything:: + @${ECHO_CMD} "Microsoft Frontpage Extenions will reach their End-of-Life on June 30, 2006." + @${ECHO_CMD} + @${ECHO_CMD} "You should use alternative methods with Microsoft Frontpage (FTP, WebDAV, ...) to edit websites." + @${ECHO_CMD} + @sleep 5 + +.else +DEPRECATED= Microsoft Frontpage Extensions have reached their End-of-Life +.endif Index: www/frontpage/distinfo =================================================================== RCS file: /home/ncvs/ports/www/frontpage/distinfo,v retrieving revision 1.3 diff -u -r1.3 distinfo --- www/frontpage/distinfo 9 Feb 2005 20:11:11 -0000 1.3 +++ www/frontpage/distinfo 17 Jun 2006 22:26:45 -0000 @@ -1,8 +1,12 @@ -MD5 (fp5022635/fp50.alpha.tar.gz) = 63c26a9ff0b97b44692fd5717b892dc0 -SIZE (fp5022635/fp50.alpha.tar.gz) = 13245239 -MD5 (fp5022635/fp50.bsdi.tar.gz) = e1640a3d5eb06fbfe77827c68c387f64 -SIZE (fp5022635/fp50.bsdi.tar.gz) = 10484068 -MD5 (fp5022635/fp50.freebsd.tar.gz) = 15bb2e119f1c2c91a5f4855a0b8ca836 -SIZE (fp5022635/fp50.freebsd.tar.gz) = 10205076 -MD5 (fp5022635/fp50.solaris.tar.gz) = 98ef852e1db27ced23e7f5971146a4dd -SIZE (fp5022635/fp50.solaris.tar.gz) = 11510762 +MD5 (fp5024803/fp50.alpha.tar.gz) = 14f7f18e18d36f1208524f88d53167fb +SHA256 (fp5024803/fp50.alpha.tar.gz) = 6a9d2a1ae55a8ef260e59d98b8cf26ebf38f11123211c748647851526f1bd60b +SIZE (fp5024803/fp50.alpha.tar.gz) = 13245946 +MD5 (fp5024803/fp50.bsdi.tar.gz) = ea789f27549835f41d7e54d7c73d98ce +SHA256 (fp5024803/fp50.bsdi.tar.gz) = 002dd07212c060998742fe5fd781ecbd4226bab461c6704d451c378a548ad5e0 +SIZE (fp5024803/fp50.bsdi.tar.gz) = 10523532 +MD5 (fp5024803/fp50.freebsd.tar.gz) = f6754c6e25f252fe19b7dff047eecf39 +SHA256 (fp5024803/fp50.freebsd.tar.gz) = 97f8ec0368079c35a40a7f0afbe2e117bbc1c69a4774299c39490b0006015281 +SIZE (fp5024803/fp50.freebsd.tar.gz) = 10729480 +MD5 (fp5024803/fp50.solaris.tar.gz) = 7b7d8bc138459bb05185cf1f807d9f9c +SHA256 (fp5024803/fp50.solaris.tar.gz) = f202e26434465fcec3e838b78fca40389d0d3f21b6ffa626bd533cc3f73c7b4f +SIZE (fp5024803/fp50.solaris.tar.gz) = 11511771 Index: www/frontpage/pkg-plist =================================================================== RCS file: /home/ncvs/ports/www/frontpage/pkg-plist,v retrieving revision 1.4 diff -u -r1.4 pkg-plist --- www/frontpage/pkg-plist 22 Jan 2006 02:57:30 -0000 1.4 +++ www/frontpage/pkg-plist 18 Jun 2006 05:12:24 -0000 @@ -1,5 +1,5 @@ -@unexec %D/etc/rc.d/0010.frontpage.sh forcestop 2>/dev/null || true -etc/rc.d/0010.frontpage.sh +@unexec %D/etc/rc.d/%%RCD_SCRIPT%% forcestop 2>/dev/null || true +etc/rc.d/%%RCD_SCRIPT%% frontpage/version%%FP_VER%%/admin/1033/addacct.htm frontpage/version%%FP_VER%%/admin/1033/addrole.htm frontpage/version%%FP_VER%%/admin/1033/adduser.htm Index: www/frontpage/files/fp_install.alpha =================================================================== RCS file: www/frontpage/files/fp_install.alpha diff -N www/frontpage/files/fp_install.alpha --- www/frontpage/files/fp_install.alpha 9 Feb 2005 20:11:11 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- frontpage/version5.0/fp_install.sh.orig Tue Jul 15 16:58:01 2003 -+++ frontpage/version5.0/fp_install.sh Tue Jul 15 17:20:23 2003 -@@ -171,7 +171,7 @@ - SunOS*5.*sun4*) machine="solaris" ;; - SunOS*5.*i386*) machine="solarisx86" ;; - BSD/OS*) machine="bsdi" ;; -- FreeBSD*) machine="freebsd" -+ FreeBSD*) machine="alpha" - DEFAULTAPXS="PREFIX/sbin/apxs" - ;; - *) echo "ERROR: Unsupported platform! Uname is $system." Index: www/frontpage/files/fp_install.bsdi =================================================================== RCS file: www/frontpage/files/fp_install.bsdi diff -N www/frontpage/files/fp_install.bsdi --- www/frontpage/files/fp_install.bsdi 9 Feb 2005 20:11:11 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- frontpage/version5.0/fp_install.sh.orig Tue Jul 15 16:58:01 2003 -+++ frontpage/version5.0/fp_install.sh Tue Jul 15 17:20:23 2003 -@@ -171,7 +171,7 @@ - SunOS*5.*sun4*) machine="solaris" ;; - SunOS*5.*i386*) machine="solarisx86" ;; - BSD/OS*) machine="bsdi" ;; -- FreeBSD*) machine="freebsd" -+ FreeBSD*) machine="bsdi" - DEFAULTAPXS="PREFIX/sbin/apxs" - ;; - *) echo "ERROR: Unsupported platform! Uname is $system." Index: www/frontpage/files/fp_install.sparc =================================================================== RCS file: www/frontpage/files/fp_install.sparc diff -N www/frontpage/files/fp_install.sparc --- www/frontpage/files/fp_install.sparc 9 Feb 2005 20:11:11 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- frontpage/version5.0/fp_install.sh.orig Tue Jul 15 16:58:01 2003 -+++ frontpage/version5.0/fp_install.sh Tue Jul 15 17:20:23 2003 -@@ -171,7 +171,7 @@ - SunOS*5.*sun4*) machine="solaris" ;; - SunOS*5.*i386*) machine="solarisx86" ;; - BSD/OS*) machine="bsdi" ;; -- FreeBSD*) machine="freebsd" -+ FreeBSD*) machine="solaris" - DEFAULTAPXS="PREFIX/sbin/apxs" - ;; - *) echo "ERROR: Unsupported platform! Uname is $system."
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?790a9fff0606240612u1585704eh1851f11836ac7d90>