diff -Nru gajim.orig/Makefile gajim/Makefile --- gajim.orig/Makefile 2007-10-03 10:33:43.000000000 +0400 +++ gajim/Makefile 2007-10-01 21:43:45.321101000 +0400 @@ -6,8 +6,7 @@ # PORTNAME= gajim -PORTVERSION= 0.11.1 -PORTREVISION= 2 +PORTVERSION= 0.11.2 CATEGORIES= net-im MASTER_SITES= http://www.gajim.org/downloads/ \ http://ports.internal.vlink.ru/distfiles/ @@ -25,6 +24,7 @@ USE_PYTHON= 2.4+ USE_XLIB= yes +CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I ${X11BASE}/include" PYTHON=${PYTHON_CMD} .if !defined(WITHOUT_NLS) @@ -37,7 +37,7 @@ MAN1= gajim.1 gajim-remote.1 -EMOTICONS= animated static +EMOTICONS= animated static static-big ICONSETS= crystal dcraven gnome goojim gossip gota jabberbulb nuvola \ simplebulb stellar sun transports @@ -53,26 +53,18 @@ post-install: ${MKDIR} ${DATADIR}/data/emoticons (cd ${WRKSRC}/data/emoticons && \ - ${CP} -R ${EMOTICONS} ${DATADIR}/data/emoticons) - - ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}/data/emoticons - ${FIND} ${DATADIR}/data/emoticons -type d -print0 | \ - ${XARGS} -0 ${CHMOD} 755 - ${FIND} ${DATADIR}/data/emoticons -type f -print0 | \ - ${XARGS} -0 ${CHMOD} ${SHAREMODE} + ${COPYTREE_SHARE} "${EMOTICONS}" ${DATADIR}/data/emoticons) ${MKDIR} ${DATADIR}/data/iconsets (cd ${WRKSRC}/data/iconsets && \ - ${CP} -R ${ICONSETS} ${DATADIR}/data/iconsets) - - ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}/data/iconsets - ${FIND} ${DATADIR}/data/iconsets -type d -print0 | \ - ${XARGS} -0 ${CHMOD} 755 - ${FIND} ${DATADIR}/data/iconsets -type f -print0 | \ - ${XARGS} -0 ${CHMOD} ${SHAREMODE} + ${COPYTREE_SHARE} "${ICONSETS}" ${DATADIR}/data/iconsets) .include +.if ${OSVERSION} < 500000 +BROKEN= doesn\'t install +.endif + .if ${PYTHON_REL} >= 250 RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 .else diff -Nru gajim.orig/distinfo gajim/distinfo --- gajim.orig/distinfo 2007-10-03 10:33:43.000000000 +0400 +++ gajim/distinfo 2007-10-01 21:43:45.321101000 +0400 @@ -1,3 +1,3 @@ -MD5 (gajim-0.11.1.tar.bz2) = cc587e7617f53ae8d5e0b30d7324e89c -SHA256 (gajim-0.11.1.tar.bz2) = f42e6cfb7ab98224846a7e9ee97ca0aba2ea4a7943a8315a67ccf1127c2aa132 -SIZE (gajim-0.11.1.tar.bz2) = 2785799 +MD5 (gajim-0.11.2.tar.bz2) = 8cb0cd5871191a0e8dd43fcef47056dc +SHA256 (gajim-0.11.2.tar.bz2) = a6811b7f1c35b1589771fe128ff3784fec4c08a8e4c4352370f161ab07814aa3 +SIZE (gajim-0.11.2.tar.bz2) = 2908570 diff -Nru gajim.orig/pkg-plist gajim/pkg-plist --- gajim.orig/pkg-plist 2007-10-03 10:33:43.000000000 +0400 +++ gajim/pkg-plist 2007-10-01 21:43:45.321101000 +0400 @@ -1,4 +1,5 @@ bin/gajim +bin/gajim-remote lib/gajim/gtkspell.la lib/gajim/gtkspell.so lib/gajim/idle.la @@ -16,17 +17,18 @@ %%NLS%%share/locale/es/LC_MESSAGES/gajim.mo %%NLS%%share/locale/eu/LC_MESSAGES/gajim.mo %%NLS%%share/locale/fr/LC_MESSAGES/gajim.mo +%%NLS%%share/locale/gl_ES/LC_MESSAGES/gajim.mo %%NLS%%share/locale/hr/LC_MESSAGES/gajim.mo %%NLS%%share/locale/it/LC_MESSAGES/gajim.mo %%NLS%%share/locale/nb/LC_MESSAGES/gajim.mo %%NLS%%share/locale/nl/LC_MESSAGES/gajim.mo %%NLS%%share/locale/no/LC_MESSAGES/gajim.mo %%NLS%%share/locale/pl/LC_MESSAGES/gajim.mo -%%NLS%%share/locale/sr/LC_MESSAGES/gajim.mo %%NLS%%share/locale/pt/LC_MESSAGES/gajim.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/gajim.mo %%NLS%%share/locale/ru/LC_MESSAGES/gajim.mo %%NLS%%share/locale/sk/LC_MESSAGES/gajim.mo +%%NLS%%share/locale/sr/LC_MESSAGES/gajim.mo %%NLS%%share/locale/sv/LC_MESSAGES/gajim.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/gajim.mo share/applications/gajim.desktop @@ -79,6 +81,45 @@ %%DATADIR%%/data/emoticons/animated/tongue.png %%DATADIR%%/data/emoticons/animated/unhappy.png %%DATADIR%%/data/emoticons/animated/wink.gif +%%DATADIR%%/data/emoticons/static-big/angry.png +%%DATADIR%%/data/emoticons/static-big/bat.png +%%DATADIR%%/data/emoticons/static-big/beer.png +%%DATADIR%%/data/emoticons/static-big/biggrin.png +%%DATADIR%%/data/emoticons/static-big/blush.png +%%DATADIR%%/data/emoticons/static-big/boy.png +%%DATADIR%%/data/emoticons/static-big/brflower.png +%%DATADIR%%/data/emoticons/static-big/brheart.png +%%DATADIR%%/data/emoticons/static-big/coffee.png +%%DATADIR%%/data/emoticons/static-big/coolglasses.png +%%DATADIR%%/data/emoticons/static-big/cry.png +%%DATADIR%%/data/emoticons/static-big/cuffs.png +%%DATADIR%%/data/emoticons/static-big/devil.png +%%DATADIR%%/data/emoticons/static-big/drink.png +%%DATADIR%%/data/emoticons/static-big/emoticons.py +%%DATADIR%%/data/emoticons/static-big/flower.png +%%DATADIR%%/data/emoticons/static-big/frowning.png +%%DATADIR%%/data/emoticons/static-big/girl.png +%%DATADIR%%/data/emoticons/static-big/heart.png +%%DATADIR%%/data/emoticons/static-big/hugleft.png +%%DATADIR%%/data/emoticons/static-big/hugright.png +%%DATADIR%%/data/emoticons/static-big/kiss.png +%%DATADIR%%/data/emoticons/static-big/lamp.png +%%DATADIR%%/data/emoticons/static-big/mail.png +%%DATADIR%%/data/emoticons/static-big/moon.png +%%DATADIR%%/data/emoticons/static-big/music.png +%%DATADIR%%/data/emoticons/static-big/oh.png +%%DATADIR%%/data/emoticons/static-big/phone.png +%%DATADIR%%/data/emoticons/static-big/photo.png +%%DATADIR%%/data/emoticons/static-big/pussy.png +%%DATADIR%%/data/emoticons/static-big/rainbow.png +%%DATADIR%%/data/emoticons/static-big/smile.png +%%DATADIR%%/data/emoticons/static-big/star.png +%%DATADIR%%/data/emoticons/static-big/stare.png +%%DATADIR%%/data/emoticons/static-big/thumbdown.png +%%DATADIR%%/data/emoticons/static-big/thumbup.png +%%DATADIR%%/data/emoticons/static-big/tongue.png +%%DATADIR%%/data/emoticons/static-big/unhappy.png +%%DATADIR%%/data/emoticons/static-big/wink.png %%DATADIR%%/data/emoticons/static/angry.png %%DATADIR%%/data/emoticons/static/bat.png %%DATADIR%%/data/emoticons/static/beer.png @@ -822,6 +863,8 @@ %%DOCSDIR%%/THANKS @dirrm lib/gajim @dirrmtry share/applications +%%NLS%%@dirrm share/locale/gl_ES/LC_MESSAGES +%%NLS%%@dirrm share/locale/gl_ES @dirrm %%DATADIR%%/src/common/xmpp @dirrm %%DATADIR%%/src/common/zeroconf @dirrm %%DATADIR%%/src/common @@ -832,34 +875,53 @@ @dirrm %%DATADIR%%/data/pixmaps @dirrm %%DATADIR%%/data/other @dirrm %%DATADIR%%/data/sounds -@dirrm %%DATADIR%%/data/emoticons/static @dirrm %%DATADIR%%/data/emoticons/animated +@dirrm %%DATADIR%%/data/emoticons/static +@dirrm %%DATADIR%%/data/emoticons/static-big @dirrm %%DATADIR%%/data/emoticons +@dirrm %%DATADIR%%/data/iconsets/crystal/16x16 +@dirrm %%DATADIR%%/data/iconsets/crystal/48x48 +@dirrm %%DATADIR%%/data/iconsets/crystal +@dirrm %%DATADIR%%/data/iconsets/dcraven/16x16 +@dirrm %%DATADIR%%/data/iconsets/dcraven/32x32 +@dirrm %%DATADIR%%/data/iconsets/dcraven/48x48 +@dirrm %%DATADIR%%/data/iconsets/dcraven +@dirrm %%DATADIR%%/data/iconsets/gnome/16x16 +@dirrm %%DATADIR%%/data/iconsets/gnome/32x32 +@dirrm %%DATADIR%%/data/iconsets/gnome/48x48 +@dirrm %%DATADIR%%/data/iconsets/gnome +@dirrm %%DATADIR%%/data/iconsets/goojim/16x16 +@dirrm %%DATADIR%%/data/iconsets/goojim/32x32 +@dirrm %%DATADIR%%/data/iconsets/goojim/48x48 +@dirrm %%DATADIR%%/data/iconsets/goojim +@dirrm %%DATADIR%%/data/iconsets/gossip/16x16 +@dirrm %%DATADIR%%/data/iconsets/gossip/48x48 +@dirrm %%DATADIR%%/data/iconsets/gossip @dirrm %%DATADIR%%/data/iconsets/gota/16x16 @dirrm %%DATADIR%%/data/iconsets/gota/32x32 @dirrm %%DATADIR%%/data/iconsets/gota/48x48 @dirrm %%DATADIR%%/data/iconsets/gota -@dirrm %%DATADIR%%/data/iconsets/sun/16x16 -@dirrm %%DATADIR%%/data/iconsets/sun/32x32 -@dirrm %%DATADIR%%/data/iconsets/sun/48x48 -@dirrm %%DATADIR%%/data/iconsets/sun -@dirrm %%DATADIR%%/data/iconsets/stellar/16x16 -@dirrm %%DATADIR%%/data/iconsets/stellar/48x48 -@dirrm %%DATADIR%%/data/iconsets/stellar -@dirrm %%DATADIR%%/data/iconsets/simplebulb/16x16 -@dirrm %%DATADIR%%/data/iconsets/simplebulb/48x48 -@dirrm %%DATADIR%%/data/iconsets/simplebulb -@dirrm %%DATADIR%%/data/iconsets/nuvola/16x16 -@dirrm %%DATADIR%%/data/iconsets/nuvola/48x48 -@dirrm %%DATADIR%%/data/iconsets/nuvola @dirrm %%DATADIR%%/data/iconsets/jabberbulb/16x16 @dirrm %%DATADIR%%/data/iconsets/jabberbulb/32x32 @dirrm %%DATADIR%%/data/iconsets/jabberbulb/48x48 @dirrm %%DATADIR%%/data/iconsets/jabberbulb -@dirrm %%DATADIR%%/data/iconsets/transports/msn/16x16 -@dirrm %%DATADIR%%/data/iconsets/transports/msn/32x32 -@dirrm %%DATADIR%%/data/iconsets/transports/msn/48x48 -@dirrm %%DATADIR%%/data/iconsets/transports/msn +@dirrm %%DATADIR%%/data/iconsets/nuvola/16x16 +@dirrm %%DATADIR%%/data/iconsets/nuvola/48x48 +@dirrm %%DATADIR%%/data/iconsets/nuvola +@dirrm %%DATADIR%%/data/iconsets/simplebulb/16x16 +@dirrm %%DATADIR%%/data/iconsets/simplebulb/48x48 +@dirrm %%DATADIR%%/data/iconsets/simplebulb +@dirrm %%DATADIR%%/data/iconsets/stellar/16x16 +@dirrm %%DATADIR%%/data/iconsets/stellar/48x48 +@dirrm %%DATADIR%%/data/iconsets/stellar +@dirrm %%DATADIR%%/data/iconsets/sun/16x16 +@dirrm %%DATADIR%%/data/iconsets/sun/32x32 +@dirrm %%DATADIR%%/data/iconsets/sun/48x48 +@dirrm %%DATADIR%%/data/iconsets/sun +@dirrm %%DATADIR%%/data/iconsets/transports/aim/16x16 +@dirrm %%DATADIR%%/data/iconsets/transports/aim/32x32 +@dirrm %%DATADIR%%/data/iconsets/transports/aim/48x48 +@dirrm %%DATADIR%%/data/iconsets/transports/aim @dirrm %%DATADIR%%/data/iconsets/transports/gadu-gadu/16x16 @dirrm %%DATADIR%%/data/iconsets/transports/gadu-gadu/32x32 @dirrm %%DATADIR%%/data/iconsets/transports/gadu-gadu/48x48 @@ -871,10 +933,10 @@ @dirrm %%DATADIR%%/data/iconsets/transports/irc/16x16 @dirrm %%DATADIR%%/data/iconsets/transports/irc/32x32 @dirrm %%DATADIR%%/data/iconsets/transports/irc -@dirrm %%DATADIR%%/data/iconsets/transports/aim/16x16 -@dirrm %%DATADIR%%/data/iconsets/transports/aim/32x32 -@dirrm %%DATADIR%%/data/iconsets/transports/aim/48x48 -@dirrm %%DATADIR%%/data/iconsets/transports/aim +@dirrm %%DATADIR%%/data/iconsets/transports/msn/16x16 +@dirrm %%DATADIR%%/data/iconsets/transports/msn/32x32 +@dirrm %%DATADIR%%/data/iconsets/transports/msn/48x48 +@dirrm %%DATADIR%%/data/iconsets/transports/msn @dirrm %%DATADIR%%/data/iconsets/transports/sms/16x16 @dirrm %%DATADIR%%/data/iconsets/transports/sms/32x32 @dirrm %%DATADIR%%/data/iconsets/transports/sms @@ -890,24 +952,6 @@ @dirrm %%DATADIR%%/data/iconsets/transports/yahoo/48x48 @dirrm %%DATADIR%%/data/iconsets/transports/yahoo @dirrm %%DATADIR%%/data/iconsets/transports -@dirrm %%DATADIR%%/data/iconsets/gossip/16x16 -@dirrm %%DATADIR%%/data/iconsets/gossip/48x48 -@dirrm %%DATADIR%%/data/iconsets/gossip -@dirrm %%DATADIR%%/data/iconsets/goojim/16x16 -@dirrm %%DATADIR%%/data/iconsets/goojim/32x32 -@dirrm %%DATADIR%%/data/iconsets/goojim/48x48 -@dirrm %%DATADIR%%/data/iconsets/goojim -@dirrm %%DATADIR%%/data/iconsets/gnome/16x16 -@dirrm %%DATADIR%%/data/iconsets/gnome/32x32 -@dirrm %%DATADIR%%/data/iconsets/gnome/48x48 -@dirrm %%DATADIR%%/data/iconsets/gnome -@dirrm %%DATADIR%%/data/iconsets/dcraven/16x16 -@dirrm %%DATADIR%%/data/iconsets/dcraven/32x32 -@dirrm %%DATADIR%%/data/iconsets/dcraven/48x48 -@dirrm %%DATADIR%%/data/iconsets/dcraven -@dirrm %%DATADIR%%/data/iconsets/crystal/16x16 -@dirrm %%DATADIR%%/data/iconsets/crystal/48x48 -@dirrm %%DATADIR%%/data/iconsets/crystal @dirrm %%DATADIR%%/data/iconsets @dirrm %%DATADIR%%/data @dirrm %%DATADIR%%