Fri Jan 29 16:09:49 2010 UTC ()
DESTDIR support


(joerg)
diff -r1.18 -r1.19 pkgsrc/chat/xchat-systray-integration/Makefile
diff -r1.6 -r1.7 pkgsrc/chat/xchat-systray-integration/distinfo
diff -r1.3 -r1.4 pkgsrc/chat/xchat-systray-integration/patches/patch-aa
cvs diff -r1.18 -r1.19 pkgsrc/chat/xchat-systray-integration/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/chat/xchat-systray-integration/Attic/Makefile 2009/08/26 19:57:17 1.18
+++ pkgsrc/chat/xchat-systray-integration/Attic/Makefile 2010/01/29 16:09:49 1.19
@@ -1,22 +1,24 @@ @@ -1,22 +1,24 @@
1# $NetBSD: Makefile,v 1.18 2009/08/26 19:57:17 sno Exp $ 1# $NetBSD: Makefile,v 1.19 2010/01/29 16:09:49 joerg Exp $
2 2
3DISTNAME= xchat-systray-integration-2.4.5-src 3DISTNAME= xchat-systray-integration-2.4.5-src
4PKGNAME= ${DISTNAME:S/-src//} 4PKGNAME= ${DISTNAME:S/-src//}
5PKGREVISION= 5 5PKGREVISION= 5
6CATEGORIES= chat 6CATEGORIES= chat
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xchat2-plugins/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xchat2-plugins/}
8 8
9MAINTAINER= minskim@NetBSD.org 9MAINTAINER= minskim@NetBSD.org
10HOMEPAGE= http://www.patriziobassi.it/blight/index.php?act=Systray 10HOMEPAGE= http://www.patriziobassi.it/blight/index.php?act=Systray
11COMMENT= Systray icon plugin for XChat 11COMMENT= Systray icon plugin for XChat
12 12
 13PKG_DESTDIR_SUPPORT= user-destdir
 14
13DEPENDS+= xchat>=2.0:../../chat/xchat 15DEPENDS+= xchat>=2.0:../../chat/xchat
14 16
15WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 17WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
16USE_LIBTOOL= yes 18USE_LIBTOOL= yes
17USE_TOOLS+= gmake pkg-config 19USE_TOOLS+= gmake pkg-config
18 20
19MAKE_ENV+= prefix=${PREFIX:Q} SHLIBTOOL=${SHLIBTOOL:Q} 21MAKE_ENV+= prefix=${PREFIX:Q} SHLIBTOOL=${SHLIBTOOL:Q}
20 22
21.include "../../x11/gtk2/buildlink3.mk" 23.include "../../x11/gtk2/buildlink3.mk"
22.include "../../mk/bsd.pkg.mk" 24.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/chat/xchat-systray-integration/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/chat/xchat-systray-integration/Attic/distinfo 2006/07/06 22:04:03 1.6
+++ pkgsrc/chat/xchat-systray-integration/Attic/distinfo 2010/01/29 16:09:49 1.7
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: distinfo,v 1.6 2006/07/06 22:04:03 minskim Exp $ 1$NetBSD: distinfo,v 1.7 2010/01/29 16:09:49 joerg Exp $
2 2
3SHA1 (xchat-systray-integration-2.4.5-src.tar.gz) = d7bad0f60c1944ce385e5799eb08a45a081365ab 3SHA1 (xchat-systray-integration-2.4.5-src.tar.gz) = d7bad0f60c1944ce385e5799eb08a45a081365ab
4RMD160 (xchat-systray-integration-2.4.5-src.tar.gz) = 0d476ae52d491123b9da392eb3ee86322c2403ab 4RMD160 (xchat-systray-integration-2.4.5-src.tar.gz) = 0d476ae52d491123b9da392eb3ee86322c2403ab
5Size (xchat-systray-integration-2.4.5-src.tar.gz) = 57953 bytes 5Size (xchat-systray-integration-2.4.5-src.tar.gz) = 57953 bytes
6SHA1 (patch-aa) = 1afab689e88a6315201c3b1187dcdbbabc991ca8 6SHA1 (patch-aa) = f47cea4bd0fe7940813a5aa5c03e787320072161
7SHA1 (patch-ab) = c10c4125ea9d4f2555ec5b695746742577531487 7SHA1 (patch-ab) = c10c4125ea9d4f2555ec5b695746742577531487
8SHA1 (patch-ac) = f42ca3d00a9bcba15f2bd523cd54f3e606b4399f 8SHA1 (patch-ac) = f42ca3d00a9bcba15f2bd523cd54f3e606b4399f
9SHA1 (patch-ad) = 51f13e63894e2a5c391731262628dfa3ceed7a62 9SHA1 (patch-ad) = 51f13e63894e2a5c391731262628dfa3ceed7a62
10SHA1 (patch-ae) = fa82c5a19fc872638d0a97e1e5eb0b8465d3a1b6 10SHA1 (patch-ae) = fa82c5a19fc872638d0a97e1e5eb0b8465d3a1b6
11SHA1 (patch-af) = 762fd3d13c43a90eef992a3eda25dd44240b6581 11SHA1 (patch-af) = 762fd3d13c43a90eef992a3eda25dd44240b6581
12SHA1 (patch-ag) = 7acef11d2bb5554286bf92c629663f7b6ee0d0ce 12SHA1 (patch-ag) = 7acef11d2bb5554286bf92c629663f7b6ee0d0ce
13SHA1 (patch-ah) = 4abd6aa8fadbbf7ae36afe022d03b56eb14e4f74 13SHA1 (patch-ah) = 4abd6aa8fadbbf7ae36afe022d03b56eb14e4f74
14SHA1 (patch-ai) = 89916065bd4c1a659a2ca9d48ee486dc05ff9f12 14SHA1 (patch-ai) = 89916065bd4c1a659a2ca9d48ee486dc05ff9f12
15SHA1 (patch-aj) = 7ae731b9181a3b9d8e148929ae17ebfdc763a687 15SHA1 (patch-aj) = 7ae731b9181a3b9d8e148929ae17ebfdc763a687
16SHA1 (patch-ak) = e16d53b22e906983e85987bd87e90aa307b3158e 16SHA1 (patch-ak) = e16d53b22e906983e85987bd87e90aa307b3158e
17SHA1 (patch-al) = a97c5c6b7faa10619de5c657bb5cc3b78cc43be0 17SHA1 (patch-al) = a97c5c6b7faa10619de5c657bb5cc3b78cc43be0
18SHA1 (patch-am) = 595962817692c42b5f9e35d4f8571dd555390485 18SHA1 (patch-am) = 595962817692c42b5f9e35d4f8571dd555390485
19SHA1 (patch-an) = e3cb80f89d226ace7efd39f0fd6e48e9a2dadd1e 19SHA1 (patch-an) = e3cb80f89d226ace7efd39f0fd6e48e9a2dadd1e
cvs diff -r1.3 -r1.4 pkgsrc/chat/xchat-systray-integration/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/chat/xchat-systray-integration/patches/Attic/patch-aa 2006/07/06 22:04:03 1.3
+++ pkgsrc/chat/xchat-systray-integration/patches/Attic/patch-aa 2010/01/29 16:09:49 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-aa,v 1.3 2006/07/06 22:04:03 minskim Exp $ 1$NetBSD: patch-aa,v 1.4 2010/01/29 16:09:49 joerg Exp $
2 2
3--- Makefile.orig 2004-04-30 05:38:10.000000000 -0700 3--- Makefile.orig 2004-04-30 05:38:10.000000000 -0700
4+++ Makefile 4+++ Makefile
5@@ -1,15 +1,15 @@ 5@@ -1,15 +1,15 @@
6 #UNIX VARS 6 #UNIX VARS
7-CFLAGS = -Os -Wall 7-CFLAGS = -Os -Wall
8-GTKFLAGS =`pkg-config gtk+-2.0 --cflags` 8-GTKFLAGS =`pkg-config gtk+-2.0 --cflags`
9-LIBS = `pkg-config gtk+-2.0 --libs` 9-LIBS = `pkg-config gtk+-2.0 --libs`
10+CFLAGS += -Os 10+CFLAGS += -Os
11+GTKFLAGS =`${PKG_CONFIG} gtk+-2.0 --cflags` 11+GTKFLAGS =`${PKG_CONFIG} gtk+-2.0 --cflags`
12+LIBS = `${PKG_CONFIG} gtk+-2.0 --libs` 12+LIBS = `${PKG_CONFIG} gtk+-2.0 --libs`
13 install = cp 13 install = cp
14 mkdir = mkdir 14 mkdir = mkdir
@@ -76,21 +76,21 @@ $NetBSD: patch-aa,v 1.3 2006/07/06 22:04 @@ -76,21 +76,21 @@ $NetBSD: patch-aa,v 1.3 2006/07/06 22:04
76- $(CC) $(CFLAGS) $(LIBS) $(Objects) -shared -o $(plugin) 76- $(CC) $(CFLAGS) $(LIBS) $(Objects) -shared -o $(plugin)
77+src/traycoreengine.o: src/libs/traycoreengine.c 77+src/traycoreengine.o: src/libs/traycoreengine.c
78+ ${SHLIBTOOL} --mode=compile ${CC} $(CFLAGS) $(GTKFLAGS) -c src/libs/traycoreengine.c -o src/traycoreengine.o 78+ ${SHLIBTOOL} --mode=compile ${CC} $(CFLAGS) $(GTKFLAGS) -c src/libs/traycoreengine.c -o src/traycoreengine.o
79+ 79+
80+systray.la: $(Objects) 80+systray.la: $(Objects)
81+ ${SHLIBTOOL} --mode=link ${CC} $(LIBS) ${Objects:.o=.lo} -o ${plugin} -rpath ${prefix}/lib -avoid-version -module 81+ ${SHLIBTOOL} --mode=link ${CC} $(LIBS) ${Objects:.o=.lo} -o ${plugin} -rpath ${prefix}/lib -avoid-version -module
82  82
83 install: all 83 install: all
84- $(mkdir) -p $(plugindir) 84- $(mkdir) -p $(plugindir)
85- $(install) $(plugin) $(plugindir)/$(plugin) 85- $(install) $(plugin) $(plugindir)/$(plugin)
86- $(install) src/images/Win32Tray $(plugindir)/ -r -f 86- $(install) src/images/Win32Tray $(plugindir)/ -r -f
87- $(install) src/images/GTKTray $(plugindir)/ -r -f 87- $(install) src/images/GTKTray $(plugindir)/ -r -f
88- $(install) src/images/Menu $(plugindir)/ -r -f 88- $(install) src/images/Menu $(plugindir)/ -r -f
89+ ${BSD_INSTALL_LIB_DIR} $(plugindir) 89+ ${BSD_INSTALL_LIB_DIR} ${DESTDIR}$(plugindir)
90+ ${SHLIBTOOL} --mode=install ${BSD_INSTALL_DATA} $(plugin) $(plugindir) 90+ ${SHLIBTOOL} --mode=install ${BSD_INSTALL_DATA} $(plugin) ${DESTDIR}$(plugindir)
91+ for d in Win32Tray GTKTray Menu; do \ 91+ for d in Win32Tray GTKTray Menu; do \
92+ ${BSD_INSTALL_DATA_DIR} ${plugindir}/$${d}; \ 92+ ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${plugindir}/$${d}; \
93+ ${BSD_INSTALL_DATA} src/images/$${d}/* ${plugindir}/$${d}; done 93+ ${BSD_INSTALL_DATA} src/images/$${d}/* ${DESTDIR}${plugindir}/$${d}; done
94  94
95 win-install: 95 win-install:
96 @echo 'Copy "Systray.dll" and "images" directory where you want. Set images directory in the settings tab' 96 @echo 'Copy "Systray.dll" and "images" directory where you want. Set images directory in the settings tab'