1 files changed, 41 insertions, 14 deletions

diff --git a/x11/xnee/Makefile b/x11/xnee/Makefile
index bb939ee834e0..e26130a48ddb 100644
--- a/x11/xnee/Makefile
+++ b/x11/xnee/Makefile
@@ -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,41 +15,69 @@ DISTNAME=	Xnee-${PORTVERSION}
 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
+INFO=		cnee 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|: install-docDATA|:|g' ${WRKSRC}/cnee/src/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}/cnee/src && /usr/bin/makeinfo --no-split cnee.texi
+	cd ${WRKSRC}/doc && /usr/bin/makeinfo --no-split xnee.texi
 
 post-install:
+	${INSTALL_DATA} ${WRKSRC}/cnee/src/cnee.info ${PREFIX}/${INFO_PATH}
 	${INSTALL_DATA} ${WRKSRC}/doc/xnee.info ${PREFIX}/${INFO_PATH}
 
 .include <bsd.port.post.mk>