From nobody@FreeBSD.org  Mon Jun 19 05:36:16 2006
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2AA3D16A510
	for <freebsd-gnats-submit@FreeBSD.org>; 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 <freebsd-gnats-submit@FreeBSD.org>; 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 <freebsd-gnats-submit@FreeBSD.org>; 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 <tarc@tarc.po.cs.msu.su>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] polish/gadugadu OPTIONS fix
X-Send-Pr-Version: www-2.3

>Number:         99163
>Category:       ports
>Synopsis:       [PATCH] polish/gadugadu OPTIONS fix
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    itetcu
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jun 19 05:40:15 GMT 2006
>Closed-Date:    Wed Jul 12 21:59:56 GMT 2006
>Last-Modified:  Wed Jul 12 21:59:56 GMT 2006
>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 <bsd.port.pre.mk>
+.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 <bsd.port.mk>
+.include <bsd.port.post.mk>
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->itetcu 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Jun 19 06:47:25 UTC 2006 
Responsible-Changed-Why:  
itetcu@ wants to have OPTIONS PRs 

http://www.freebsd.org/cgi/query-pr.cgi?pr=99163 
State-Changed-From-To: open->feedback 
State-Changed-By: itetcu 
State-Changed-When: Tue Jun 20 09:46:47 UTC 2006 
State-Changed-Why:  
fails to patch, this might help you: 
http://www.freebsd.org/cgi/getmsg.cgi?fetch=997415+0+/usr/local/www/db/text/2006/freebsd-ports/20060521.freebsd-ports 

http://www.freebsd.org/cgi/query-pr.cgi?pr=99163 

From: Marcin Wisnicki <mwisnicki+freebsd@gmail.com>
To: bug-followup@FreeBSD.org, tarc@tarc.po.cs.msu.su
Cc:  
Subject: Re: ports/99163: [PATCH] polish/gadugadu OPTIONS fix
Date: Mon, 03 Jul 2006 19:28:54 +0200

 Submitted patch has spaces instead of tabs, I'm attaching corrected
 version. It compiles and runs fine with default config, but I cannot
 test anything else.
 
 If you want you can commit this or just set DEPRECATED unless someone
 wants to maintain it. This is some old and no longer maintained
 gtk1/gnome1 app. Users of this software can always install
 polish/gnugadu2.
 
 --- pl-gnugadu-1.0.0_2.patch begins here ---
 diff
 -ruN /usr/ports/polish/gnugadu.orig/Makefile /usr/ports/polish/gnugadu/Makefile
 --- /usr/ports/polish/gnugadu.orig/Makefile	Tue May 16 21:21:20 2006
 +++ /usr/ports/polish/gnugadu/Makefile	Mon Jul  3 19:04:01 2006
 @@ -16,26 +16,40 @@
  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
  
 -SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
 -		TOUCH="${TOUCH}" \
 -		MKDIR="${MKDIR}" \
 -		CAT="${CAT}" \
 -		GNUGADU_OPTIONS="${GNUGADU_OPTIONS}" \
 -		REALCURDIR="${.CURDIR}"
 +OPTIONS=	ESD "Esound support" on \
 +		ARTS "Arts support" off \
 +		GNOME "Gnome support" off \
 +		PANEL "Gnome applet support" off
 +
 +.include <bsd.port.pre.mk>
 +.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 +66,4 @@
  post-clean:
  	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
  
 -.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
 -.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
 -.endif
 -
 -.include <bsd.port.mk>
 +.include <bsd.port.post.mk>
 --- pl-gnugadu-1.0.0_2.patch ends here ---
 

From: Marcin Wisnicki <mwisnicki+freebsd@gmail.com>
To: bug-followup@FreeBSD.org
Cc: tarc@tarc.po.cs.msu.su
Subject: Re: ports/99163: [PATCH] polish/gadugadu OPTIONS fix
Date: Mon, 03 Jul 2006 19:32:50 +0200

 Dnia 03-07-2006, pon o godzinie 19:29 +0200, Marcin Wisnicki napisał(a):
 > Submitted patch has spaces instead of tabs, I'm attaching corrected
 > version. It compiles and runs fine with default config, but I cannot
 > test anything else.
 > 
 > If you want you can commit this or just set DEPRECATED unless someone
 > wants to maintain it. This is some old and no longer maintained
 > gtk1/gnome1 app. Users of this software can always install
 > polish/gnugadu2.
 > 
 > --- pl-gnugadu-1.0.0_2.patch begins here ---
 > --- pl-gnugadu-1.0.0_2.patch ends here ---
 
 Also, if you are going to commit this then please remove gnugadu/scripts
 
State-Changed-From-To: feedback->closed 
State-Changed-By: itetcu 
State-Changed-When: Wed Jul 12 21:59:54 UTC 2006 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=99163 
>Unformatted:
