Date: Fri, 6 Nov 2009 21:43:45 +1000 From: "Dima Panov" <fluffy@FreeBSD.org> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/140333: net-p2p/eiskaltdc: update to 1.0.30 release Message-ID: <1257507825.81503@Fluffy.Khv.RU> Resent-Message-ID: <200911061150.nA6Bo4Ia078505@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 140333
>Category: ports
>Synopsis: net-p2p/eiskaltdc: update to 1.0.30 release
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Nov 06 11:50:04 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Dima Panov
>Release: FreeBSD 9.0-900002-CURRENT amd64
>Organization:
Fluffy.Khv.RU
>Environment:
System: FreeBSD 9.0-900002-CURRENT #0: Sun Nov 1 01:33:32 VLAT 2009
fluffy@Fluffy.Khv.RU:/usr/obj/usr/src/sys/Spot
>Description:
net-p2p/eiskaltdc: update to 1.0.30 release
switched from autotools to cmake
tindy logs:
http://ns.ael.ru/~fluffy.khv/eiskaltdc-1.0.30.log
http://regis.goodking.ca/tb/index.php?action=describe_port&id=886
>How-To-Repeat:
>Fix:
--- eiskaltdc.diff begins here ---
Index: net-p2p/eiskaltdc/Makefile
===================================================================
RCS file: /home/ncvs/ports/net-p2p/eiskaltdc/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- net-p2p/eiskaltdc/Makefile 10 Sep 2009 09:09:02 -0000 1.1
+++ net-p2p/eiskaltdc/Makefile 6 Nov 2009 08:17:54 -0000
@@ -6,7 +6,7 @@
#
PORTNAME= eiskaltdc
-PORTVERSION= 1.0.0
+PORTVERSION= 1.0.30
CATEGORIES= net-p2p
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}
@@ -17,11 +17,15 @@
USE_BZIP2= yes
USE_QT_VER= 4
-QT_COMPONENTS= corelib gui network qt3support \
+QT_COMPONENTS= corelib gui network qt3support qmake_build \
moc_build uic_build rcc_build linguist_build
USE_GMAKE= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ENV+= DCLIB_CFLAGS=-I${LOCALBASE}/include
+USE_CMAKE= yes
QTCFGLIBS+= ${PTHREAD_LIBS}
+MAN1= eiskaltdc.1
+MANCOMPRESSED= yes
+
+BUILD_WRKSRC= ${WRKSRC}/${PORTNAME}
+
.include <bsd.port.mk>
Index: net-p2p/eiskaltdc/distinfo
===================================================================
RCS file: /home/ncvs/ports/net-p2p/eiskaltdc/distinfo,v
retrieving revision 1.1
diff -u -r1.1 distinfo
--- net-p2p/eiskaltdc/distinfo 10 Sep 2009 09:09:02 -0000 1.1
+++ net-p2p/eiskaltdc/distinfo 6 Nov 2009 00:17:05 -0000
@@ -1,3 +1,3 @@
-MD5 (eiskaltdc-1.0.0.tar.bz2) = 475a5cd65d0c140689f674d153058fe9
-SHA256 (eiskaltdc-1.0.0.tar.bz2) = dc8d264832a14eb76140ca5626dd5eadbae74542b8ec5f68a1b149f773e60ec9
-SIZE (eiskaltdc-1.0.0.tar.bz2) = 1931695
+MD5 (eiskaltdc-1.0.30.tar.bz2) = ab6f5987a90d2da65b85cad2c88667f4
+SHA256 (eiskaltdc-1.0.30.tar.bz2) = 03b94b247eb480531bf3485d7733790bbf524c8276a500469df13f69153670a6
+SIZE (eiskaltdc-1.0.30.tar.bz2) = 1627569
Index: net-p2p/eiskaltdc/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/net-p2p/eiskaltdc/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- net-p2p/eiskaltdc/pkg-plist 10 Sep 2009 09:09:02 -0000 1.1
+++ net-p2p/eiskaltdc/pkg-plist 6 Nov 2009 08:13:05 -0000
@@ -1,4 +1,64 @@
bin/eiskaltdc
+include/eiskaltdc/about.h
+include/eiskaltdc/cdialogmessage.h
+include/eiskaltdc/cdialogpicturemap.h
+include/eiskaltdc/dcantispam.h
+include/eiskaltdc/dcantispamcontrol.h
+include/eiskaltdc/dcapplicationevents.h
+include/eiskaltdc/dcchat.h
+include/eiskaltdc/dcclient.h
+include/eiskaltdc/dcconfig.h
+include/eiskaltdc/dcconnectionmanager.h
+include/eiskaltdc/dcdebug.h
+include/eiskaltdc/dcdownloadalias.h
+include/eiskaltdc/dceditserver.h
+include/eiskaltdc/dcedittransfer.h
+include/eiskaltdc/dcevent.h
+include/eiskaltdc/dcfilebrowser.h
+include/eiskaltdc/dcfilebrowseritems.h
+include/eiskaltdc/dcfilelistdecompressor.h
+include/eiskaltdc/dcfiletool.h
+include/eiskaltdc/dcfiletransferinfo.h
+include/eiskaltdc/dcfriendobject.h
+include/eiskaltdc/dcgui.h
+include/eiskaltdc/dcguiutils.h
+include/eiskaltdc/dchubfilter.h
+include/eiskaltdc/dchublinklistener.h
+include/eiskaltdc/dchublistitems.h
+include/eiskaltdc/dchublistmanager.h
+include/eiskaltdc/dchubprofile.h
+include/eiskaltdc/dchubsearch.h
+include/eiskaltdc/dciconloader.h
+include/eiskaltdc/dcinotify.h
+include/eiskaltdc/dcinotifycontrol.h
+include/eiskaltdc/dcipfilter.h
+include/eiskaltdc/dcipfiltercontrol.h
+include/eiskaltdc/dcmenuhandler.h
+include/eiskaltdc/dcoptions.h
+include/eiskaltdc/dcpluginmanager.h
+include/eiskaltdc/dcqtextedit.h
+include/eiskaltdc/dcquickconnect.h
+include/eiskaltdc/dcshellcommandrunner.h
+include/eiskaltdc/dcsigterm.h
+include/eiskaltdc/dcsplash.h
+include/eiskaltdc/dcspy.h
+include/eiskaltdc/dctransferview.h
+include/eiskaltdc/dctransferviewitems.h
+include/eiskaltdc/dctranslator.h
+include/eiskaltdc/dcusercommandeditor.h
+include/eiskaltdc/dcuserslist.h
+include/eiskaltdc/dcwidget.h
+include/eiskaltdc/filteronlyproxy.h
+include/eiskaltdc/ipfiltermodel.h
+include/eiskaltdc/publichubsmodel.h
+include/eiskaltdc/publichubsproxy.h
+include/eiskaltdc/search-result-columns.h
+include/eiskaltdc/searchresultmodel.h
+include/eiskaltdc/searchspymodel.h
+include/eiskaltdc/userlistmodel.h
+lib/libeiskaltdc.so
+lib/libeiskaltdc.so.1.1.0
+libdata/pkgconfig/eiskaltdc-1.1.0.pc
share/applications/eiskaltdc.desktop
%%DATADIR%%/COPYING
%%DATADIR%%/icons/appl/default/back.png
@@ -42,6 +102,7 @@
%%DATADIR%%/icons/appl/default/find.png
%%DATADIR%%/icons/appl/default/find_22x22.png
%%DATADIR%%/icons/appl/default/find_32x32.png
+%%DATADIR%%/icons/appl/default/flag_belarus.png
%%DATADIR%%/icons/appl/default/flag_bosnia.png
%%DATADIR%%/icons/appl/default/flag_brazil.png
%%DATADIR%%/icons/appl/default/flag_britain.png
@@ -70,7 +131,8 @@
%%DATADIR%%/icons/appl/default/globe.png
%%DATADIR%%/icons/appl/default/gui.png
%%DATADIR%%/icons/appl/default/help.png
-%%DATADIR%%/icons/appl/default/icon_22x22.png
+%%DATADIR%%/icons/appl/default/icon_appl.png
+%%DATADIR%%/icons/appl/default/icon_msg.png
%%DATADIR%%/icons/appl/default/icons.png
%%DATADIR%%/icons/appl/default/info.png
%%DATADIR%%/icons/appl/default/inotify.png
@@ -86,6 +148,7 @@
%%DATADIR%%/icons/appl/default/player_pause.png
%%DATADIR%%/icons/appl/default/player_play.png
%%DATADIR%%/icons/appl/default/quickoptions.png
+%%DATADIR%%/icons/appl/default/reconnect.png
%%DATADIR%%/icons/appl/default/reload.png
%%DATADIR%%/icons/appl/default/reload_22x22.png
%%DATADIR%%/icons/appl/default/reload_32x32.png
@@ -132,28 +195,11 @@
%%DATADIR%%/icons/emot/simple-gnome/simple-gnome.png
%%DATADIR%%/icons/user/default/usericons.png
%%DATADIR%%/icons/user/valknut/usericons.png
-%%DATADIR%%/translation/eiskaltdc.bs.qm
-%%DATADIR%%/translation/eiskaltdc.cs.qm
-%%DATADIR%%/translation/eiskaltdc.da.qm
+%%DATADIR%%/translation/eiskaltdc.be.qm
%%DATADIR%%/translation/eiskaltdc.de.qm
-%%DATADIR%%/translation/eiskaltdc.el.qm
%%DATADIR%%/translation/eiskaltdc.en.qm
-%%DATADIR%%/translation/eiskaltdc.es.qm
-%%DATADIR%%/translation/eiskaltdc.fi.qm
%%DATADIR%%/translation/eiskaltdc.fr.qm
-%%DATADIR%%/translation/eiskaltdc.hu.qm
-%%DATADIR%%/translation/eiskaltdc.is.qm
-%%DATADIR%%/translation/eiskaltdc.it.qm
-%%DATADIR%%/translation/eiskaltdc.lv.qm
-%%DATADIR%%/translation/eiskaltdc.nb.qm
-%%DATADIR%%/translation/eiskaltdc.nl.qm
-%%DATADIR%%/translation/eiskaltdc.pl.qm
-%%DATADIR%%/translation/eiskaltdc.pt_br.qm
-%%DATADIR%%/translation/eiskaltdc.ro.qm
%%DATADIR%%/translation/eiskaltdc.ru.qm
-%%DATADIR%%/translation/eiskaltdc.sr.qm
-%%DATADIR%%/translation/eiskaltdc.sr@latin.qm
-%%DATADIR%%/translation/eiskaltdc.sv.qm
share/icons/hicolor/128x128/apps/eiskaltdc.png
share/icons/hicolor/16x16/apps/eiskaltdc.png
share/icons/hicolor/22x22/apps/eiskaltdc.png
@@ -194,3 +240,4 @@
@dirrm %%DATADIR%%/icons/appl
@dirrm %%DATADIR%%/icons
@dirrm %%DATADIR%%
+@dirrm include/eiskaltdc
Index: net-p2p/eiskaltdc/files/patch-dcfilebrowser.cpp
===================================================================
RCS file: /home/ncvs/ports/net-p2p/eiskaltdc/files/patch-dcfilebrowser.cpp,v
retrieving revision 1.1
diff -u -r1.1 patch-dcfilebrowser.cpp
--- net-p2p/eiskaltdc/files/patch-dcfilebrowser.cpp 10 Sep 2009 09:09:03 -0000 1.1
+++ net-p2p/eiskaltdc/files/patch-dcfilebrowser.cpp 6 Nov 2009 06:52:07 -0000
@@ -1,11 +1,10 @@
---- eiskaltdc/dcfilebrowser.cpp.orig 2009-08-28 10:26:38.000000000 +0700
-+++ eiskaltdc/dcfilebrowser.cpp 2009-08-28 10:26:57.000000000 +0700
-@@ -37,7 +37,7 @@
+--- ./eiskaltdc/dcfilebrowser.cpp.orig 2009-08-28 10:26:38.000000000 +0700
++++ ./eiskaltdc/dcfilebrowser.cpp 2009-08-28 10:26:57.000000000 +0700
+@@ -36,6 +36,7 @@
+ #include <QColor>
#include <set>
-
--#include <malloc.h>
+#include <stdlib.h>
-
- #include "dcmenuhandler.h"
- #include "dcconfig.h"
+ #ifdef HAVE_MALLOC_H
+ #include <malloc.h>
+ #endif
Index: net-p2p/eiskaltdc/files/patch-dcinotify.cpp
===================================================================
RCS file: /home/ncvs/ports/net-p2p/eiskaltdc/files/patch-dcinotify.cpp,v
retrieving revision 1.1
diff -u -r1.1 patch-dcinotify.cpp
--- net-p2p/eiskaltdc/files/patch-dcinotify.cpp 10 Sep 2009 09:09:03 -0000 1.1
+++ net-p2p/eiskaltdc/files/patch-dcinotify.cpp 6 Nov 2009 06:52:16 -0000
@@ -1,5 +1,5 @@
---- eiskaltdc/dcinotify.cpp.orig 2009-09-01 09:45:17.000000000 +0700
-+++ eiskaltdc/dcinotify.cpp 2009-09-01 09:46:21.000000000 +0700
+--- ./eiskaltdc/dcinotify.cpp.orig 2009-09-01 09:45:17.000000000 +0700
++++ ./eiskaltdc/dcinotify.cpp 2009-09-01 09:46:21.000000000 +0700
@@ -2,7 +2,201 @@
#include "dcinotify.h"
Index: net-p2p/eiskaltdc/files/patch-eiskaltdc__docs__en__Makefile.in
===================================================================
RCS file: /home/ncvs/ports/net-p2p/eiskaltdc/files/patch-eiskaltdc__docs__en__Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 patch-eiskaltdc__docs__en__Makefile.in
--- net-p2p/eiskaltdc/files/patch-eiskaltdc__docs__en__Makefile.in 10 Sep 2009 09:09:03 -0000 1.1
+++ net-p2p/eiskaltdc/files/patch-eiskaltdc__docs__en__Makefile.in 6 Nov 2009 00:20:11 -0000
@@ -1,11 +1,11 @@
--- ./eiskaltdc/docs/en/Makefile.in.orig 2009-08-25 22:23:16.000000000 +0400
+++ ./eiskaltdc/docs/en/Makefile.in 2009-09-09 21:46:47.000000000 +0400
-@@ -371,8 +371,6 @@
+@@ -349,8 +349,6 @@
uninstall uninstall-am
install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(mandir)/man1/
-- $(INSTALL_DATA) $(srcdir)/valknut.1 $(DESTDIR)$(mandir)/man1/
-
+- $(INSTALL_DATA) $(srcdir)/eiskaltdc.1 $(DESTDIR)$(mandir)/man1/
# 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:
--- /dev/null 1970-01-01 10:00:00.000000000 +1000
+++ net-p2p/eiskaltdc/files/patch-CMakeLists.txt 2009-11-06 18:10:09.000000000 +1000
@@ -0,0 +1,33 @@
+--- ./eiskaltdc/CMakeLists.txt.orig 2009-10-23 02:33:43.000000000 +1100
++++ ./eiskaltdc/CMakeLists.txt 2009-11-06 16:51:20.000000000 +1000
+@@ -384,7 +384,7 @@
+ )
+ MESSAGE (STATUS "Build svn revision: ${SVNVERSION}")
+ ENDIF (NOT DEFINED SVNVERSION)
+-#CONFIGURE_FILE(eiskaltdc-1.1.0.pc.cmake.in ${CMAKE_BINARY_DIR}/eiskaltdc-1.1.0.pc)
++CONFIGURE_FILE(eiskaltdc-1.1.0.pc.cmake.in ${CMAKE_BINARY_DIR}/eiskaltdc-1.1.0.pc)
+ CONFIGURE_FILE (${PROJECT_SOURCE_DIR}/config.h.in ${PROJECT_SOURCE_DIR}/config.h)
+ # actual targets:
+ IF (UNIX)
+@@ -447,9 +447,9 @@
+ INSTALL (DIRECTORY icons/appl icons/emot icons/user DESTINATION ${EISKALT_ICONS_DEST} PATTERN ".svn" EXCLUDE)
+ INSTALL (FILES ${FLAG} DESTINATION ${EISKALT_ICONS_DEST}/appl/default )
+ INSTALL (DIRECTORY sounds/ DESTINATION ${EISKALT_SOUNDS_DEST} PATTERN ".svn" EXCLUDE
+- PATTERN "Makefile.am" EXCLUDE)
++ PATTERN "Makefile.am" EXCLUDE PATTERN "Makefile.in" EXCLUDE)
+ INSTALL (FILES ../COPYING DESTINATION share/eiskaltdc)
+- #INSTALL (FILES ${HDRS} ${hdrs} DESTINATION include/eiskaltdc)
++ INSTALL (FILES ${HDRS} ${hdrs} DESTINATION include/eiskaltdc)
+ INSTALL (FILES icons/icon_128x128.png DESTINATION share/icons/hicolor/128x128/apps RENAME eiskaltdc.png)
+ INSTALL (FILES icons/icon_64x64.png DESTINATION share/icons/hicolor/64x64/apps RENAME eiskaltdc.png)
+ INSTALL (FILES icons/icon_32x32.png DESTINATION share/icons/hicolor/32x32/apps RENAME eiskaltdc.png)
+@@ -460,7 +460,7 @@
+ INSTALL (FILES icons/icon_128x128.png DESTINATION share/pixmaps/ RENAME eiskaltdc.png)
+ IF (UNIX)
+ INSTALL (FILES ../eiskaltdc.desktop DESTINATION share/applications RENAME eiskaltdc.desktop)
+- INSTALL (FILES docs/en/eiskaltdc.1.gz DESTINATION share/man/man1)
+- #INSTALL (FILES ${CMAKE_BINARY_DIR}/eiskaltdc-1.1.0.pc DESTINATION include/pkgconfig)
++ INSTALL (FILES docs/en/eiskaltdc.1.gz DESTINATION man/man1)
++ INSTALL (FILES ${CMAKE_BINARY_DIR}/eiskaltdc-1.1.0.pc DESTINATION libdata/pkgconfig)
+ ENDIF (UNIX)
+
--- eiskaltdc.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1257507825.81503>