From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Aug 9 10:30:17 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1C18716A41F for ; Tue, 9 Aug 2005 10:30:17 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C998943D53 for ; Tue, 9 Aug 2005 10:30:15 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j79AUFg8084003 for ; Tue, 9 Aug 2005 10:30:15 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j79AUFPu083995; Tue, 9 Aug 2005 10:30:15 GMT (envelope-from gnats) Resent-Date: Tue, 9 Aug 2005 10:30:15 GMT Resent-Message-Id: <200508091030.j79AUFPu083995@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, chinsan Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9E96716A41F for ; Tue, 9 Aug 2005 10:29:34 +0000 (GMT) (envelope-from chinsan@chinsan.twbbs.org) Received: from chinsan.twbbs.org (220-135-48-40.HINET-IP.hinet.net [220.135.48.40]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2995643D46 for ; Tue, 9 Aug 2005 10:29:34 +0000 (GMT) (envelope-from chinsan@chinsan.twbbs.org) Received: by chinsan.twbbs.org (Postfix, from userid 1001) id 627557301F; Tue, 9 Aug 2005 18:29:38 +0800 (CST) Message-Id: <20050809102938.627557301F@chinsan.twbbs.org> Date: Tue, 9 Aug 2005 18:29:38 +0800 (CST) From: chinsan To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/84696: [MAINTAINER UPDATE] www/phpmyfaq: upgrade 1.4.10 to compatibility with PHP 4.4.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: chinsan List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Aug 2005 10:30:17 -0000 >Number: 84696 >Category: ports >Synopsis: [MAINTAINER UPDATE] www/phpmyfaq: upgrade 1.4.10 to compatibility with PHP 4.4.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Aug 09 10:30:15 GMT 2005 >Closed-Date: >Last-Modified: >Originator: chinsan >Release: FreeBSD 5.4-STABLE i386 >Organization: FreeBSD Taiwan >Environment: System: FreeBSD chinsan.twbbs.org 5.4-STABLE FreeBSD 5.4-STABLE #2: Sat Jul 30 16:27:25 CST 2005 root@chinsan.twbbs.org:/usr/obj/usr/src/sys/TAKAKO i386 >Description: - upgrade 1.4.10 to compatibility with PHP 4.4.0 Thanks. :) >How-To-Repeat: >Fix: --- phpmyfaq.diff begins here --- diff -ruN phpmyfaq.orig/Makefile phpmyfaq/Makefile --- phpmyfaq.orig/Makefile Tue Aug 9 17:49:37 2005 +++ phpmyfaq/Makefile Tue Aug 9 18:24:55 2005 @@ -6,7 +6,7 @@ # PORTNAME= phpmyfaq -PORTVERSION= 1.4.9 +PORTVERSION= 1.4.10 CATEGORIES= www MASTER_SITES= http://www.phpmyfaq.de/download/ DISTNAME= ${PORTNAME}.${PORTVERSION}.full @@ -24,12 +24,18 @@ WANT_PHP_WEB= YES pre-fetch: -.if !defined(PHPMYFAQ_DIR) +.if !defined(PHPMYFAQ_URL) @${ECHO_MSG} "" - @${ECHO_MSG} "Define PHPMYFAQ_DIR to override default of '${PHPMYFAQ_DIR}'." + @${ECHO_MSG} "Define PHPMYFAQ_URL to override default of '${PHPMYFAQ_URL}'." @${ECHO_MSG} "" .endif +.if exists(/sbin/sysctl) +HOSTNAME!= /sbin/sysctl -n kern.hostname +.else +HOSTNAME!= /usr/sbin/sysctl -n kern.hostname +.endif + WWWDOCROOT?= www/data PHPMYFAQ_URL?= faq WWWOWN?= www @@ -68,7 +74,7 @@ post-install: @${SED} \ - -e 's|%%PHPMYFAQ_URL%%|${PHPMYFAQ_URL}|' \ - -e 's|%%PHPMYFAQ_DIR%%|${PREFIX}/${PHPMYFAQ_DIR}|' ${PKGMESSAGE} + -e 's|%%HOSTNAME%%|${HOSTNAME}|' \ + -e 's|%%PHPMYFAQ_URL%%|${PHPMYFAQ_URL}|' ${PKGMESSAGE} .include diff -ruN phpmyfaq.orig/distinfo phpmyfaq/distinfo --- phpmyfaq.orig/distinfo Tue Aug 9 17:49:37 2005 +++ phpmyfaq/distinfo Tue Aug 9 17:52:04 2005 @@ -1,2 +1,2 @@ -MD5 (phpmyfaq.1.4.9.full.zip) = 1d383a35f2df8b9d7edd2359ca738694 -SIZE (phpmyfaq.1.4.9.full.zip) = 730758 +MD5 (phpmyfaq.1.4.10.full.zip) = 4e7fadfe9c316ce39eacc2027d03bd60 +SIZE (phpmyfaq.1.4.10.full.zip) = 730867 diff -ruN phpmyfaq.orig/pkg-message phpmyfaq/pkg-message --- phpmyfaq.orig/pkg-message Tue Aug 9 17:49:37 2005 +++ phpmyfaq/pkg-message Tue Aug 9 18:15:04 2005 @@ -7,8 +7,8 @@ database access method. To configure phpMyFAQ point your browser to - http://localhost/%%PHPMYFAQ_URL%%/install/installer.php - http://localhost/%%PHPMYFAQ_URL%%/admin/index.php + http://%%HOSTNAME%%/%%PHPMYFAQ_URL%%/install/installer.php + http://%%HOSTNAME%%/%%PHPMYFAQ_URL%%/admin/index.php Use the username admin and your selected password for your first login into the admin section. --- phpmyfaq.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: