Date: Thu, 11 Sep 2003 22:23:25 +0200 From: Clement Laforet <sheepkiller@cultdeadsheep.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Clement Laforet <sheepkiller@cultdeadsheep.org> Subject: ports/56717: [bento fix] www/harvest: Once more, fix harvest prefix Message-ID: <20030911202255.A6D5F43FE9@mx1.FreeBSD.org> Resent-Message-ID: <200309112030.h8BKUL0I052621@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 56717 >Category: ports >Synopsis: [bento fix] www/harvest: Once more, fix harvest prefix >Confidential: no >Severity: critical >Priority: high >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Sep 11 13:30:20 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Clement Laforet >Release: FreeBSD 5.1-CURRENT i386 >Organization: cotds.org >Environment: System: FreeBSD lucifer.cultdeadsheep.org 5.1-CURRENT FreeBSD 5.1-CURRENT #2: Mon Sep 1 10:07:15 CEST 2003 root@lucifer.cultdeadsheep.org:/usr/obj/usr/src/sys/LUCIFER i386 >Description: Few weeks ago, I posted about USE_LIBTOOL and GNU_CONFIGURE (http://lists.freebsd.org/pipermail/freebsd-ports/2003-August/003310.html) oliver@ cleaned my patch (MANPREFIX stuff) and added USE_LIBTOOL... and now ports is broken, because prefix is arbitrary set by GNU_CONFIGURE subroutines, I should have thought of this before :-) I admit Harvest should be the only problematic port, and probably no one excepts me still uses this software, but it should be a good idea to add a work around for this in bsd.ports.mk... I'll work on this... Anyway, here's a dirty hack to make harvest still usable. >How-To-Repeat: Install harvest port. http://bento.freebsd.org/errorlogs/i386-5-latest/harvest-1.9.10.log >Fix: --- PR-harvest begins here --- Index: Makefile =================================================================== RCS file: /WORK/REPO/ports/www/harvest/Makefile,v retrieving revision 1.24 diff -u -r1.24 Makefile --- Makefile 2 Aug 2003 16:20:20 -0000 1.24 +++ Makefile 11 Sep 2003 19:59:18 -0000 @@ -19,10 +19,9 @@ USE_REINPLACE= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes -HAS_CONFIGURE= yes -CONFIGURE_ARGS= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \ - --prefix=${PREFIX}/${PORTNAME} \ - --without-wish +REAL_CONFIGURE_ARGS= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \ + --prefix=${PREFIX}/${PORTNAME} \ + --without-wish STRIP= # none @@ -48,6 +47,25 @@ post-patch: @${GREP} -lR "<malloc.h>" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \ 's|<malloc\.h>|<stdlib.h>|g' + +# VERY dirty hack to avoid the call to GNU_CONFIGURE which sets arbitraly configure prefix. +do-configure: + @(cd ${CONFIGURE_WRKSRC} && \ + if ! ${SETENV} CC="${CC}" CXX="${CXX}" \ + CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ + INSTALL="/usr/bin/install -c ${_BINOWNGRP}" \ + INSTALL_DATA="${INSTALL_DATA}" \ + INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ + INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ + ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${REAL_CONFIGURE_ARGS}; then \ + ${ECHO_CMD} "===> Script \"${CONFIGURE_SCRIPT}\" failed unexpectedly."; \ + (${ECHO_CMD} " Please report the problem to ${MAINTAINER} [maintainer] and"; \ + ${ECHO_CMD} " attach the \"${CONFIGURE_WRKSRC}/${CONFIGURE_LOG}\" including"; \ + ${ECHO_CMD} " the output of the failure of your make command. Also, it might"; \ + ${ECHO_CMD} " be a good idea to provide an overview of all packages installed"; \ + ${ECHO_CMD} " on your system (e.g. an \`ls ${PKG_DBDIR}\`).") | /usr/bin/fmt 75 79 ; \ + ${FALSE}; \ + fi) post-configure: .if ${OSVERSION} > 501101 --- PR-harvest ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030911202255.A6D5F43FE9>