From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jun 19 05:40: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 B42B716A47C for ; Mon, 19 Jun 2006 05:40:16 +0000 (UTC) (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 25E8943D48 for ; Mon, 19 Jun 2006 05:40: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 k5J5eFik041942 for ; Mon, 19 Jun 2006 05:40:15 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k5J5eFMU041937; Mon, 19 Jun 2006 05:40:15 GMT (envelope-from gnats) Resent-Date: Mon, 19 Jun 2006 05:40:15 GMT Resent-Message-Id: <200606190540.k5J5eFMU041937@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, Arseny Nasokin Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2AA3D16A510 for ; Mon, 19 Jun 2006 05:36:16 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id E943843D46 for ; Mon, 19 Jun 2006 05:36:15 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id k5J5aFtX051194 for ; Mon, 19 Jun 2006 05:36:15 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id k5J5aF64051193; Mon, 19 Jun 2006 05:36:15 GMT (envelope-from nobody) Message-Id: <200606190536.k5J5aF64051193@www.freebsd.org> Date: Mon, 19 Jun 2006 05:36:15 GMT From: Arseny Nasokin To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-2.3 Cc: Subject: ports/99163: [PATCH] polish/gadugadu OPTIONS fix 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: Mon, 19 Jun 2006 05:40:16 -0000 >Number: 99163 >Category: ports >Synopsis: [PATCH] polish/gadugadu OPTIONS fix >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Mon Jun 19 05:40:15 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Arseny Nasokin >Release: FreeBSD 7.0-CURRENT >Organization: Moscow State University >Environment: $FreeBSD: ports/polish/gnugadu/Makefile,v 1.15 2006/05/13 01:03:09 edwin Exp $ >Description: >How-To-Repeat: >Fix: --- Makefile.orig Mon Jun 19 09:30:11 2006 +++ Makefile Mon Jun 19 09:38:55 2006 @@ -16,26 +16,38 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A GaduGadu client for X11/GTK -BROKEN= Needs to be converted to OPTIONS - USE_GMAKE= yes USE_GNOME= gtk12 -USE_SUBMAKE= yes GNU_CONFIGURE= yes - .if !defined(BATCH) && !defined(PACKAGE_BUILDING) IS_INTERACTIVE= yes .endif +OPTIONS= ESD "Esound support" on \ + ARTS "Arts support" off \ + GNOME "Gnome support" off \ + PANEL "Gnome applet support" off -SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ - TOUCH="${TOUCH}" \ - MKDIR="${MKDIR}" \ - CAT="${CAT}" \ - GNUGADU_OPTIONS="${GNUGADU_OPTIONS}" \ - REALCURDIR="${.CURDIR}" +.include +.if defined(WITH_ESD) && !defined (WITHOUT_ESD) +USE_GNOME+= esound +CONFIGURE_ARGS+= --enable-esd +.else +CONFIGURE_ARGS+= --disable-esd +.endif -pre-fetch: - @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.gg +.if defined(WITH_GNOME) && !defined (WITHOUT_GNOME) +USE_GNOME+= gnomelibs +CONFIGURE_ARGS+= --enable-gnome +.else +CONFIGURE_ARGS+= --disable-esd +.endif + +.if defined(WITH_PANEL) && !defined (WITHOUT_PANEL) +USE_GNOME+= gnomepanel +CONFIGURE_ARGS+= --enable-panel +.else +CONFIGURE_ARGS+= --disable-panel +.endif post-patch: @${REINPLACE_CMD} -e 's,GTK_ CFLAGS,GTK_CFLAGS,' \ @@ -52,8 +64,4 @@ post-clean: @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc -.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) -.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" -.endif - -.include +.include >Release-Note: >Audit-Trail: >Unformatted: