From owner-freebsd-ports  Sat Mar 10 19:20:10 2001
Delivered-To: freebsd-ports@hub.freebsd.org
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 91EA737B719
	for <freebsd-ports@hub.freebsd.org>; Sat, 10 Mar 2001 19:20:01 -0800 (PST)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.11.1/8.11.1) id f2B3K1921613;
	Sat, 10 Mar 2001 19:20:01 -0800 (PST)
	(envelope-from gnats)
Received: from spare.westbend.net (spare.westbend.net [216.106.246.5])
	by hub.freebsd.org (Postfix) with ESMTP id 3FE9037B719
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 10 Mar 2001 19:11:44 -0800 (PST)
	(envelope-from admin@spare.westbend.net)
Received: (from root@localhost)
	by spare.westbend.net (8.11.1/8.11.1) id f2B3Bgr49036;
	Sat, 10 Mar 2001 21:11:42 -0600 (CST)
	(envelope-from admin)
Message-Id: <200103110311.f2B3Bgr49036@spare.westbend.net>
Date: Sat, 10 Mar 2001 21:11:42 -0600 (CST)
From: "Scot W. Hetzel" <hetzel@westbend.net>
Reply-To: hetzels@westbend.net
To: FreeBSD-gnats-submit@freebsd.org
X-Send-Pr-Version: 3.2
Subject: ports/25673: [MAINTAINER] www/apache13-fp - Fix bento error for 5-CURRENT
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         25673
>Category:       ports
>Synopsis:       Fix bento build error with apache13-fp and 5-CURRENT
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Mar 10 19:20:01 PST 2001
>Closed-Date:
>Last-Modified:
>Originator:     Scot W. Hetzel
>Release:        FreeBSD 4.2-STABLE i386
>Organization:
West Bend Internet
>Environment:


>Description:

Bento fails to build apache13-fp in a 5-CURRENT chrooted area due to no
libdescrypt library is found.

The lib*crypt libraries were merged into libcrypt.  

>How-To-Repeat:

Try building apache13-fp on 5-CURRENT.

>Fix:

The following patch corrects the problem by disabling the descrypt check
for 5-CURRENT.

--- Makefile.orig	Sat Mar 10 21:00:04 2001
+++ Makefile	Sat Mar 10 21:03:44 2001
@@ -7,6 +7,7 @@
 
 PORTNAME=	apache_fp
 PORTVERSION=	1.3.19
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.apache.org/dist/ \
 		ftp://ftp.microsoft.com/products/frontpage/ \
@@ -45,12 +46,16 @@
 .if ${ARCH} == i386
 .ifdef WANT_FREEBSD_EXT
 FRONTPAGE=	fp40.freebsd.tar.z
+.if ${OSVERSION} < 500016
 PKGMESSAGE=	pkg-message.freebsd
+.endif
 .else
 FRONTPAGE=	fp40.bsdi.tar.z
 EXTRA_PATCHES=	${FILESDIR}/change_server.bsdi ${FILESDIR}/fp_install.bsdi
+.if ${OSVERSION} < 500016
 PKGMESSAGE=	pkg-message.bsdi
 .endif
+.endif
 .elif ${ARCH} == alpha
 FRONTPAGE=	fp40.alpha.tar.z
 EXTRA_PATCHES=	${FILESDIR}/change_server.alpha ${FILESDIR}/fp_install.alpha
@@ -139,6 +144,7 @@
 MAN8+=	suexec.8
 .endif
 
+.if ${OSVERSION} < 500016
 pre-extract:
 	@if ! ${LDCONFIG} -r | ${GREP} -q -e "-ldescrypt"; then \
 	   ${ECHO} ; \
@@ -161,6 +167,7 @@
 	   ${FALSE} ; \
 	fi
 .endif
+.endif
 
 post-extract:
 	@${ECHO} "===>  Extracting FrontPage install scripts"
@@ -211,8 +218,10 @@
 	@${INSTALL_FILE} ${WRKSRC}/${CHANGESERVER} ${PREFIX}/${CHANGESERVER}-dist
 	@${INSTALL_FILE} ${WRKSRC}/${FPSETPERM} ${PREFIX}/${FPSETPERM}
 	@PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+.if ${OSVERSION} < 500016
 .if ${ARCH} == i386
 	@${CAT} ${PKGMESSAGE}
+.endif
 .endif
 
 .include <bsd.port.mk>
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message