diff options
author | jylefort <jylefort@FreeBSD.org> | 2005-06-07 04:29:34 +0800 |
---|---|---|
committer | jylefort <jylefort@FreeBSD.org> | 2005-06-07 04:29:34 +0800 |
commit | ab4e5e9fb3905f8fc2297ede45111b6cd3996a34 (patch) | |
tree | e0e40a817c09f406620994617aba3d6559d3aa92 /net/gajim | |
parent | 6b213e979ec2147051e49c6a76004cade625b4c5 (diff) | |
download | freebsd-ports-gnome-ab4e5e9fb3905f8fc2297ede45111b6cd3996a34.tar.gz freebsd-ports-gnome-ab4e5e9fb3905f8fc2297ede45111b6cd3996a34.tar.zst freebsd-ports-gnome-ab4e5e9fb3905f8fc2297ede45111b6cd3996a34.zip |
- Update to 0.7.1 [1]
- Respect ${CC} and ${CFLAGS}
- Cleanups
PR: ports/81942 [1]
Submitted by: maintainer [1]
Diffstat (limited to 'net/gajim')
-rw-r--r-- | net/gajim/Makefile | 19 | ||||
-rw-r--r-- | net/gajim/distinfo | 4 | ||||
-rw-r--r-- | net/gajim/files/patch-Makefile | 68 | ||||
-rw-r--r-- | net/gajim/pkg-plist | 55 |
4 files changed, 64 insertions, 82 deletions
diff --git a/net/gajim/Makefile b/net/gajim/Makefile index 901ca28addf3..c8f9a1dd67da 100644 --- a/net/gajim/Makefile +++ b/net/gajim/Makefile @@ -6,24 +6,35 @@ # PORTNAME= gajim -PORTVERSION= 0.7 -PORTREVISION= 1 +PORTVERSION= 0.7.1 CATEGORIES= net MASTER_SITES= http://www.gajim.org/downloads/ MAINTAINER= vsevolod@highsecure.ru COMMENT= Gajim is a Jabber client based on a plugin system -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/pygtk.py:${PORTSDIR}/x11-toolkits/py-gtk2 +LIB_DEPENDS= gtkspell.0:${PORTSDIR}/textproc/gtkspell2 USE_X_PREFIX= yes USE_PYTHON= 2.3+ USE_GMAKE= yes USE_BZIP2= yes +USE_REINPLACE= yes +USE_GNOME= pygtk2 MAKE_ENV+= PY_CFLAGS=-I${PYTHON_INCLUDEDIR} \ - PY_PREFIX=${LOCALBASE} + PY_PREFIX=${LOCALBASE} \ + CC=${CC} LDFLAGS=-L${LOCALBASE}/lib MAN1= gajim.1 +post-patch: + @${REINPLACE_CMD} -e \ + 's|^PREFIX.*=.*||; s|^DESTDIR.*=.*||; s|share/man|man|' \ + ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e \ + 's|CFLAGS =|CFLAGS +=|; s|LDFLAGS =|LDFLAGS +=|; \ + s|-I/usr/include/python\$$(PYTHONVER)|$$(PY_CFLAGS)|' \ + ${WRKSRC}/src/Makefile ${WRKSRC}/src/common/Makefile + .include <bsd.port.mk> diff --git a/net/gajim/distinfo b/net/gajim/distinfo index 4444626f8980..fd43015938e7 100644 --- a/net/gajim/distinfo +++ b/net/gajim/distinfo @@ -1,2 +1,2 @@ -MD5 (gajim-0.7.tar.bz2) = 70d6b882c496ea7fbacc4222da49b125 -Size (gajim-0.7.tar.bz2) = 479572 +MD5 (gajim-0.7.1.tar.bz2) = f795d550749d78839d1b6a554bbff545 +Size (gajim-0.7.1.tar.bz2) = 438166 diff --git a/net/gajim/files/patch-Makefile b/net/gajim/files/patch-Makefile deleted file mode 100644 index c5db11a834e0..000000000000 --- a/net/gajim/files/patch-Makefile +++ /dev/null @@ -1,68 +0,0 @@ ---- Makefile.orig Mon May 23 22:22:10 2005 -+++ Makefile Thu May 26 15:16:31 2005 -@@ -1,15 +1,17 @@ - VERSION ?= 0.7 - - MODULES = src src/common po --PREFIX = /usr -+PREFIX ?= /usr/local - DESTDIR = / - --FIND = find -regex '.*\.\(\(glade\)\|\(pyo\)\|\(xpm\)\|\(gif\)\|\(png\)\|\(mo\)\|\(wav\)\)' --FILES = `$(FIND)` --DIRS = `$(FIND) -exec dirname {} \; | sort -u` --FIND_LIB = find -regex '.*\.\(so\)' --FILES_LIB = `$(FIND_LIB)` --FIND_PY = find -regex '.*\.\(py\)' -+MAKE = gmake -+ -+FIND = find -E -+FINDOPTS = -regex '.*.((glade)|(py)|(xpm)|(gif)|(png)|(mo)|(wav))' -+FILES = `$(FIND) . $(FINDOPTS)` -+DIRS = `$(FIND) . $(FINDOPTS) -exec dirname {} \; | sort -u` -+FIND_LIB = $(FIND) . -regex '.*.(so)' -+FIND_PY = $(FIND) . -regex '.*.(py)' - FILES_PY = `$(FIND_PY)` - - SCRIPTS = \ -@@ -18,13 +20,13 @@ - all: translation trayicon idle pyo - - translation: -- make -C po all -+ $(MAKE) -C po all - - trayicon: -- make -C src all; -+ $(MAKE) -C src all; - - idle: -- make -C src/common all; -+ $(MAKE) -C src/common all; - - pyo: - for f in $(FILES_PY) ; do \ -@@ -32,9 +34,9 @@ - done - - clean: -- find -name *.pyc -exec rm {} \; -- find -name *.pyo -exec rm {} \; -- find -name *.mo -exec rm {} \; -+ find . -name *.pyc -exec rm {} \; -+ find . -name *.pyo -exec rm {} \; -+ find . -name *.mo -exec rm {} \; - $(foreach sdir, $(MODULES), make -C $(sdir) clean;) - - dist: -@@ -64,8 +66,8 @@ - cp COPYING "$(DESTDIR)$(PREFIX)/share/gajim/"; - mkdir -p "$(DESTDIR)$(PREFIX)/share/applications"; - cp gajim.desktop "$(DESTDIR)$(PREFIX)/share/applications/"; -- mkdir -p "$(DESTDIR)$(PREFIX)/share/man/man1"; -- cp gajim.1 "$(DESTDIR)$(PREFIX)/share/man/man1"; -+ mkdir -p "$(DESTDIR)$(PREFIX)/man/man1"; -+ cp gajim.1 "$(DESTDIR)$(PREFIX)/man/man1"; - mkdir -p "$(DESTDIR)$(PREFIX)/lib/gajim"; - for f in $(FILES_LIB) ; do \ - cp "$$f" "$(DESTDIR)$(PREFIX)/lib/gajim/"; \ diff --git a/net/gajim/pkg-plist b/net/gajim/pkg-plist index e00b2a269a53..940c57f26cb3 100644 --- a/net/gajim/pkg-plist +++ b/net/gajim/pkg-plist @@ -1,6 +1,8 @@ bin/gajim +lib/gajim/gtkspell.so +lib/gajim/idle.so +lib/gajim/trayicon.so %%DATADIR%%/COPYING -%%DATADIR%%/gajim.xpm %%DATADIR%%/data/emoticons/angry.png %%DATADIR%%/data/emoticons/bat.png %%DATADIR%%/data/emoticons/beer.png @@ -86,7 +88,7 @@ bin/gajim %%DATADIR%%/data/iconsets/transports/aim/chat.png %%DATADIR%%/data/iconsets/transports/aim/closed.xpm %%DATADIR%%/data/iconsets/transports/aim/dnd.png -%%DATADIR%%/data/iconsets/transports/aim/error.png +%%DATADIR%%/data/iconsets/transports/aim/error.xpm %%DATADIR%%/data/iconsets/transports/aim/invisible.png %%DATADIR%%/data/iconsets/transports/aim/message.gif %%DATADIR%%/data/iconsets/transports/aim/not_in_the_roster.png @@ -99,7 +101,7 @@ bin/gajim %%DATADIR%%/data/iconsets/transports/gadugadu/chat.png %%DATADIR%%/data/iconsets/transports/gadugadu/closed.xpm %%DATADIR%%/data/iconsets/transports/gadugadu/dnd.png -%%DATADIR%%/data/iconsets/transports/gadugadu/error.png +%%DATADIR%%/data/iconsets/transports/gadugadu/error.xpm %%DATADIR%%/data/iconsets/transports/gadugadu/invisible.png %%DATADIR%%/data/iconsets/transports/gadugadu/message.gif %%DATADIR%%/data/iconsets/transports/gadugadu/not_in_the_roster.png @@ -112,7 +114,7 @@ bin/gajim %%DATADIR%%/data/iconsets/transports/icq/chat.png %%DATADIR%%/data/iconsets/transports/icq/closed.xpm %%DATADIR%%/data/iconsets/transports/icq/dnd.png -%%DATADIR%%/data/iconsets/transports/icq/error.png +%%DATADIR%%/data/iconsets/transports/icq/error.xpm %%DATADIR%%/data/iconsets/transports/icq/invisible.png %%DATADIR%%/data/iconsets/transports/icq/message.gif %%DATADIR%%/data/iconsets/transports/icq/not_in_the_roster.png @@ -121,11 +123,21 @@ bin/gajim %%DATADIR%%/data/iconsets/transports/icq/opened.xpm %%DATADIR%%/data/iconsets/transports/icq/requested.png %%DATADIR%%/data/iconsets/transports/icq/xa.png +%%DATADIR%%/data/iconsets/transports/irc/away.png +%%DATADIR%%/data/iconsets/transports/irc/chat.png +%%DATADIR%%/data/iconsets/transports/irc/dnd.png +%%DATADIR%%/data/iconsets/transports/irc/error.xpm +%%DATADIR%%/data/iconsets/transports/irc/invisible.png +%%DATADIR%%/data/iconsets/transports/irc/message.gif +%%DATADIR%%/data/iconsets/transports/irc/not_in_the_roster.png +%%DATADIR%%/data/iconsets/transports/irc/offline.png +%%DATADIR%%/data/iconsets/transports/irc/online.png +%%DATADIR%%/data/iconsets/transports/irc/requested.png +%%DATADIR%%/data/iconsets/transports/irc/xa.png %%DATADIR%%/data/iconsets/transports/msn/away.png %%DATADIR%%/data/iconsets/transports/msn/chat.png %%DATADIR%%/data/iconsets/transports/msn/closed.xpm %%DATADIR%%/data/iconsets/transports/msn/dnd.png -%%DATADIR%%/data/iconsets/transports/msn/error.png %%DATADIR%%/data/iconsets/transports/msn/invisible.png %%DATADIR%%/data/iconsets/transports/msn/message.gif %%DATADIR%%/data/iconsets/transports/msn/not_in_the_roster.png @@ -134,11 +146,22 @@ bin/gajim %%DATADIR%%/data/iconsets/transports/msn/opened.xpm %%DATADIR%%/data/iconsets/transports/msn/requested.png %%DATADIR%%/data/iconsets/transports/msn/xa.png +%%DATADIR%%/data/iconsets/transports/msn/error.xpm +%%DATADIR%%/data/iconsets/transports/sms/away.png +%%DATADIR%%/data/iconsets/transports/sms/chat.png +%%DATADIR%%/data/iconsets/transports/sms/dnd.png +%%DATADIR%%/data/iconsets/transports/sms/error.xpm +%%DATADIR%%/data/iconsets/transports/sms/invisible.png +%%DATADIR%%/data/iconsets/transports/sms/message.gif +%%DATADIR%%/data/iconsets/transports/sms/offline.png +%%DATADIR%%/data/iconsets/transports/sms/online.png +%%DATADIR%%/data/iconsets/transports/sms/requested.png +%%DATADIR%%/data/iconsets/transports/sms/xa.png %%DATADIR%%/data/iconsets/transports/yahoo/away.png %%DATADIR%%/data/iconsets/transports/yahoo/chat.png %%DATADIR%%/data/iconsets/transports/yahoo/closed.xpm %%DATADIR%%/data/iconsets/transports/yahoo/dnd.png -%%DATADIR%%/data/iconsets/transports/yahoo/error.png +%%DATADIR%%/data/iconsets/transports/yahoo/error.xpm %%DATADIR%%/data/iconsets/transports/yahoo/invisible.png %%DATADIR%%/data/iconsets/transports/yahoo/message.gif %%DATADIR%%/data/iconsets/transports/yahoo/not_in_the_roster.png @@ -147,21 +170,26 @@ bin/gajim %%DATADIR%%/data/iconsets/transports/yahoo/opened.xpm %%DATADIR%%/data/iconsets/transports/yahoo/requested.png %%DATADIR%%/data/iconsets/transports/yahoo/xa.png -%%DATADIR%%/data/pixmaps/logo.png +%%DATADIR%%/data/pixmaps/gajim.png %%DATADIR%%/data/sounds/connected.wav %%DATADIR%%/data/sounds/disconnected.wav %%DATADIR%%/data/sounds/message1.wav %%DATADIR%%/data/sounds/message2.wav %%DATADIR%%/data/sounds/sent.wav +%%DATADIR%%/po/bg/LC_MESSAGES/gajim.mo +%%DATADIR%%/po/de/LC_MESSAGES/gajim.mo %%DATADIR%%/po/el/LC_MESSAGES/gajim.mo +%%DATADIR%%/po/es/LC_MESSAGES/gajim.mo %%DATADIR%%/po/fr/LC_MESSAGES/gajim.mo %%DATADIR%%/po/pl/LC_MESSAGES/gajim.mo %%DATADIR%%/po/pt/LC_MESSAGES/gajim.mo +%%DATADIR%%/po/ru/LC_MESSAGES/gajim.mo %%DATADIR%%/src/advanced.py %%DATADIR%%/src/cell_renderer_image.py %%DATADIR%%/src/chat.py %%DATADIR%%/src/check_for_new_version.py %%DATADIR%%/src/common/GnuPG.py +%%DATADIR%%/src/common/GnuPGInterface.py %%DATADIR%%/src/common/__init__.py %%DATADIR%%/src/common/config.py %%DATADIR%%/src/common/connection.py @@ -196,7 +224,7 @@ bin/gajim %%DATADIR%%/src/tabbed_chat_window.py %%DATADIR%%/src/vcard.py share/applications/gajim.desktop - +share/pixmaps/gajim.png @dirrm lib/gajim @dirrm %%DATADIR%%/src/common/xmpp @dirrm %%DATADIR%%/src/common @@ -208,21 +236,32 @@ share/applications/gajim.desktop @dirrm %%DATADIR%%/data/iconsets/transports/aim @dirrm %%DATADIR%%/data/iconsets/transports/gadugadu @dirrm %%DATADIR%%/data/iconsets/transports/icq +@dirrm %%DATADIR%%/data/iconsets/transports/irc @dirrm %%DATADIR%%/data/iconsets/transports/msn +@dirrm %%DATADIR%%/data/iconsets/transports/sms @dirrm %%DATADIR%%/data/iconsets/transports/yahoo @dirrm %%DATADIR%%/data/iconsets/transports @dirrm %%DATADIR%%/data/iconsets @dirrm %%DATADIR%%/data/pixmaps @dirrm %%DATADIR%%/data/sounds @dirrm %%DATADIR%%/data +@dirrm %%DATADIR%%/po/bg/LC_MESSAGES/ +@dirrm %%DATADIR%%/po/bg +@dirrm %%DATADIR%%/po/de/LC_MESSAGES/ +@dirrm %%DATADIR%%/po/de @dirrm %%DATADIR%%/po/el/LC_MESSAGES/ @dirrm %%DATADIR%%/po/el +@dirrm %%DATADIR%%/po/es/LC_MESSAGES/ +@dirrm %%DATADIR%%/po/es @dirrm %%DATADIR%%/po/fr/LC_MESSAGES @dirrm %%DATADIR%%/po/fr @dirrm %%DATADIR%%/po/pl/LC_MESSAGES @dirrm %%DATADIR%%/po/pl @dirrm %%DATADIR%%/po/pt/LC_MESSAGES @dirrm %%DATADIR%%/po/pt +@dirrm %%DATADIR%%/po/ru/LC_MESSAGES/ +@dirrm %%DATADIR%%/po/ru @dirrm %%DATADIR%%/po @dirrm %%DATADIR%% @unexec rmdir %D/share/applications > /dev/null 2>&1 | true +@unexec rmdir %D/share/pixmaps > /dev/null 2>&1 | true |