6 files changed, 26 insertions, 54 deletions

diff --git a/x11/xnee/Makefile b/x11/xnee/Makefile
index b1293721f15e..5d194b75b3b6 100644
--- a/x11/xnee/Makefile
+++ b/x11/xnee/Makefile
@@ -6,32 +6,37 @@
 #
 
 PORTNAME=	xnee
-PORTVERSION=	1.08
+PORTVERSION=	2.00
 CATEGORIES=	x11
-MASTER_SITES=	http://www.sandklef.com/xnee/tars/ \
-		${MASTER_SITE_GNU}
+MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	Xnee-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X events recorder and player
 
-BUILD_DEPENDS=	texi2html:${PORTSDIR}/textproc/texi2html
-
 USE_X_PREFIX=	yes
-USE_PERL5=	yes
+WANT_GNOME=	yes
+USE_GNOME=	gnomehack gnometarget
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
-MAN1=		xnee.1
-INFO=		xnee xnee_develop
+INFO=		xnee
+PLIST_FILES=	bin/cnee lib/libxnee.a
+
+.include <bsd.port.pre.mk>
+
+.if ${HAVE_GNOME:Mgtk20}!=""
+USE_GNOME+=	gtk20
+PLIST_FILES+=	bin/gnee
+PKGNAMESUFFIX=	-gtk
+.else
+CONFIGURE_ARGS+=	--disable-gui
+.endif
 
-post-patch:
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${PERL} -pi -e \
-		's| -g | \@CFLAGS\@ |g ; \
-		 s|-lpthread|${PTHREAD_LIBS:S/"//g}|g ; \
-		 s|-ldl||g'
+post-build:
+	cd ${WRKSRC}/doc && makeinfo --no-split xnee.texi
 
-post-install:
-	${INSTALL_MAN} ${WRKSRC}/xnee/doc/xnee.1 ${MANPREFIX}/man/man1
+pre-install:
+	${INSTALL_DATA} ${WRKSRC}/doc/xnee.info ${PREFIX}/${INFO_PATH}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11/xnee/distinfo b/x11/xnee/distinfo
index 568dace0ff30..bac363836790 100644
--- a/x11/xnee/distinfo
+++ b/x11/xnee/distinfo
@@ -1,2 +1,2 @@
-MD5 (xnee-1.08.tar.gz) = cef82f631d06d6091ecb90436efa0e69
-SIZE (xnee-1.08.tar.gz) = 378650
+MD5 (Xnee-2.00.tar.gz) = 88ebeb440b8a0933361602192e2b301d
+SIZE (Xnee-2.00.tar.gz) = 579544
diff --git a/x11/xnee/files/patch-doc::xnee.texi b/x11/xnee/files/patch-doc::xnee.texi
index 8d5d2cbfbabc..aa941369e5dd 100644
--- a/x11/xnee/files/patch-doc::xnee.texi
+++ b/x11/xnee/files/patch-doc::xnee.texi
@@ -1,5 +1,5 @@
---- xnee/doc/xnee.texi.orig	Fri Mar  7 06:03:53 2003
-+++ xnee/doc/xnee.texi	Fri Apr 18 17:05:07 2003
+--- doc/xnee.texi.orig	Wed May 11 05:04:02 2005
++++ doc/xnee.texi	Mon Jul 25 22:43:28 2005
 @@ -12,7 +12,7 @@
  
  @dircategory Miscellaneous
diff --git a/x11/xnee/files/patch-doc::xnee_develop.texi b/x11/xnee/files/patch-doc::xnee_develop.texi
deleted file mode 100644
index 29b48a5135b7..000000000000
--- a/x11/xnee/files/patch-doc::xnee_develop.texi
+++ /dev/null
@@ -1,11 +0,0 @@
---- libxnee/doc/xnee_develop.texi.orig	Fri Mar  7 06:03:53 2003
-+++ libxnee/doc/xnee_develop.texi	Fri Apr 18 17:06:12 2003
-@@ -10,7 +10,7 @@
- 
- @dircategory Miscellaneous
- @direntry
--* : (Xnee).        Xnee's Not Event Emulator.
-+* Xnee_develop: (xnee_develop).	Xnee Development Guide.
- @end direntry
- 
- @c Put everything in one index (arbitrarily chosen to be the concept index).
diff --git a/x11/xnee/files/patch-libxnee::lib::xnee.c b/x11/xnee/files/patch-libxnee::lib::xnee.c
deleted file mode 100644
index 4ecbffd8ca74..000000000000
--- a/x11/xnee/files/patch-libxnee::lib::xnee.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- libxnee/src/xnee.c.orig	Sun Sep 28 07:58:48 2003
-+++ libxnee/src/xnee.c	Tue Nov  4 10:36:43 2003
-@@ -572,7 +572,7 @@
- xnee_new_xnee_data()
- {
- 
--  xnee_data* xd  = (xnee_data*) malloc (sizeof (xnee_data));
-+  xnee_data* xd  = (xnee_data*) calloc (1, sizeof (xnee_data));
-   if (xd==NULL)
-     {
-       xnee_print_error ("Could not allocate memory ........\n");
-@@ -908,7 +908,7 @@
-   int ret=0;
-   char lib_name[100];
- 
--  xnee_verbose ((xd, "Using plugin file: %s\n", pl_name));
-+/*  xnee_verbose ((xd, "Using plugin file: %s\n", pl_name)); */
-   strcpy (lib_name, "lib");
-   strcat (lib_name, pl_name);
-   
diff --git a/x11/xnee/pkg-plist b/x11/xnee/pkg-plist
deleted file mode 100644
index afa2eb95a28e..000000000000
--- a/x11/xnee/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-bin/xnee
-lib/libxnee.a