From tkato432@yahoo.com  Fri May 25 18:02:17 2007
Return-Path: <tkato432@yahoo.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id A3D8416A400
	for <FreeBSD-gnats-submit@FreeBSD.org>; Fri, 25 May 2007 18:02:15 +0000 (UTC)
	(envelope-from tkato432@yahoo.com)
Received: from msa01.dion.ne.jp (msa01.dion.ne.jp [222.3.140.164])
	by mx1.freebsd.org (Postfix) with ESMTP id 6D0EF13C46C
	for <FreeBSD-gnats-submit@FreeBSD.org>; Fri, 25 May 2007 18:02:15 +0000 (UTC)
	(envelope-from tkato432@yahoo.com)
Received: from localhost.localdomain (ZT067038.ppp.dion.ne.jp [59.128.67.38])
	by msa101.dion.ne.jp (DION MAIL) with ESMTP id 044B58A803F
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sat, 26 May 2007 03:02:12 +0900 (JST)
Message-Id: <20070526030031.8cc64b32.tkato432@yahoo.com>
Date: Sat, 26 May 2007 03:00:31 +0900
From: KATO Tsuguru <tkato432@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: Update port: x11/xnee to 2.06

>Number:         113010
>Category:       ports
>Synopsis:       Update port: x11/xnee to 2.06
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri May 25 18:10:10 GMT 2007
>Closed-Date:    Mon Jun 04 06:40:25 GMT 2007
>Last-Modified:  Mon Jun  4 06:50:03 GMT 2007
>Originator:     KATO Tsuguru
>Release:        FreeBSD 6.2-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
- Update to version 2.06

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/x11/xnee/Makefile x11/xnee/Makefile
--- /usr/ports/x11/xnee/Makefile	Sun May 20 13:58:31 2007
+++ x11/xnee/Makefile	Mon May 21 16:26:27 2007
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xnee
-PORTVERSION=	2.05
-PORTREVISION=	1
+PORTVERSION=	2.06
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,39 +15,63 @@
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X events recorder and player
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/makeinfo:${PORTSDIR}/print/texinfo
+OPTIONS=	GNEE "Build the GUI frontend" off \
+		PNEE "Build the Gnome Panel frontend" off
 
-USE_X_PREFIX=	yes
-WANT_GNOME=	yes
+USE_XLIB=	yes
 USE_GNOME=	gnomehack gnometarget
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--mandir=${PREFIX}/man --enable-cli --disable-doc
+CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man --enable-cli --disable-doc
 
 MAN1=		cnee.1
 INFO=		xnee
 PLIST_FILES=	bin/cnee \
-		share/Xnee/example1.xns \
-		share/Xnee/simple_bash.sh \
-		share/Xnee/xnee.sh
-PLIST_DIRS=	share/Xnee
+		%%DATADIR%%/example1.xns \
+		%%DATADIR%%/pixmaps/xnee.png \
+		%%DATADIR%%/pixmaps/xnee.xpm \
+		%%DATADIR%%/simple_bash.sh \
+		%%DATADIR%%/xnee.sh
+PLIST_DIRS=	%%DATADIR%%/pixmaps %%DATADIR%%
 
 .include <bsd.port.pre.mk>
 
-.if ${HAVE_GNOME:Mgtk20}!=""
+.if defined(WITH_GNEE)
 USE_GNOME+=	gtk20
 PLIST_FILES+=	bin/gnee
-PKGNAMESUFFIX=	-gtk
 .else
 CONFIGURE_ARGS+=	--disable-gui
 .endif
 
+.if defined(WITH_PNEE)
+USE_GNOME+=	gnomepanel
+MAN1+=		pnee.1
+PLIST_FILES+=	libdata/bonobo/servers/pnee.server \
+		libexec/pnee \
+		%%DATADIR%%/pixmaps/pnee-record.png \
+		%%DATADIR%%/pixmaps/pnee-replay.png \
+		%%DATADIR%%/pixmaps/pnee-stop-mini.png \
+		%%DATADIR%%/pixmaps/pnee-stop.png
+.else
+CONFIGURE_ARGS+=	--disable-gnome-applet
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e \
+		's|$${libdir}/gnome-panel|$${prefix}/libexec|g ; \
+		 s|$${libdir}/bonobo/|$${prefix}/libdata/bonobo/|g ; \
+		 s|CCC||g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		's|@PIXMAP_DIR@|pixmap|g' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e \
 		's|make man|$$(MAKE) man|g' ${WRKSRC}/cnee/Makefile.in
+	@${REINPLACE_CMD} -e \
+		's|cp pnee|$$(INSTALL_DATA) pnee|g' ${WRKSRC}/pnee/Makefile.in
+	@${REINPLACE_CMD} -e \
+		's|cp $$(PNEE)|$$(INSTALL_PROGRAM) $$(PNEE)|g' ${WRKSRC}/pnee/src/Makefile.in
 
 post-build:
-	cd ${WRKSRC}/doc && ${LOCALBASE}/bin/makeinfo --no-split xnee.texi
+	cd ${WRKSRC}/doc && /usr/bin/makeinfo --no-split xnee.texi
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/xnee.info ${PREFIX}/${INFO_PATH}
diff -urN /usr/ports/x11/xnee/distinfo x11/xnee/distinfo
--- /usr/ports/x11/xnee/distinfo	Sat Jun 17 21:30:36 2006
+++ x11/xnee/distinfo	Thu May  3 02:30:49 2007
@@ -1,3 +1,3 @@
-MD5 (Xnee-2.05.tar.gz) = cffd6240d1b362ba2b805d115f362020
-SHA256 (Xnee-2.05.tar.gz) = 4e4a0a49bd5c5f0d89339ce360bfeb062b4302b61671c755993b4f80bbdd241f
-SIZE (Xnee-2.05.tar.gz) = 598222
+MD5 (Xnee-2.06.tar.gz) = 1b605eba1b014a5b686df72820deedcb
+SHA256 (Xnee-2.06.tar.gz) = b431dce34f53990f3841203c1c03c394b899e4b324ea753f03a764b7750d84c4
+SIZE (Xnee-2.06.tar.gz) = 592914
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Fri May 25 18:28:43 UTC 2007 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=113010 
State-Changed-From-To: open->feedback 
State-Changed-By: miwi 
State-Changed-When: Sun May 27 19:30:08 UTC 2007 
State-Changed-Why:  
Ask for maintainer approval. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=113010 
State-Changed-From-To: feedback->closed 
State-Changed-By: miwi 
State-Changed-When: Mon Jun 4 06:40:23 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/113010: commit references a PR
Date: Mon,  4 Jun 2007 06:40:21 +0000 (UTC)

 miwi        2007-06-04 06:40:15 UTC
 
   FreeBSD ports repository
 
   Modified files:
     x11/xnee             Makefile distinfo 
   Added files:
     x11/xnee/files       patch-cnee__src__cnee_printer.c 
   Log:
   - Update to 2.06
   
   PR:             113010
   Submitted by:   KATO Tsuguru <tkato432@yahoo.com>
   
   Revision  Changes    Path
   1.25      +41 -14    ports/x11/xnee/Makefile
   1.17      +3 -3      ports/x11/xnee/distinfo
   1.1       +16 -0     ports/x11/xnee/files/patch-cnee__src__cnee_printer.c (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
