On Wed, Jan 12, 2011 at 03:11:57AM +0000, Mikolaj Kucharski wrote:
> Okay?
>
> # pkg_add -ui
> libpurple-2.7.5p0->libpurple-2.7.9 forward dependencies:
> | Dependency of pidgin-2.7.5-gtkspell on libpurple-2.7.5 doesn't match
> Merging pidgin-2.7.5-gtkspell->pidgin-2.7.9-gtkspell (ok)
> Collision in
> libpurple-2.7.5p0+pidgin-2.7.5-gtkspell->libpurple-2.7.9+pidgin-2.7.9-gtkspell:
> the following files already exist
> /usr/local/share/pixmaps/pidgin/protocols/16/facebook.png
> (pidgin-facebookchat-1.68)
> /usr/local/share/pixmaps/pidgin/protocols/22/facebook.png
> (pidgin-facebookchat-1.68)
> /usr/local/share/pixmaps/pidgin/protocols/48/facebook.png
> (pidgin-facebookchat-1.68)
> Couldn't find updates for hamster-applet-2.32.0p0, libpurple-2.7.5p0,
> pidgin-2.7.5-gtkspell
>
>
>
> I don't have patch for pidging to add @conflict pidgin-facebookchat-<1.68p0
> to PLIST-main (and bump rev) as my checkout is not up to date.
Brad, Steven, ok?
Index: pidgin/Makefile
===================================================================
RCS file: /cvs/ports/net/pidgin/Makefile,v
retrieving revision 1.84
diff -p -u -r1.84 Makefile
--- pidgin/Makefile 28 Dec 2010 18:18:02 -0000 1.84
+++ pidgin/Makefile 13 Jan 2011 08:18:12 -0000
@@ -15,6 +15,7 @@ PKGNAME-libpurple= libpurple-${VERSION}
FULLPKGNAME$i= ${PKGNAME$i}${FLAVOR_EXT:S/-gtkspell//}
FULLPKGPATH$i= ${PKGPATH},$i${FLAVOR_EXT:S/-gtkspell//:S/-/,/g}
.endfor
+REVISION-main= 0
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pidgin/}
Index: pidgin/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/net/pidgin/pkg/PLIST-main,v
retrieving revision 1.10
diff -p -u -r1.10 PLIST-main
--- pidgin/pkg/PLIST-main 23 Dec 2010 23:25:25 -0000 1.10
+++ pidgin/pkg/PLIST-main 13 Jan 2011 08:18:12 -0000
@@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST-main,v 1.10 2010/12/23 23:25:25 steven Exp $
@conflict gaim-*
+@conflict pidgin-facebookchat-<1.68p0
@pkgpath net/pidgin
@bin bin/pidgin
include/pidgin/
Index: pidgin-facebookchat/Makefile
===================================================================
RCS file: /cvs/ports/net/pidgin-facebookchat/Makefile,v
retrieving revision 1.12
diff -p -u -r1.12 Makefile
--- pidgin-facebookchat/Makefile 19 Nov 2010 22:31:37 -0000 1.12
+++ pidgin-facebookchat/Makefile 13 Jan 2011 08:18:12 -0000
@@ -7,6 +7,7 @@ COMMENT = Facebook plugin for Pidgin
V = 1.68
DISTNAME = pidgin-facebookchat-source-${V}
PKGNAME = pidgin-facebookchat-${V}
+REVISION = 0
CATEGORIES = net
HOMEPAGE = http://code.google.com/p/pidgin-facebookchat/
@@ -37,10 +38,5 @@ NO_REGRESS = Yes
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/lib/purple-2/
${INSTALL_DATA} ${WRKBUILD}/libfacebook.so ${PREFIX}/lib/purple-2/
-.for i in 16 22 48
- ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps/pidgin/protocols/${i}/
- ${INSTALL_DATA} ${WRKSRC}/facebook${i}.png \
- ${PREFIX}/share/pixmaps/pidgin/protocols/${i}/facebook.png
-.endfor
.include <bsd.port.mk>
Index: pidgin-facebookchat/pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/pidgin-facebookchat/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -p -u -r1.1.1.1 PLIST
--- pidgin-facebookchat/pkg/PLIST 5 Jan 2009 21:18:24 -0000 1.1.1.1
+++ pidgin-facebookchat/pkg/PLIST 13 Jan 2011 08:18:12 -0000
@@ -1,5 +1,2 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2009/01/05 21:18:24 steven Exp $
lib/purple-2/libfacebook.so
-share/pixmaps/pidgin/protocols/16/facebook.png
-share/pixmaps/pidgin/protocols/22/facebook.png
-share/pixmaps/pidgin/protocols/48/facebook.png
--
Cheers,
Jasper
"Capable, generous men do not create victims, they nurture them."
