From owner-freebsd-ports Sat Aug 24 11:10:20 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5EA1837B400 for ; Sat, 24 Aug 2002 11:10:06 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A712343E75 for ; Sat, 24 Aug 2002 11:10:05 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7OIA5JU070607 for ; Sat, 24 Aug 2002 11:10:05 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7OIA5QS070606; Sat, 24 Aug 2002 11:10:05 -0700 (PDT) Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 52A3D37B400; Sat, 24 Aug 2002 11:08:50 -0700 (PDT) Received: from tomts10-srv.bellnexxia.net (tomts10.bellnexxia.net [209.226.175.54]) by mx1.FreeBSD.org (Postfix) with ESMTP id 37DA343E72; Sat, 24 Aug 2002 11:08:49 -0700 (PDT) (envelope-from dmagda@number6.dyndns.org) Received: from number6.magda.ca ([64.229.176.134]) by tomts10-srv.bellnexxia.net (InterMail vM.5.01.04.19 201-253-122-122-119-20020516) with ESMTP id <20020824180832.OJKW11695.tomts10-srv.bellnexxia.net@number6.magda.ca>; Sat, 24 Aug 2002 14:08:32 -0400 Received: from number6.magda.ca (localhost [127.0.0.1]) by number6.magda.ca (8.12.5/8.12.5) with ESMTP id g7OI8lqs061577 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO); Sat, 24 Aug 2002 14:08:47 -0400 (EDT) (envelope-from dmagda@number6.dyndns.org) Received: (from dmagda@localhost) by number6.magda.ca (8.12.5/8.12.5/Submit) id g7OI8lYq061576; Sat, 24 Aug 2002 14:08:47 -0400 (EDT) Message-Id: <200208241808.g7OI8lYq061576@number6.magda.ca> Date: Sat, 24 Aug 2002 14:08:47 -0400 (EDT) From: David Magda Reply-To: David Magda To: FreeBSD-gnats-submit@FreeBSD.org Cc: DougB@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/41981: htdig is outdate wrt apache2, and apache13 file locales Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 41981 >Category: ports >Synopsis: htdig is outdate wrt apache2, and apache13 file locales >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Aug 24 11:10:04 PDT 2002 >Closed-Date: >Last-Modified: >Originator: David Magda >Release: FreeBSD 4.6-STABLE i386 >Organization: None. >Environment: System: FreeBSD number6.magda.ca 4.6-STABLE FreeBSD 4.6-STABLE #3: Sat Aug 10 11:10:13 EDT 2002 dave@number6.magda.ca:/usr/obj/usr/src/sys/MYKERNELB i386 >Description: The textproc/htdig port is outdated in two ways: 1. does not support apache2 2. still thinks everything is put into ${PREFIX}/share/apache/ under Apache 1.3.x >How-To-Repeat: Try installing it with Apache 2.0.x installed and it will try to install Apache 1.3.x. Can someone test with Apache 1.3.x please? Don't have a system available to repeat it: going from www/apache13/pkg-plist. >Fix: The attached patch will allow it to run with Apache 2.0.x if you define "WITH_APACHE2". It also puts everything into /usr/local/www/. Both Makefile and pkg-plist need to be updated. I don't have Apache 1.3.x installed so I can't test how this patch interacts with it. We are using it at http://www.ee.ryerson.ca/search.html --- Makefile.orig Sun Aug 4 19:02:42 2002 +++ Makefile Sun Aug 4 21:19:36 2002 @@ -13,12 +13,17 @@ MAINTAINER= DougB@FreeBSD.org +.if defined(WITH_APACHE2) +RUN_DEPENDS= ${LOCALBASE}/share/doc/apache2:${PORTSDIR}/www/apache2 +.else RUN_DEPENDS= ${LOCALBASE}/share/doc/apache:${PORTSDIR}/www/apache13 +.endif GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-cgi-bin-dir=${PREFIX}/share/apache/cgi-bin \ - --with-image-dir=${PREFIX}/share/apache/icons/htdig \ - --with-search-dir=${PREFIX}/share/apache/htdocs \ +CONFIGURE_ARGS+= \ + --with-cgi-bin-dir=${PREFIX}/www/cgi-bin \ + --with-image-dir=${PREFIX}/www/icons/htdig \ + --with-search-dir=${PREFIX}/www/data \ --with-common-dir=${PREFIX}/share/htdig/common \ --with-database-dir=${PREFIX}/share/htdig/database \ --with-config-dir=${PREFIX}/etc/htdig \ --- pkg-plist.orig Sun Aug 4 20:32:01 2002 +++ pkg-plist Sun Aug 4 21:15:13 2002 @@ -6,38 +6,38 @@ bin/htnotify bin/rundig etc/htdig/htdig.conf.sample -share/apache/cgi-bin/htsearch -share/apache/htdocs/search.html -share/apache/icons/htdig/button1.gif -share/apache/icons/htdig/button1.png -share/apache/icons/htdig/button10.gif -share/apache/icons/htdig/button10.png -share/apache/icons/htdig/button2.gif -share/apache/icons/htdig/button2.png -share/apache/icons/htdig/button3.gif -share/apache/icons/htdig/button3.png -share/apache/icons/htdig/button4.gif -share/apache/icons/htdig/button4.png -share/apache/icons/htdig/button5.gif -share/apache/icons/htdig/button5.png -share/apache/icons/htdig/button6.gif -share/apache/icons/htdig/button6.png -share/apache/icons/htdig/button7.gif -share/apache/icons/htdig/button7.png -share/apache/icons/htdig/button8.gif -share/apache/icons/htdig/button8.png -share/apache/icons/htdig/button9.gif -share/apache/icons/htdig/button9.png -share/apache/icons/htdig/buttonl.gif -share/apache/icons/htdig/buttonl.png -share/apache/icons/htdig/buttonr.gif -share/apache/icons/htdig/buttonr.png -share/apache/icons/htdig/htdig.gif -share/apache/icons/htdig/htdig.png -share/apache/icons/htdig/star.gif -share/apache/icons/htdig/star.png -share/apache/icons/htdig/star_blank.gif -share/apache/icons/htdig/star_blank.png +www/cgi-bin/htsearch +www/htdocs/search.html +www/icons/htdig/button1.gif +www/icons/htdig/button1.png +www/icons/htdig/button10.gif +www/icons/htdig/button10.png +www/icons/htdig/button2.gif +www/icons/htdig/button2.png +www/icons/htdig/button3.gif +www/icons/htdig/button3.png +www/icons/htdig/button4.gif +www/icons/htdig/button4.png +www/icons/htdig/button5.gif +www/icons/htdig/button5.png +www/icons/htdig/button6.gif +www/icons/htdig/button6.png +www/icons/htdig/button7.gif +www/icons/htdig/button7.png +www/icons/htdig/button8.gif +www/icons/htdig/button8.png +www/icons/htdig/button9.gif +www/icons/htdig/button9.png +www/icons/htdig/buttonl.gif +www/icons/htdig/buttonl.png +www/icons/htdig/buttonr.gif +www/icons/htdig/buttonr.png +www/icons/htdig/htdig.gif +www/icons/htdig/htdig.png +www/icons/htdig/star.gif +www/icons/htdig/star.png +www/icons/htdig/star_blank.gif +www/icons/htdig/star_blank.png share/htdig/common/bad_words share/htdig/common/english.0 share/htdig/common/english.aff @@ -50,7 +50,7 @@ share/htdig/common/syntax.html share/htdig/common/wrapper.html @dirrm etc/htdig -@dirrm share/apache/icons/htdig +@dirrm www/icons/htdig @dirrm share/htdig/common @dirrm share/htdig/database @dirrm share/htdig >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message