diff options
author | minskim <minskim@pkgsrc.org> | 2006-07-06 21:26:23 +0000 |
---|---|---|
committer | minskim <minskim@pkgsrc.org> | 2006-07-06 21:26:23 +0000 |
commit | d37a412ed11974d3a597ce5f59e40c4b161376c7 (patch) | |
tree | 97041fd7e6f42ed63c2fa8bff74e8a7548d5ed15 /chat/xchat-systray-integration | |
parent | cf56f31e09021afe6a6f964e8a150cba876881f8 (diff) | |
download | pkgsrc-d37a412ed11974d3a597ce5f59e40c4b161376c7.tar.gz |
Libtoolize to build on more platforms. Bump PKGREVISION.
Diffstat (limited to 'chat/xchat-systray-integration')
-rw-r--r-- | chat/xchat-systray-integration/Makefile | 10 | ||||
-rw-r--r-- | chat/xchat-systray-integration/PLIST | 4 | ||||
-rw-r--r-- | chat/xchat-systray-integration/distinfo | 4 | ||||
-rw-r--r-- | chat/xchat-systray-integration/patches/patch-aa | 61 |
4 files changed, 64 insertions, 15 deletions
diff --git a/chat/xchat-systray-integration/Makefile b/chat/xchat-systray-integration/Makefile index 4fa19984051..0d487ba28de 100644 --- a/chat/xchat-systray-integration/Makefile +++ b/chat/xchat-systray-integration/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.14 2006/04/17 13:46:18 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2006/07/06 21:26:23 minskim Exp $ DISTNAME= xchat-systray-integration-2.4.5-src PKGNAME= ${DISTNAME:S/-src//} -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= chat MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xchat2-plugins/} @@ -13,12 +13,10 @@ COMMENT= Systray icon plugin for X-Chat DEPENDS+= xchat>=2.0:../../chat/xchat WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} +USE_LIBTOOL= yes USE_TOOLS+= gmake pkg-config -# We build a shared object, so ensure that the object files are PIC. -CFLAGS+= -fPIC - -MAKE_ENV+= prefix=${PREFIX:Q} +MAKE_ENV+= prefix=${PREFIX:Q} SHLIBTOOL=${SHLIBTOOL:Q} .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/xchat-systray-integration/PLIST b/chat/xchat-systray-integration/PLIST index d17b9e304e7..f44621e8757 100644 --- a/chat/xchat-systray-integration/PLIST +++ b/chat/xchat-systray-integration/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2004/06/07 06:12:16 minskim Exp $ +@comment $NetBSD: PLIST,v 1.3 2006/07/06 21:26:23 minskim Exp $ lib/xchat/plugins/GTKTray/dccalert.png lib/xchat/plugins/GTKTray/disconnected.png lib/xchat/plugins/GTKTray/goaway.png @@ -28,7 +28,7 @@ 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 +lib/xchat/plugins/systray.la @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 8f048dd1622..af58dc6c777 100644 --- a/chat/xchat-systray-integration/distinfo +++ b/chat/xchat-systray-integration/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.4 2005/02/23 15:59:14 agc Exp $ +$NetBSD: distinfo,v 1.5 2006/07/06 21:26:23 minskim Exp $ SHA1 (xchat-systray-integration-2.4.5-src.tar.gz) = d7bad0f60c1944ce385e5799eb08a45a081365ab RMD160 (xchat-systray-integration-2.4.5-src.tar.gz) = 0d476ae52d491123b9da392eb3ee86322c2403ab Size (xchat-systray-integration-2.4.5-src.tar.gz) = 57953 bytes -SHA1 (patch-aa) = bbe8568fa41a7a4b3f6929a3a58251ab3e133d72 +SHA1 (patch-aa) = 12cdc25278a2d2d4b67432a1df6b5f5b1a4a7790 SHA1 (patch-ab) = c10c4125ea9d4f2555ec5b695746742577531487 diff --git a/chat/xchat-systray-integration/patches/patch-aa b/chat/xchat-systray-integration/patches/patch-aa index 09f05716cdd..f41ef15422b 100644 --- a/chat/xchat-systray-integration/patches/patch-aa +++ b/chat/xchat-systray-integration/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.1 2004/06/07 06:12:16 minskim Exp $ +$NetBSD: patch-aa,v 1.2 2006/07/06 21:26:23 minskim Exp $ ---- Makefile.orig 2004-04-30 07:38:10.000000000 -0500 +--- Makefile.orig 2004-04-30 12:38:10.000000000 +0000 +++ Makefile @@ -1,10 +1,10 @@ #UNIX VARS @@ -17,8 +17,59 @@ $NetBSD: patch-aa,v 1.1 2004/06/07 06:12:16 minskim Exp $ ifndef prefix prefix=/usr/ endif -@@ -94,11 +94,11 @@ systray.so: $(Objects) - $(CC) $(CFLAGS) $(LIBS) $(Objects) -shared -o $(plugin) +@@ -27,7 +27,7 @@ WINCFLAGS = $(WINGTKFLAGS) -DBUILDING_DL + WINObjects = src/away_system.o src/data_manager.o src/events.o src/menu.o src/settings.o src/warnings.o src/help.o src/systray.o + + ifndef windows +- plugin = systray.so ++ plugin = systray.la + else + plugin=Systray.dll + plugindir=C:/Program Files/X-Chat2/plugins/ +@@ -63,42 +63,42 @@ src/systray.o: src/systray.c + else + + src/eggtrayicon.o: src/libs/Unix/eggtrayicon.c +- $(CC) $(CFLAGS) $(GTKFLAGS) -c src/libs/Unix/eggtrayicon.c -o src/eggtrayicon.o ++ ${SHLIBTOOL} --mode=compile ${CC} $(CFLAGS) $(GTKFLAGS) -c src/libs/Unix/eggtrayicon.c -o src/eggtrayicon.o + + src/away_system.o: src/away_system.c +- $(CC) $(CFLAGS) $(GTKFLAGS) -c src/away_system.c -o src/away_system.o ++ ${SHLIBTOOL} --mode=compile ${CC} $(CFLAGS) $(GTKFLAGS) -c src/away_system.c -o src/away_system.o + + src/data_manager.o: src/data_manager.c +- $(CC) $(CFLAGS) $(GTKFLAGS) -c src/data_manager.c -o src/data_manager.o ++ ${SHLIBTOOL} --mode=compile ${CC} $(CFLAGS) $(GTKFLAGS) -c src/data_manager.c -o src/data_manager.o + + src/events.o: src/events.c +- $(CC) $(CFLAGS) $(GTKFLAGS) -c src/events.c -o src/events.o ++ ${SHLIBTOOL} --mode=compile ${CC} $(CFLAGS) $(GTKFLAGS) -c src/events.c -o src/events.o + + src/menu.o: src/menu.c +- $(CC) $(CFLAGS) $(GTKFLAGS) -c src/menu.c -o src/menu.o ++ ${SHLIBTOOL} --mode=compile ${CC} $(CFLAGS) $(GTKFLAGS) -c src/menu.c -o src/menu.o + + src/help.o: src/help.c +- $(CC) $(CFLAGS) $(GTKFLAGS) -c src/help.c -o src/help.o ++ ${SHLIBTOOL} --mode=compile ${CC} $(CFLAGS) $(GTKFLAGS) -c src/help.c -o src/help.o + + src/settings.o: src/settings.c +- $(CC) $(CFLAGS) $(GTKFLAGS) -c src/settings.c -o src/settings.o ++ ${SHLIBTOOL} --mode=compile ${CC} $(CFLAGS) $(GTKFLAGS) -c src/settings.c -o src/settings.o + + src/warnings.o: src/warnings.c +- $(CC) $(CFLAGS) $(GTKFLAGS) -c src/warnings.c -o src/warnings.o ++ ${SHLIBTOOL} --mode=compile ${CC} $(CFLAGS) $(GTKFLAGS) -c src/warnings.c -o src/warnings.o + + src/systray.o: src/systray.c +- $(CC) $(CFLAGS) $(GTKFLAGS) -c src/systray.c -o src/systray.o ++ ${SHLIBTOOL} --mode=compile ${CC} $(CFLAGS) $(GTKFLAGS) -c src/systray.c -o src/systray.o + endif + +-systray.so: $(Objects) +- $(CC) $(CFLAGS) $(LIBS) $(Objects) -shared -o $(plugin) ++systray.la: $(Objects) ++ ${SHLIBTOOL} --mode=link ${CC} $(LIBS) ${Objects:.o=.lo} -o ${plugin} -rpath ${prefix}/lib -avoid-version -module install: all - $(mkdir) -p $(plugindir) @@ -27,7 +78,7 @@ $NetBSD: patch-aa,v 1.1 2004/06/07 06:12:16 minskim Exp $ - $(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) ++ ${SHLIBTOOL} --mode=install ${BSD_INSTALL_DATA} $(plugin) $(plugindir) + for d in Win32Tray GTKTray Menu; do \ + ${BSD_INSTALL_DATA_DIR} ${plugindir}/$${d}; \ + ${BSD_INSTALL_DATA} src/images/$${d}/* ${plugindir}/$${d}; done |