From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jan 26 18:00:35 2007 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 [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6E07716A409 for ; Fri, 26 Jan 2007 18:00:35 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 4CC4713C4B0 for ; Fri, 26 Jan 2007 18:00:35 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l0QI0YuC054382 for ; Fri, 26 Jan 2007 18:00:34 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l0QI0Y11054381; Fri, 26 Jan 2007 18:00:34 GMT (envelope-from gnats) Resent-Date: Fri, 26 Jan 2007 18:00:34 GMT Resent-Message-Id: <200701261800.l0QI0Y11054381@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, Nick Hilliard Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3B60C16A405 for ; Fri, 26 Jan 2007 17:57:07 +0000 (UTC) (envelope-from nick@muffin.acquirer.com) Received: from mail.acquirer.com (mail.acquirer.com [213.94.200.65]) by mx1.freebsd.org (Postfix) with ESMTP id 606E413C494 for ; Fri, 26 Jan 2007 17:57:06 +0000 (UTC) (envelope-from nick@muffin.acquirer.com) Received: from muffin.acquirer.com (localhost [127.0.0.1]) by mail.acquirer.com (8.13.6/8.13.6) with ESMTP id l0QHR340029747 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 26 Jan 2007 17:27:03 GMT (envelope-from nick@muffin.acquirer.com) Received: (from nick@localhost) by muffin.acquirer.com (8.13.6/8.13.6/Submit) id l0QHR2Kb054274; Fri, 26 Jan 2007 17:27:02 GMT (envelope-from nick) Message-Id: <200701261727.l0QHR2Kb054274@muffin.acquirer.com> Date: Fri, 26 Jan 2007 17:27:02 GMT From: Nick Hilliard To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/108383: maintainer update: drupal-textile - 4.7.x.1.x.d_20061113 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Nick Hilliard List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Jan 2007 18:00:35 -0000 >Number: 108383 >Category: ports >Synopsis: maintainer update: drupal-textile - 4.7.x.1.x.d_20061113 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Jan 26 18:00:33 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Nick Hilliard >Release: FreeBSD 6.1-RELEASE i386 >Organization: Network Ability Ltd >Environment: System: FreeBSD xx 6.1-RELEASE FreeBSD 6.1-RELEASE #0: Wed May 17 11:38:53 IST 2006 nick@xxx:/data/src/usr.src/src-6.1/src/sys/i386/compile/xxx i386 >Description: maintainer update for drupal-textile -> 4.7.x.1.x.d_20061113 >How-To-Repeat: >Fix: diff -Nur drupal-textile.orig/Makefile drupal-textile/Makefile --- drupal-textile.orig/Makefile Tue Jan 9 03:19:03 2007 +++ drupal-textile/Makefile Fri Jan 26 12:32:52 2007 @@ -6,8 +6,8 @@ # PORTNAME= textile -DISTVERSION= ${DRUPAL_VERSION} -PORTREVISION= 20060511 +DISTVERSION= 4.7.x-1.x-dev +PORTREVISION= 20061113 CATEGORIES= www textproc MASTER_SITE_SUBDIR= brooks @@ -16,16 +16,17 @@ DRUPAL_MODULE= yes MODULE_DIRS= textilephp -MODULE_FILES= textile.module textilephp/Textile.php +MODULE_FILES= textile.module textilephp/Textile.php DrupalTextile.inc DOC_DIRS= textilephp/doc textilephp DOC_FILES= CHANGELOG.txt CREDITS.txt INSTALL.txt LICENSE.txt README.txt \ - textilephp/doc/classMTLikeTextile-members.html \ + TODO.txt \ textilephp/doc/Textile_8php-source.html \ textilephp/doc/Textile_8php.html \ textilephp/doc/annotated.html \ - textilephp/doc/classTextile-members.html \ + textilephp/doc/classMTLikeTextile-members.html \ textilephp/doc/classMTLikeTextile.html \ textilephp/doc/classMTLikeTextile.png \ + textilephp/doc/classTextile-members.html \ textilephp/doc/classTextile.html \ textilephp/doc/classTextile.png \ textilephp/doc/doxygen.css \ @@ -39,6 +40,7 @@ textilephp/textilephp.doxyfile \ textilephp/CHANGELOG \ textilephp/CREDITS \ + textilephp/LICENSE \ textilephp/README \ textilephp/TODO diff -Nur drupal-textile.orig/distinfo drupal-textile/distinfo --- drupal-textile.orig/distinfo Fri Jan 5 21:32:19 2007 +++ drupal-textile/distinfo Fri Jan 26 12:23:40 2007 @@ -1,3 +1,3 @@ -MD5 (drupal/textile-4.7.0.tar.gz) = 0836f51df99929b410d45a2ad8079853 -SHA256 (drupal/textile-4.7.0.tar.gz) = 86ba06d109ca305ee263cf02ffc93404817555716225bd67fe3a46e117b22ea6 -SIZE (drupal/textile-4.7.0.tar.gz) = 121007 +MD5 (drupal/textile-4.7.x-1.x-dev.tar.gz) = f921ea2e5f61d2235a37d2ec67c02ecf +SHA256 (drupal/textile-4.7.x-1.x-dev.tar.gz) = b3cb512155965694fa33ad01d1f78bb5ee76ed2c9c82218fbbf1bbea3f87a477 +SIZE (drupal/textile-4.7.x-1.x-dev.tar.gz) = 120206 diff -Nur drupal-textile.orig/files/patch-DrupalTextile.inc drupal-textile/files/patch-DrupalTextile.inc --- drupal-textile.orig/files/patch-DrupalTextile.inc Thu Jan 1 01:00:00 1970 +++ drupal-textile/files/patch-DrupalTextile.inc Thu Jan 25 16:58:00 2007 @@ -0,0 +1,21 @@ +--- DrupalTextile.inc.orig Fri Dec 8 13:01:07 2006 ++++ DrupalTextile.inc Fri Dec 8 13:00:49 2006 +@@ -38,11 +38,17 @@ + * A string containing the formatted URL. + */ + function format_url($args) { ++ $query = null; ++ if (preg_match ('/([^\?]*)\?(.*)/', $args['url'], $matches)) { ++ $args['url'] = $matches[1]; ++ $query = $matches[2]; ++ } ++ + if (preg_match('<^#>', $args['url'])) { + $args['url'] = $_GET['q'] . $args['url']; + } + +- $args['url'] = ($args['url'] ? url($args['url']) : ''); ++ $args['url'] = ($args['url'] ? url($args['url'], $query) : ''); + + return parent::format_url($args); + } diff -Nur drupal-textile.orig/files/pkg-install.in drupal-textile/files/pkg-install.in --- drupal-textile.orig/files/pkg-install.in Wed Feb 22 00:58:04 2006 +++ drupal-textile/files/pkg-install.in Thu Jan 1 01:00:00 1970 @@ -1,27 +0,0 @@ -#!/bin/sh - -PREFIX=%%PREFIX%% -CONF_FILES="%%CONF_FILES%%" -CONF_DIRS="%%CONF_DIRS%%" - -case $2 in -POST-INSTALL) - for cfgfile in "${CONF_FILES}"; do - if [ ! -e ${PREFIX}/${cfgfile} ]; then - cp ${PREFIX}/${cfgfile}-dist ${PREFIX}/${cfgfile} - fi - done - ;; -DEINSTALL) - for cfgfile in "${CONF_FILES}"; do - if cmp -s ${PREFIX}/${cfgfile} ${PREFIX}/${cfgfile}-dist ]; then - rm ${PREFIX}/${cfgfile} - fi - done - ;; -POST-DEINSTALL) - for cfgdir in "${CONF_DIRS}"; do - rmdir ${PREFIX}/${cfgdir} 2> /dev/null || true - done - ;; -esac >Release-Note: >Audit-Trail: >Unformatted: