Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 24 Aug 2002 14:08:47 -0400 (EDT)
From:      David Magda <dmagda+fports@magda.ca>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        DougB@FreeBSD.org
Subject:   ports/41981: htdig is outdate wrt apache2, and apache13 file locales
Message-ID:  <200208241808.g7OI8lYq061576@number6.magda.ca>

next in thread | raw e-mail | index | archive | help

>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




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200208241808.g7OI8lYq061576>