6 files changed, 88 insertions, 16 deletions
diff --git a/chat/xchat-systray-integration/MESSAGE b/chat/xchat-systray-integration/MESSAGE
new file mode 100644
index 00000000000..06763dd7f96
--- /dev/null
+++ b/chat/xchat-systray-integration/MESSAGE
@@ -0,0 +1,10 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2004/06/07 06:12:16 minskim Exp $
+
+You need to set the path to icons as follows:
+
+1. Right-click on the empty icon and select "SysTray Settings"
+2. Change "Select icons path" to "${PREFIX}/lib/xchat/plugins"
+3. Press "Apply" and close the window.
+
+===========================================================================
diff --git a/chat/xchat-systray-integration/Makefile b/chat/xchat-systray-integration/Makefile
index 273195b40ff..ef5f5c4ac78 100644
--- a/chat/xchat-systray-integration/Makefile
+++ b/chat/xchat-systray-integration/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2004/03/27 21:32:41 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2004/06/07 06:12:16 minskim Exp $
 
-DISTNAME=	xchat-systray-integration-2.4.0-src
+DISTNAME=	xchat-systray-integration-2.4.5-src
 PKGNAME=	${DISTNAME:S/-src//}
-PKGREVISION=	1
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xchat2-plugins/}
 
@@ -16,14 +15,7 @@ WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 USE_BUILDLINK3=	yes
 USE_GNU_TOOLS+=	make
 
-SUBST_CLASSES+=		cflags
-SUBST_MESSAGE.cflags=	"Fixing CFLAGS."
-SUBST_STAGE.cflags=	post-patch
-SUBST_FILES.cflags=	Makefile
-SUBST_SED.cflags=	-e 's|CFLAGS = -O2 -Wall|CFLAGS = ${CFLAGS}|g'
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/systray.so ${LOCALBASE}/lib/xchat/plugins/
+MAKE_ENV+=	prefix=${PREFIX}
 
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/chat/xchat-systray-integration/PLIST b/chat/xchat-systray-integration/PLIST
index a4a29243116..d17b9e304e7 100644
--- a/chat/xchat-systray-integration/PLIST
+++ b/chat/xchat-systray-integration/PLIST
@@ -1,2 +1,34 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/02/13 06:32:18 minskim Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/06/07 06:12:16 minskim Exp $
+lib/xchat/plugins/GTKTray/dccalert.png
+lib/xchat/plugins/GTKTray/disconnected.png
+lib/xchat/plugins/GTKTray/goaway.png
+lib/xchat/plugins/GTKTray/invited.png
+lib/xchat/plugins/GTKTray/notifyin.png
+lib/xchat/plugins/GTKTray/notifyout.png
+lib/xchat/plugins/GTKTray/xchat.png
+lib/xchat/plugins/GTKTray/xchatblue.png
+lib/xchat/plugins/GTKTray/xchatred.png
+lib/xchat/plugins/Menu/backaway.png
+lib/xchat/plugins/Menu/browser.png
+lib/xchat/plugins/Menu/email.png
+lib/xchat/plugins/Menu/goaway.png
+lib/xchat/plugins/Menu/help.png
+lib/xchat/plugins/Menu/max.png
+lib/xchat/plugins/Menu/min.png
+lib/xchat/plugins/Menu/player.png
+lib/xchat/plugins/Menu/quit.png
+lib/xchat/plugins/Menu/settings.png
+lib/xchat/plugins/Menu/stop.png
+lib/xchat/plugins/Win32Tray/dccalert.ico
+lib/xchat/plugins/Win32Tray/disconnected.ico
+lib/xchat/plugins/Win32Tray/goaway.ico
+lib/xchat/plugins/Win32Tray/invited.ico
+lib/xchat/plugins/Win32Tray/notifyin.ico
+lib/xchat/plugins/Win32Tray/notifyout.ico
+lib/xchat/plugins/Win32Tray/xchat.ico
+lib/xchat/plugins/Win32Tray/xchatblue.ico
+lib/xchat/plugins/Win32Tray/xchatred.ico
 lib/xchat/plugins/systray.so
+@dirrm lib/xchat/plugins/Win32Tray
+@dirrm lib/xchat/plugins/Menu
+@dirrm lib/xchat/plugins/GTKTray
diff --git a/chat/xchat-systray-integration/distinfo b/chat/xchat-systray-integration/distinfo
index b15adcb7ba7..9b4d2b8d0a5 100644
--- a/chat/xchat-systray-integration/distinfo
+++ b/chat/xchat-systray-integration/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/02/13 06:32:18 minskim Exp $
+$NetBSD: distinfo,v 1.2 2004/06/07 06:12:16 minskim Exp $
 
-SHA1 (xchat-systray-integration-2.4.0-src.tar.gz) = fd7326ca53e81c142b04ebd279b94e2eaa10c3b6
-Size (xchat-systray-integration-2.4.0-src.tar.gz) = 42250 bytes
+SHA1 (xchat-systray-integration-2.4.5-src.tar.gz) = d7bad0f60c1944ce385e5799eb08a45a081365ab
+Size (xchat-systray-integration-2.4.5-src.tar.gz) = 57953 bytes
+SHA1 (patch-aa) = bbe8568fa41a7a4b3f6929a3a58251ab3e133d72
diff --git a/chat/xchat-systray-integration/patches/patch-aa b/chat/xchat-systray-integration/patches/patch-aa
new file mode 100644
index 00000000000..09f05716cdd
--- /dev/null
+++ b/chat/xchat-systray-integration/patches/patch-aa
@@ -0,0 +1,36 @@
+$NetBSD: patch-aa,v 1.1 2004/06/07 06:12:16 minskim Exp $
+
+--- Makefile.orig	2004-04-30 07:38:10.000000000 -0500
++++ Makefile
+@@ -1,10 +1,10 @@
+ #UNIX VARS
+-CFLAGS = -Os -Wall
+-GTKFLAGS =`pkg-config gtk+-2.0 --cflags`
+-LIBS = `pkg-config gtk+-2.0 --libs`
++CFLAGS += -Os
++GTKFLAGS =`${PKG_CONFIG} gtk+-2.0 --cflags`
++LIBS = `${PKG_CONFIG} gtk+-2.0 --libs`
+ install = cp
+ mkdir = mkdir
+-CC = gcc
++#CC = gcc
+ ifndef prefix
+     prefix=/usr/
+ endif
+@@ -94,11 +94,11 @@ systray.so: $(Objects)
+ 	$(CC) $(CFLAGS) $(LIBS) $(Objects) -shared -o $(plugin)
+ 
+ install: all
+-	$(mkdir) -p $(plugindir)
+-	$(install) $(plugin) $(plugindir)/$(plugin)
+-	$(install) src/images/Win32Tray $(plugindir)/ -r -f
+-	$(install) src/images/GTKTray $(plugindir)/ -r -f
+-	$(install) src/images/Menu $(plugindir)/ -r -f
++	${BSD_INSTALL_LIB_DIR} $(plugindir)
++	${BSD_INSTALL_LIB} $(plugin) $(plugindir)/$(plugin)
++	for d in Win32Tray GTKTray Menu; do \
++		${BSD_INSTALL_DATA_DIR} ${plugindir}/$${d}; \
++		${BSD_INSTALL_DATA} src/images/$${d}/* ${plugindir}/$${d}; done
+ 	
+ win-install:
+ 	@echo 'Copy "Systray.dll" and "images" directory where you want. Set images directory in the settings tab'
diff --git a/doc/CHANGES b/doc/CHANGES
index 49c779b9cb3..06a572236fc 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.6178 2004/06/07 05:56:00 minskim Exp $
+$NetBSD: CHANGES,v 1.6179 2004/06/07 06:12:16 minskim Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -2838,3 +2838,4 @@ Changes to the packages collection and infrastructure in 2004:
 	Updated bzflag to 1.10.6 [snj 2004-06-07]
 	Updated grepmail to 5.23 [snj 2004-06-07]
 	Updated xchat2 to 2.0.9 [minskim 2004-06-07]
+	Updated xchat-systray-integration to 2.4.5 [minskim 2004-06-07]