- Update to 2.4.5

4 files changed, 65 insertions, 7 deletions

diff --git a/irc/xchat-systray-plugin/Makefile b/irc/xchat-systray-plugin/Makefile
index 1c7291594417..783db7c8a6cf 100644
--- a/irc/xchat-systray-plugin/Makefile
+++ b/irc/xchat-systray-plugin/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xchat-systray-plugin
-PORTVERSION=	2.4.0
-PORTREVISION=	2
+PORTVERSION=	2.4.5
 CATEGORIES=	irc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xchat2-plugins
@@ -18,7 +17,6 @@ COMMENT=	Systray icon plugin for X-Chat
 
 RUN_DEPENDS=	xchat:${PORTSDIR}/irc/xchat2
 
-PLIST_FILES=	lib/xchat/plugins/systray.so
 WRKSRC=		${WRKDIR}/xchat-systray-integration-${PORTVERSION}
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
@@ -26,9 +24,13 @@ USE_GNOME=	gtk20
 USE_REINPLACE=	yes
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-O2|${CFLAGS} -fPIC|' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|-Os|${CFLAGS} -fPIC|' ${WRKSRC}/Makefile
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/systray.so ${X11BASE}/lib/xchat/plugins/
+	${INSTALL_PROGRAM} ${WRKSRC}/systray.so ${PREFIX}/lib/xchat/plugins/
+	${MKDIR} ${PREFIX}/lib/xchat/plugins/GTKTray
+	${INSTALL_DATA} ${WRKSRC}/src/images/GTKTray/* ${PREFIX}/lib/xchat/plugins/GTKTray
+	${MKDIR} ${PREFIX}/lib/xchat/plugins/Menu
+	${INSTALL_DATA} ${WRKSRC}/src/images/Menu/* ${PREFIX}/lib/xchat/plugins/Menu
 
 .include <bsd.port.mk>
diff --git a/irc/xchat-systray-plugin/distinfo b/irc/xchat-systray-plugin/distinfo
index 0237ddc93940..c2f299ce4c71 100644
--- a/irc/xchat-systray-plugin/distinfo
+++ b/irc/xchat-systray-plugin/distinfo
@@ -1,2 +1,2 @@
-MD5 (xchat-systray-integration-2.4.0-src.tar.gz) = c6e7e936b643ef5570dce91d40478bcf
-SIZE (xchat-systray-integration-2.4.0-src.tar.gz) = 42250
+MD5 (xchat-systray-integration-2.4.5-src.tar.gz) = f7068053ff7cc63d5bf2fd8cfabe0c82
+SIZE (xchat-systray-integration-2.4.5-src.tar.gz) = 57953
diff --git a/irc/xchat-systray-plugin/files/patch-src-systray.c b/irc/xchat-systray-plugin/files/patch-src-systray.c
new file mode 100644
index 000000000000..2a21d35ce5b9
--- /dev/null
+++ b/irc/xchat-systray-plugin/files/patch-src-systray.c
@@ -0,0 +1,33 @@
+--- src/systray.c.orig	Fri Apr 30 14:38:10 2004
++++ src/systray.c	Sun May  2 01:02:59 2004
+@@ -117,16 +117,18 @@
+ 	edit=TRUE;
+ 	go_change=TRUE;
+ 	go_identify=TRUE;
+-	strcpy(imagepath,xchat_get_info(ph, "xchatdir"));
++	strcpy(imagepath,"/usr/X11R6/lib/xchat/plugins");
+ 
+ }
+ // events handling
+  void tray_init_xchat(void)
+ {
+-	initialize_shared_vars();
+-	//show warning if version is too old
+ 	const char *str;
+ 	int i;
++
++	initialize_shared_vars();
++
++	//show warning if version is too old
+ 	if (xchat_get_prefs (ph, "away_size_max", &str, &i) == 0)
+ 	version_warning();
+ 
+@@ -191,7 +193,7 @@
+ 	if (filename && type) 
+ 	{
+ 		if (imagepath) sprintf(temp,"%s/%s/%s", imagepath ,type,filename);
+-		else sprintf(temp,"%s/%s/%s", xchat_get_info(ph, "xchatdir"),type,filename);
++		else sprintf(temp,"%s/%s/%s", "/usr/X11R6/lib/xchat/plugins",type,filename);
+ #ifdef _WIN32_			
+ 		tempbuffer= ((HICON)LoadImage( tray_inst, temp, IMAGE_ICON, 16, 16, LR_LOADFROMFILE ));
+ #else	
diff --git a/irc/xchat-systray-plugin/pkg-plist b/irc/xchat-systray-plugin/pkg-plist
new file mode 100644
index 000000000000..25de698b2e87
--- /dev/null
+++ b/irc/xchat-systray-plugin/pkg-plist
@@ -0,0 +1,23 @@
+lib/xchat/plugins/systray.so
+lib/xchat/plugins/Menu/help.png
+lib/xchat/plugins/Menu/browser.png
+lib/xchat/plugins/Menu/email.png
+lib/xchat/plugins/Menu/backaway.png
+lib/xchat/plugins/Menu/player.png
+lib/xchat/plugins/Menu/quit.png
+lib/xchat/plugins/Menu/goaway.png
+lib/xchat/plugins/Menu/stop.png
+lib/xchat/plugins/Menu/settings.png
+lib/xchat/plugins/Menu/max.png
+lib/xchat/plugins/Menu/min.png
+lib/xchat/plugins/GTKTray/xchatblue.png
+lib/xchat/plugins/GTKTray/xchat.png
+lib/xchat/plugins/GTKTray/goaway.png
+lib/xchat/plugins/GTKTray/xchatred.png
+lib/xchat/plugins/GTKTray/dccalert.png
+lib/xchat/plugins/GTKTray/disconnected.png
+lib/xchat/plugins/GTKTray/invited.png
+lib/xchat/plugins/GTKTray/notifyin.png
+lib/xchat/plugins/GTKTray/notifyout.png
+@dirrm lib/xchat/plugins/Menu
+@dirrm lib/xchat/plugins/GTKTray