5 files changed, 11 insertions, 135 deletions

diff --git a/polish/kadu/Makefile b/polish/kadu/Makefile
index 9287460f93d1..3fd9007b4654 100644
--- a/polish/kadu/Makefile
+++ b/polish/kadu/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=		kadu
-PORTVERSION=		0.4.1
-PORTREVISION=		1
+PORTVERSION=		0.4.2
 PORTEPOCH=		1
 CATEGORIES=		polish net
 MASTER_SITES=		http://www.kadu.net/download/stable/
@@ -23,9 +22,7 @@ USE_BZIP2=		yes
 USE_GMAKE=		yes
 USE_OPENSSL=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-existing-libgadu \
-			--with-includes="${LOCALBASE}/include" \
-			--with-libs="${LOCALBASE}/lib" \
+CONFIGURE_ARGS+=	--with-existing-libgadu="${LOCALBASE}" \
 			--program-transform-name=''
 CONFIGURE_ENV=		QTDIR="${QT_PREFIX}"
 
@@ -42,9 +39,7 @@ post-patch:
 .endif
 
 post-install:
-	${MKDIR} ${X11BASE}/share/gnome/apps/Internet
-	${INSTALL_DATA} ${WRKSRC}/kadu/kadu.desktop ${X11BASE}/share/gnome/apps/Internet
-	${MKDIR} ${LOCALBASE}/share/applnk/Internet
-	${INSTALL_DATA} ${WRKSRC}/kadu/kadu.desktop ${LOCALBASE}/share/applnk/Internet
+	${MKDIR} ${PREFIX}/share/applications
+	${INSTALL_DATA} ${WRKSRC}/kadu/kadu.desktop ${PREFIX}/share/applications
 
 .include <bsd.port.post.mk>
diff --git a/polish/kadu/distinfo b/polish/kadu/distinfo
index 4d4493f73162..6c16d0a1dffb 100644
--- a/polish/kadu/distinfo
+++ b/polish/kadu/distinfo
@@ -1,2 +1,2 @@
-MD5 (kadu-0.4.1.tar.bz2) = 52c582fcc175b2af534c7ddab24e0b6b
-SIZE (kadu-0.4.1.tar.bz2) = 1218351
+MD5 (kadu-0.4.2.tar.bz2) = 77792981e2a0b67d86afea7d5d768463
+SIZE (kadu-0.4.2.tar.bz2) = 1181463
diff --git a/polish/kadu/files/patch-Makefile.in b/polish/kadu/files/patch-Makefile.in
deleted file mode 100644
index 952a311d7fc7..000000000000
--- a/polish/kadu/files/patch-Makefile.in
+++ /dev/null
@@ -1,64 +0,0 @@
---- kadu/Makefile.in	Tue Jul 19 21:52:02 2005
-+++ kadu/Makefile.in	Tue Aug  9 01:01:22 2005
-@@ -515,42 +515,29 @@
- install-data-local:
- 	$(mkinstalldirs) "$(DESTDIR)/$(includedir)/kadu/"
- 	$(INSTALL_DATA) *.h "$(DESTDIR)/$(includedir)/kadu/"
--	@if test -w "$(DESTDIR)/usr/share"; then \
--		$(mkinstalldirs) "$(DESTDIR)/usr/share/applnk/Internet/"; \
--		echo "[Desktop Entry]" > "$(DESTDIR)/usr/share/applnk/Internet/kadu.desktop"; \
--		echo "Type=Application" >> "$(DESTDIR)/usr/share/applnk/Internet/kadu.desktop"; \
--		echo "Exec=$(bindir)/kadu" >> "$(DESTDIR)/usr/share/applnk/Internet/kadu.desktop"; \
--		echo "Icon=kadu.png" >> "$(DESTDIR)/usr/share/applnk/Internet/kadu.desktop"; \
--		echo "MiniIcon=kadu-16.png" >> "$(DESTDIR)/usr/share/applnk/Internet/kadu.desktop"; \
--		echo "Terminal=0" >> "$(DESTDIR)/usr/share/applnk/Internet/kadu.desktop"; \
--		echo "Name=Kadu" >> "$(DESTDIR)/usr/share/applnk/Internet/kadu.desktop"; \
--		$(mkinstalldirs) "$(DESTDIR)/usr/share/pixmaps/"; \
--		$(INSTALL_DATA) hi48-app-kadu.png "$(DESTDIR)/usr/share/pixmaps/kadu-48.png"; \
--		$(INSTALL_DATA) hi32-app-kadu.png "$(DESTDIR)/usr/share/pixmaps/kadu.png"; \
--		$(INSTALL_DATA) hi24-app-kadu.png "$(DESTDIR)/usr/share/pixmaps/kadu-24.png"; \
--		$(INSTALL_DATA) hi22-app-kadu.png "$(DESTDIR)/usr/share/pixmaps/kadu-22.png"; \
--		$(INSTALL_DATA) hi16-app-kadu.png "$(DESTDIR)/usr/share/pixmaps/kadu-16.png"; \
--		echo ""; \
--		echo "Icons installed to $(DESTDIR)/usr/share/pixmaps"; \
--		echo "Link(kadu.desktop) installed to $(DESTDIR)/usr/share/applnk/Internet"; \
--		echo ""; \
--	else \
--		echo "";\
--		echo "         *******************************************************************"; \
--		echo "         *                                                                 *"; \
--		echo "         *          You don't have permission to write /usr/share          *"; \
--		echo "         *          Icons and link(kadu.desktop) won't be installed        *"; \
--		echo "         *                                                                 *"; \
--		echo "         *******************************************************************"; \
--		echo $(DESTDIR)"";\
--	fi;
-+	echo "[Desktop Entry]" > "$(srcdir)/kadu.desktop"
-+	echo "Type=Application" >> "$(srcdir)/kadu.desktop"
-+	echo "Exec=$(bindir)/kadu" >> "$(srcdir)/kadu.desktop"
-+	echo "Icon=kadu.png" >> "$(srcdir)/kadu.desktop"
-+	echo "MiniIcon=kadu-16.png" >> "$(srcdir)/kadu.desktop"
-+	echo "Terminal=0" >> "$(srcdir)/kadu.desktop"
-+	echo "Name=Kadu" >> "$(srcdir)/kadu.desktop"
-+	$(mkinstalldirs) $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps
-+	$(INSTALL_DATA) hi48-app-kadu.png "$(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/kadu.png"
-+	$(mkinstalldirs) $(DESTDIR)$(datadir)/icons/hicolor/32x32/apps
-+	$(INSTALL_DATA) hi32-app-kadu.png "$(DESTDIR)$(datadir)/icons/hicolor/32x32/apps/kadu.png"
-+	$(mkinstalldirs) $(DESTDIR)$(datadir)/icons/hicolor/22x22/apps
-+	$(INSTALL_DATA) hi22-app-kadu.png "$(DESTDIR)$(datadir)/icons/hicolor/22x22/apps/kadu.png"
-+	$(mkinstalldirs) $(DESTDIR)$(datadir)/icons/hicolor/16x16/apps
-+	$(INSTALL_DATA) hi16-app-kadu.png "$(DESTDIR)$(datadir)/icons/hicolor/16x16/apps/kadu.png"
- 
- uninstall-local:
- 	rm -f "$(DESTDIR)/$(includedir)/kadu"/*.h
- 	rm -f "$(DESTDIR)/usr/share/applnk/Internet/kadu.desktop"
--	rm -f "$(DESTDIR)/usr/share/pixmaps/kadu-48.png"
--	rm -f "$(DESTDIR)/usr/share/pixmaps/kadu.png"
--	rm -f "$(DESTDIR)/usr/share/pixmaps/kadu-16.png"
-+	rm -f "$(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/kadu.png"
-+	rm -f "$(DESTDIR)$(datadir)/icons/hicolor/32x32/apps/kadu.png"
-+	rm -f "$(DESTDIR)$(datadir)/icons/hicolor/22x22/apps/kadu.png"
-+	rm -f "$(DESTDIR)$(datadir)/icons/hicolor/16x16/apps/kadu.png"
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/polish/kadu/files/patch-configure b/polish/kadu/files/patch-configure
deleted file mode 100644
index 9f1112b493aa..000000000000
--- a/polish/kadu/files/patch-configure
+++ /dev/null
@@ -1,51 +0,0 @@
---- configure.orig	Tue Aug  9 22:53:04 2005
-+++ configure	Wed Aug 10 00:03:04 2005
-@@ -4111,20 +4111,14 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--int
--main ()
-+#include <execinfo.h>
-+int main()
- {
--
--		#include <execinfo.h>
--		int main()
--		{
--			char* data;
--			backtrace(&data, 100);
--		}
--
--  ;
-+  char* data;
-+  backtrace(&data, 100);
-   return 0;
- }
-+
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-@@ -4179,18 +4173,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--int
--main ()
-+#include <execinfo.h>
-+int main ()
- {
--
--		#include <execinfo.h>
--		int main()
--		{
--			char* data;
--			backtrace(&data, 100);
--		}
--
--  ;
-+  char* data;
-+  backtrace(&data, 100);
-   return 0;
- }
- _ACEOF
diff --git a/polish/kadu/pkg-plist b/polish/kadu/pkg-plist
index 8c50bbddb649..8c9ecde067ce 100644
--- a/polish/kadu/pkg-plist
+++ b/polish/kadu/pkg-plist
@@ -553,20 +553,25 @@ include/kadu/userlist.h
 %%DATADIR%%/translations/qt_fr.qm
 %%DATADIR%%/translations/qt_it.qm
 %%DATADIR%%/translations/qt_pl.qm
+share/applications/kadu.desktop
 share/icons/hicolor/16x16/apps/kadu.png
 share/icons/hicolor/22x22/apps/kadu.png
+share/icons/hicolor/24x24/apps/kadu.png
 share/icons/hicolor/32x32/apps/kadu.png
 share/icons/hicolor/48x48/apps/kadu.png
 @unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/22x22/apps 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/22x22 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/24x24/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/24x24 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
 @unexec rmdir %D/share/icons 2>/dev/null || true
+@unexec rmdir %D/share/applications 2>/dev/null || true
 @dirrm %%DATADIR%%/translations
 @dirrm %%DATADIR%%/themes/sounds/default
 @dirrm %%DATADIR%%/themes/sounds
@@ -587,12 +592,3 @@ share/icons/hicolor/48x48/apps/kadu.png
 @dirrm %%DATADIR%%
 @dirrm include/kadu/modules
 @dirrm include/kadu
-@cwd %%LOCALBASE%%
-share/applnk/Internet/kadu.desktop
-@unexec rmdir %D/share/applnk/Internet 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
-@cwd %%X11BASE%%
-share/gnome/apps/Internet/kadu.desktop
-@unexec rmdir %D/share/gnome/apps/Internet 2>/dev/null || true
-@unexec rmdir %D/share/gnome/apps 2>/dev/null || true
-@unexec rmdir %D/share/gnome 2>/dev/null || true