ports/87666: [MAINTAINER] polish/pl-kadu: update to 0.4.2
Marcin Wisnicki
mwisnicki+freebsd at gmail.com
Wed Oct 19 14:00:28 UTC 2005
>Number: 87666
>Category: ports
>Synopsis: [MAINTAINER] polish/pl-kadu: update to 0.4.2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Oct 19 14:00:25 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Marcin Wisnicki
>Release: FreeBSD 5.4-STABLE i386
>Organization:
>Environment:
System: FreeBSD ghost.pnet.one.pl 5.4-STABLE FreeBSD 5.4-STABLE #0: Wed Oct 12 19:55:33 CEST 2005
>Description:
- Update to 0.4.2
- Install only one icon for kde & gnome
- Portlint
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- pl-kadu-0.4.2,1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/polish/kadu.orig/Makefile /usr/ports/polish/kadu/Makefile
--- /usr/ports/polish/kadu.orig/Makefile Wed Sep 14 00:44:58 2005
+++ /usr/ports/polish/kadu/Makefile Wed Oct 19 13:37:39 2005
@@ -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_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 @@
.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 -ruN --exclude=CVS /usr/ports/polish/kadu.orig/distinfo /usr/ports/polish/kadu/distinfo
--- /usr/ports/polish/kadu.orig/distinfo Mon Sep 5 06:05:11 2005
+++ /usr/ports/polish/kadu/distinfo Tue Oct 18 16:11:38 2005
@@ -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 -ruN --exclude=CVS /usr/ports/polish/kadu.orig/files/patch-Makefile.in /usr/ports/polish/kadu/files/patch-Makefile.in
--- /usr/ports/polish/kadu.orig/files/patch-Makefile.in Mon Sep 5 06:05:11 2005
+++ /usr/ports/polish/kadu/files/patch-Makefile.in Thu Jan 1 01:00:00 1970
@@ -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 -ruN --exclude=CVS /usr/ports/polish/kadu.orig/files/patch-configure /usr/ports/polish/kadu/files/patch-configure
--- /usr/ports/polish/kadu.orig/files/patch-configure Mon Sep 5 06:05:11 2005
+++ /usr/ports/polish/kadu/files/patch-configure Thu Jan 1 01:00:00 1970
@@ -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 -ruN --exclude=CVS /usr/ports/polish/kadu.orig/files/patch-kadu_Makefile.in /usr/ports/polish/kadu/files/patch-kadu_Makefile.in
--- /usr/ports/polish/kadu.orig/files/patch-kadu_Makefile.in Thu Jan 1 01:00:00 1970
+++ /usr/ports/polish/kadu/files/patch-kadu_Makefile.in Tue Oct 18 20:46:23 2005
@@ -0,0 +1,56 @@
+--- kadu/Makefile.in Tue Oct 11 02:16:57 2005
++++ kadu/Makefile.in Tue Oct 18 20:35:30 2005
+@@ -517,35 +517,24 @@
+ install-data-local:
+ $(mkinstalldirs) "$(DESTDIR)/$(includedir)/kadu/"
+ $(INSTALL_DATA) *.h "$(DESTDIR)/$(includedir)/kadu/"
+- @if test -w "$(DESTDIR)$(datadir)"; then \
+- $(mkinstalldirs) "$(DESTDIR)$(datadir)/applnk/Internet/"; \
+- echo "[Desktop Entry]" > "$(DESTDIR)$(datadir)/applnk/Internet/kadu.desktop"; \
+- echo "Type=Application" >> "$(DESTDIR)$(datadir)/applnk/Internet/kadu.desktop"; \
+- echo "Exec=$(bindir)/kadu" >> "$(DESTDIR)$(datadir)/applnk/Internet/kadu.desktop"; \
+- echo "Icon=kadu.png" >> "$(DESTDIR)$(datadir)/applnk/Internet/kadu.desktop"; \
+- echo "MiniIcon=kadu-16.png" >> "$(DESTDIR)$(datadir)/applnk/Internet/kadu.desktop"; \
+- echo "Terminal=0" >> "$(DESTDIR)$(datadir)/applnk/Internet/kadu.desktop"; \
+- echo "Name=Kadu" >> "$(DESTDIR)$(datadir)/applnk/Internet/kadu.desktop"; \
+- $(mkinstalldirs) "$(DESTDIR)$(datadir)/pixmaps/"; \
+- $(INSTALL_DATA) hi48-app-kadu.png "$(DESTDIR)$(datadir)/pixmaps/kadu-48.png"; \
+- $(INSTALL_DATA) hi32-app-kadu.png "$(DESTDIR)$(datadir)/pixmaps/kadu.png"; \
+- $(INSTALL_DATA) hi24-app-kadu.png "$(DESTDIR)$(datadir)/pixmaps/kadu-24.png"; \
+- $(INSTALL_DATA) hi22-app-kadu.png "$(DESTDIR)$(datadir)/pixmaps/kadu-22.png"; \
+- $(INSTALL_DATA) hi16-app-kadu.png "$(DESTDIR)$(datadir)/pixmaps/kadu-16.png"; \
+- echo ""; \
+- echo "Icons installed to $(DESTDIR)$(datadir)/pixmaps"; \
+- echo "Link(kadu.desktop) installed to $(DESTDIR)$(datadir)/applnk/Internet"; \
+- echo ""; \
+- else \
+- echo "";\
+- echo " *******************************************************************"; \
+- echo " * *"; \
+- echo " * You don't have permission to write $(datadir) *"; \
+- echo " * Icons and link(kadu.desktop) won't be installed *"; \
+- echo " * *"; \
+- echo " *******************************************************************"; \
+- echo $(DESTDIR)"";\
+- fi;
++ echo "[Desktop Entry]" > "$(srcdir)/kadu.desktop"
++ echo "Encoding=UTF-8" >> "$(srcdir)/kadu.desktop"
++ echo "Categories=Application;Network;" >> "$(srcdir)/kadu.desktop"
++ echo "Type=Application" >> "$(srcdir)/kadu.desktop"
++ echo "Exec=kadu" >> "$(srcdir)/kadu.desktop"
++ echo "Icon=kadu.png" >> "$(srcdir)/kadu.desktop"
++ echo "Terminal=false" >> "$(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/24x24/apps
++ $(INSTALL_DATA) hi24-app-kadu.png "$(DESTDIR)$(datadir)/icons/hicolor/24x24/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
diff -ruN --exclude=CVS /usr/ports/polish/kadu.orig/files/patch-modules_Makefile.in /usr/ports/polish/kadu/files/patch-modules_Makefile.in
--- /usr/ports/polish/kadu.orig/files/patch-modules_Makefile.in Thu Jan 1 01:00:00 1970
+++ /usr/ports/polish/kadu/files/patch-modules_Makefile.in Tue Oct 18 19:38:09 2005
@@ -0,0 +1,12 @@
+--- modules/Makefile.in Tue Oct 11 02:16:57 2005
++++ modules/Makefile.in Tue Oct 18 19:34:54 2005
+@@ -295,7 +295,8 @@
+ if test -d translations; then \
+ cd translations && \
+ for trans in *.ts; do \
+- if [ ! -e $${trans//\ts/qm} ] || test $$trans -nt $${trans//\ts/qm}; then \
++ trans_qm="$$(echo $${trans} | sed -e 's/\.ts$$/\.qm/')"; \
++ if [ ! -e $${trans_qm} ] || test $$trans -nt $${trans_qm}; then \
+ $(QT_LRELEASE_DIR)/lrelease $$trans; \
+ fi; \
+ done && \
diff -ruN --exclude=CVS /usr/ports/polish/kadu.orig/pkg-plist /usr/ports/polish/kadu/pkg-plist
--- /usr/ports/polish/kadu.orig/pkg-plist Thu Sep 8 04:57:52 2005
+++ /usr/ports/polish/kadu/pkg-plist Tue Oct 18 20:41:37 2005
@@ -553,20 +553,25 @@
%%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
+ at unexec rmdir %D/share/icons/hicolor/24x24/apps 2>/dev/null || true
+ at 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
+ at 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 @@
@dirrm %%DATADIR%%
@dirrm include/kadu/modules
@dirrm include/kadu
- at cwd %%LOCALBASE%%
-share/applnk/Internet/kadu.desktop
- at unexec rmdir %D/share/applnk/Internet 2>/dev/null || true
- at unexec rmdir %D/share/applnk 2>/dev/null || true
- at cwd %%X11BASE%%
-share/gnome/apps/Internet/kadu.desktop
- at unexec rmdir %D/share/gnome/apps/Internet 2>/dev/null || true
- at unexec rmdir %D/share/gnome/apps 2>/dev/null || true
- at unexec rmdir %D/share/gnome 2>/dev/null || true
--- pl-kadu-0.4.2,1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list