From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Feb 4 17:00:16 2006 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 [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E143716A436 for ; Sat, 4 Feb 2006 17:00:16 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4C39443D53 for ; Sat, 4 Feb 2006 17:00:16 +0000 (GMT) (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 k14H0GeQ032695 for ; Sat, 4 Feb 2006 17:00:16 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k14H0G0O032694; Sat, 4 Feb 2006 17:00:16 GMT (envelope-from gnats) Resent-Date: Sat, 4 Feb 2006 17:00:16 GMT Resent-Message-Id: <200602041700.k14H0G0O032694@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, "Ion-Mihai "IOnut" Tetcu" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BA1DA16A420 for ; Sat, 4 Feb 2006 16:54:56 +0000 (GMT) (envelope-from itetcu@people.tecnik93.com) Received: from it.buh.tecnik93.com (it.buh.tecnik93.com [81.196.204.98]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2AC4543D69 for ; Sat, 4 Feb 2006 16:54:51 +0000 (GMT) (envelope-from itetcu@people.tecnik93.com) Received: from it.buh.tecnik93.com (localhost [127.0.0.1]) by it.buh.tecnik93.com (Postfix) with ESMTP id E3EDCB8EA for ; Sat, 4 Feb 2006 18:54:47 +0200 (EET) Message-Id: <1139072087.70973@it.buh.tecnik93.com> Date: Sat, 4 Feb 2006 18:54:47 +0200 From: "Ion-Mihai "IOnut" Tetcu" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.7 Cc: Subject: ports/92810: [PATCH] net-p2p/jigdo: convert to OPTIONS and unBREAK X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 17:00:17 -0000 >Number: 92810 >Category: ports >Synopsis: [PATCH] net-p2p/jigdo: convert to OPTIONS and unBREAK >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Feb 04 17:00:15 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Ion-Mihai "IOnut" Tetcu >Release: FreeBSD 6.0-STABLE i386 >Organization: Tecnik'93 >Environment: System: FreeBSD 6.0-STABLE #1: Mon Jan 23 00:45:10 EET 2006 >Description: Convert to use OPTIONS instead of home-grown configure script. Use DATADIR macro in pkg-plist. I don't use this port so maintainer should check OPTIONS descriptions. Requested by: kris by marking it broken Tinderbox logs: people.tecnik93.com/~itetcu/FreeBSD/others_ports/jingo/ >How-To-Repeat: >Fix: --- jigdo.diff begins here --- diff -urN jigdo.FPT/Makefile jigdo/Makefile --- jigdo.FPT/Makefile Fri Feb 3 12:39:35 2006 +++ jigdo/Makefile Sat Feb 4 18:43:59 2006 @@ -16,7 +16,7 @@ BUILD_DEPENDS= libwww-config:${PORTSDIR}/www/libwww \ ${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget -BROKEN= Needs to be converted to use OPTIONS instead of home-grown configure script +#BROKEN= Needs to be converted to use OPTIONS instead of home-grown configure script MAN1= jigdo-file.1 jigdo-lite.1 jigdo-mirror.1 @@ -26,9 +26,9 @@ CONFIGURE_ARGS= --without-libdb --disable-nls --without-gui USE_GMAKE= yes -SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ - TOUCH="${TOUCH}" \ - MKDIR="${MKDIR}" \ +OPTIONS= GUI "Build the gtk2 gui" off +OPTIONS+= DB3 "Build with BDB3 support" on +OPTIONS+= NLS "Internationalization support" off .include @@ -36,17 +36,26 @@ NOT_FOR_ARCHS+= alpha .endif -pre-fetch: - @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.jigdo - -.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) -.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" +.ifdef(WITH_GUI) +CONFIGURE_ARGS+= --with-gui +LIB_DEPENDS+= gtk-x11-2.0:\${PORTSDIR}/x11-toolkits/gtk20 +MAN1+= jigdo.1 +PLIST_SUB+= SUB_GUI="" +.else +PLIST_SUB+= SUB_GUI="@comment " +.endif +.ifdef(WITH_DB3) +CONFIGURE_ARGS+= --with-libdb=-ldb3 +CONFIGURE_ENV+= CPPFLAGS=-I\${LOCALBASE}/include/db3 \ + LIBS=-L\${LOCALBASE}/lib \ + LDFLAGS=-ldb3 +USE_BDB= 3 +.endif +.ifdef(WITH_NLS) +CONFIGURE_ARGS+= --enable-nls=${LOCALBASE}/include .endif post-install: @${STRIP_CMD} ${PREFIX}/bin/jigdo-file - -post-clean: - @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc .include diff -urN jigdo.FPT/pkg-plist jigdo/pkg-plist --- jigdo.FPT/pkg-plist Tue Sep 28 00:10:21 2004 +++ jigdo/pkg-plist Sat Feb 4 17:51:01 2006 @@ -2,14 +2,14 @@ bin/jigdo-lite bin/jigdo-mirror %%SUB_GUI%%bin/jigdo -share/jigdo/debian-mirrors.jigdo -%%SUB_GUI%%share/jigdo/COPYING -%%SUB_GUI%%share/jigdo/pixmaps/close.png -%%SUB_GUI%%share/jigdo/pixmaps/jigdo-logo.png -%%SUB_GUI%%share/jigdo/pixmaps/pause.png -%%SUB_GUI%%share/jigdo/pixmaps/progress-green.png -%%SUB_GUI%%share/jigdo/pixmaps/restart.png -%%SUB_GUI%%share/jigdo/pixmaps/start.png -%%SUB_GUI%%share/jigdo/pixmaps/stop.png -%%SUB_GUI%%@dirrm share/jigdo/pixmaps -@dirrm share/jigdo +%%DATADIR%%/debian-mirrors.jigdo +%%SUB_GUI%%%%DATADIR%%/COPYING +%%SUB_GUI%%%%DATADIR%%/pixmaps/close.png +%%SUB_GUI%%%%DATADIR%%/pixmaps/jigdo-logo.png +%%SUB_GUI%%%%DATADIR%%/pixmaps/pause.png +%%SUB_GUI%%%%DATADIR%%/pixmaps/progress-green.png +%%SUB_GUI%%%%DATADIR%%/pixmaps/restart.png +%%SUB_GUI%%%%DATADIR%%/pixmaps/start.png +%%SUB_GUI%%%%DATADIR%%/pixmaps/stop.png +%%SUB_GUI%%@dirrm %%DATADIR%%/pixmaps +@dirrm %%DATADIR%% diff -urN jigdo.FPT/scripts/configure.jigdo jigdo/scripts/configure.jigdo --- jigdo.FPT/scripts/configure.jigdo Tue Sep 28 00:10:21 2004 +++ jigdo/scripts/configure.jigdo Thu Jan 1 02:00:00 1970 @@ -1,73 +0,0 @@ -#!/bin/sh -# $FreeBSD: ports/net-p2p/jigdo/scripts/configure.jigdo,v 1.3 2004/09/27 21:10:21 thierry Exp $ - -if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then - exit -fi - -tempfile=`mktemp -t checklist` - -if [ "${BATCH}" = "yes" ]; then - set \"DB3\" -else - dialog --title "Jigsaw Download configuration options" \ - --clear --checklist "\n\ -Please select desired options:" -1 -1 16 \ -GUI "Graphical User Interface (experimental)" OFF \ -DB3 "Berkeley DB3 (used for jigdo-file's cache)" ON \ -NLS "Native Language Support (no language files yet)" OFF \ -2> $tempfile - - retval=$? - - if [ -s $tempfile ]; then - set `cat $tempfile` - fi - rm -f $tempfile - - case $retval in - 0) if [ -z "$*" ]; then - echo "Nothing selected" - fi - ;; - 1) echo "Cancel pressed." - exit 1 - ;; - esac -fi - -${MKDIR} ${WRKDIRPREFIX}${CURDIR} -exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - -echo "PREFIX= ${PREFIX}" - -SUB_GUI="@comment " - -while [ "$1" ]; do - case $1 in - \"GUI\") - echo "CONFIGURE_ARGS+= --with-gui" - echo "LIB_DEPENDS+= gtk-x11-2.0:\${PORTSDIR}/x11-toolkits/gtk20" - echo "MAN1+= jigdo.1" - SUB_GUI="" - ;; - \"DB3\") - echo "CONFIGURE_ARGS+= --with-libdb=-ldb3" - echo "CONFIGURE_ENV+= \ - CPPFLAGS=\"-I\${LOCALBASE}/include/db3\" \ - LIBS=\"-L\${LOCALBASE}/lib\" LDFLAGS+=\"-ldb3\"" - echo "LIB_DEPENDS= db3:\${PORTSDIR}/databases/db3" - ;; - \"NLS\") - echo "CONFIGURE_ARGS+= --enable-nls=${LOCALBASE}/include" - ;; - *) - echo "Invalid option(s): $*" > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - ;; - esac - shift -done - -echo "PLIST_SUB+= SUB_GUI=\"${SUB_GUI}\"" --- jigdo.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: