Attachment #119379 for bug #161898

View | Details | Raw Unified | Return to bug 161898
Collapse All | Expand All




# New ports collection makefile for: net-p2p/eiskaltdcpp-cli
# Date created:		06 Oct @011
# Whom:			Maxim Ignatenko <gelraen.ua@gmail.com>
#
# $FreeBSD$
#

PORTNAME=	eiskaltdcpp-cli
PORTVERSION=	2.2.4
CATEGORIES=	net-p2p
MASTER_SITES=	GOOGLE_CODE
DISTNAME=	eiskaltdcpp-${DISTVERSION}

MAINTAINER=	gelraen.ua@gmail.com
COMMENT=	Shared data for EiskaltDC++ GUIs

PROJECTHOST=	eiskaltdc

LICENSE=	GPLv3

USE_XZ=	yes
NO_BUILD=	yes
USE_PERL5_RUN=	yes

MAN1=	${PORTNAME}.1
MANCOMPRESSED=	no

RUN_DEPENDS=	p5-RPC-XML>=0:${PORTSDIR}/net/p5-RPC-XML \
    	p5-Term-ShellUI>=0:${PORTSDIR}/shells/p5-Term-ShellUI

do-install:
	@${INSTALL_SCRIPT} "${WRKSRC}/${PORTNAME}/cli.pl" "${PREFIX}/bin/eiskaltdcpp-cli"
	@${INSTALL_MAN} "${WRKSRC}/${PORTNAME}/eiskaltdcpp-cli.1" "${PREFIX}/man/man1/"
	@${MKDIR} "${PREFIX}/etc/eiskaltdcpp" || true
	@${INSTALL_DATA} "${WRKSRC}/${PORTNAME}/config.pl" "${PREFIX}/etc/eiskaltdcpp/config.pl.dist"
	@if [ ! -e "${PREFIX}/etc/eiskaltdcpp/config.pl" ]; then \
		${CP} -v "${PREFIX}/etc/eiskaltdcpp/config.pl.dist" \
			"${PREFIX}/etc/eiskaltdcpp/config.pl"; \
	fi	

.include <bsd.port.mk>

Added Link Here

(-)b/net-p2p/eiskaltdcpp-cli/distinfo (+2 lines)
1	SHA256 (eiskaltdcpp-2.2.4.tar.xz) = a14d44ad1c48dc97354e17d3d8d8fc9bdd7be646d275603d092c6d9ebf7061b4
2	SIZE (eiskaltdcpp-2.2.4.tar.xz) = 2008920




--- ./eiskaltdcpp-cli/cli.pl.orig	2011-10-02 18:12:43.000000000 +0300
+++ ./eiskaltdcpp-cli/cli.pl	2011-10-06 09:30:39.000000000 +0300
@@ -36,8 +36,7 @@
     unshift @INC, 
 	 "$XDG_CONFIG_HOME/eiskaltdc++",
 	 "~/.config/eiskaltdc++/",
-	 "/usr/local/share/eiskaltdcpp/cli",
-	 "/usr/share/eiskaltdcpp/cli"
+	 "/usr/local/etc/eiskaltdcpp"
 }
 
 # preparing terminal

Added Link Here

(-)b/net-p2p/eiskaltdcpp-cli/files/patch-eiskaltdcpp-cli__eiskaltdcpp-cli.1 (+11 lines)
1	--- ./eiskaltdcpp-cli/eiskaltdcpp-cli.1.orig 2011-10-06 09:31:09.000000000 +0300
2	+++ ./eiskaltdcpp-cli/eiskaltdcpp-cli.1 2011-10-06 09:32:23.000000000 +0300
3	@@ -29,7 +29,7 @@
4	.B "~/.config/eiskaltdc++/" or "$XDG_CONFIG_HOME/eiskaltdc++/"
5	Directory with user configuration files and logs
6	.TP
7	-.B "/usr/local/share/eiskaltdcpp/cli/" or "/usr/share/eiskaltdcpp/cli/"
8	+.B "/usr/local/etc/eiskaltdcpp/"
9	Directory with default configuration file
10	.SH "DOCUMENTATION"
11	.TP

Added Link Here

(-)b/net-p2p/eiskaltdcpp-cli/pkg-descr (+8 lines)
1	EiskaltDC++ is a cross-platform program that uses the Direct Connect
2	and ADC protocol. It is compatible with other DC clients, such as the
3	original DC from Neomodus, DC++ and derivatives. EiskaltDC++ also
4	interoperates with all common DC hub software.
5
6	This port contains XMLRPC CLI client for EiskaltDC++ daemon.
7
8	WWW: http://code.google.com/p/eiskaltdc/

Added Link Here

(-)b/net-p2p/eiskaltdcpp-cli/pkg-plist (+3 lines)
1	bin/eiskaltdcpp-cli
2	etc/eiskaltdcpp/config.pl.dist
3	@dirrmtry etc/eiskaltdcpp

Lines 6-12 Link Here

(-)b/net-p2p/eiskaltdcpp-daemon/Makefile (-2 / +15 lines)
6	#	6	#
7		7
8	PORTNAME= eiskaltdcpp-daemon	8	PORTNAME= eiskaltdcpp-daemon
9	PORTVERSION= 2.2.1	9	PORTVERSION= 2.2.4
10	CATEGORIES= net-p2p	10	CATEGORIES= net-p2p
11	MASTER_SITES= GOOGLE_CODE	11	MASTER_SITES= GOOGLE_CODE
12	DISTNAME= eiskaltdcpp-${DISTVERSION}	12	DISTNAME= eiskaltdcpp-${DISTVERSION}
Lines 21-32 LIB_DEPENDS+= eiskaltdcpp:${PORTSDIR}/net-p2p/eiskaltdcpp-lib Link Here
21	PROJECTHOST= eiskaltdc	21	PROJECTHOST= eiskaltdc
22		22
23	USE_XZ= yes	23	USE_XZ= yes
24	USE_GCC= 4.2+	24	USE_GCC= 4.4+
25	USE_GETTEXT= yes	25	USE_GETTEXT= yes
26	USE_CMAKE= yes	26	USE_CMAKE= yes
27	USE_OPENSSL= yes	27	USE_OPENSSL= yes
28	MAKE_JOBS_SAFE= yes	28	MAKE_JOBS_SAFE= yes
29		29
		30	OPTIONS= XMLRPC "XMLRPC interface support" on
		31
30	MAN1= ${PORTNAME}.1	32	MAN1= ${PORTNAME}.1
31	MANCOMPRESSED= yes	33	MANCOMPRESSED= yes
32		34
Lines 38-49 CMAKE_ARGS+= -DUSE_QT:BOOL=OFF Link Here
38	CMAKE_ARGS+= -DUSE_GTK:BOOL=OFF	40	CMAKE_ARGS+= -DUSE_GTK:BOOL=OFF
39	CMAKE_ARGS+= -DNO_UI_DAEMON:BOOL=ON	41	CMAKE_ARGS+= -DNO_UI_DAEMON:BOOL=ON
40	CMAKE_ARGS+= -DEISKALTDCPP_INCLUDE_DIR:STRING="${LOCALBASE}/include/eiskaltdcpp"	42	CMAKE_ARGS+= -DEISKALTDCPP_INCLUDE_DIR:STRING="${LOCALBASE}/include/eiskaltdcpp"
		43	CMAKE_ARGS+= -DUSE_IDNA:BOOL=OFF
41	CMAKE_ARGS+= -DCREATE_MO:BOOL=OFF	44	CMAKE_ARGS+= -DCREATE_MO:BOOL=OFF
42	CMAKE_ARGS+= -DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib:${PREFIX}/lib"	45	CMAKE_ARGS+= -DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib:${PREFIX}/lib"
		46	CMAKE_ARGS+= -DCMAKE_SKIP_RPATH:BOOL=ON
43		47
44	BUILD_WRKSRC= ${WRKSRC}/nasdc	48	BUILD_WRKSRC= ${WRKSRC}/nasdc
45	INSTALL_WRKSRC= ${WRKSRC}/nasdc	49	INSTALL_WRKSRC= ${WRKSRC}/nasdc
46		50
		51	.include <bsd.port.options.mk>
		52
		53	.if defined(WITH_XMLRPC) && !defined(WITHOUT_XMLRPC)
		54	LIB_DEPENDS+= xmlrpc++:${PORTSDIR}/net/xmlrpc-c-devel
		55	CMAKE_ARGS+= -DXMLRPC_DAEMON:BOOL=ON
		56	.else
		57	CMAKE_ARGS+= -DXMLRPC_DAEMON:BOOL=OFF
		58	.endif
		59
47	.include <bsd.port.pre.mk>	60	.include <bsd.port.pre.mk>
48		61
49	.if ${OSVERSION} < 700024	62	.if ${OSVERSION} < 700024

Lines 1-2 Link Here

(-)b/net-p2p/eiskaltdcpp-daemon/distinfo (-2 / +2 lines)
1	SHA256 (eiskaltdcpp-2.2.1.tar.xz) = 2b2bd627a1325c595f604766404ca4f4787db1b49b4b0c5c5d8e88ddfc2a2c40	1	SHA256 (eiskaltdcpp-2.2.4.tar.xz) = a14d44ad1c48dc97354e17d3d8d8fc9bdd7be646d275603d092c6d9ebf7061b4
2	SIZE (eiskaltdcpp-2.2.1.tar.xz) = 1916680	2	SIZE (eiskaltdcpp-2.2.4.tar.xz) = 2008920




--- CMakeLists.txt.orig	2011-10-02 18:12:43.000000000 +0300
+++ CMakeLists.txt	2011-10-03 10:40:18.000000000 +0300
@@ -370,16 +370,14 @@
     else (MINGW)
         set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
     endif (MINGW)
-    if (NOT APPLE)
-        set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,--as-needed")

    ${eiskaltdcpp_SOURCE_DIR}
    ${GMP_INCLUDE_DIR}
    )
@@ -451,7 +449,9 @@
   add_subdirectory (dht)
 endif (WITH_DHT)
 
-add_subdirectory (dcpp)
+if (BUILD_LIB)

 
 if (USE_QT)
   add_subdirectory (eiskaltdcpp-qt)
@@ -443,11 +443,11 @@
       LOCALE_LIST "${LANGUAGES}"
       COPYRIGHT_HOLDER "EiskaltDC++ team"
       SOURCES "${DCPP_SRCS};${DCPP_HDRS}"
-      PO_DIR "${dcpp_SOURCE_DIR}/po"
-      POT_BUILD_DIR "${dcpp_SOURCE_DIR}/po"
+      PO_DIR "${PROJECT_SOURCE_DIR}/po"
+      POT_BUILD_DIR "${PROJECT_SOURCE_DIR}/po"
       #PO_PREFIX    ""
-      PO_BUILD_DIR "${dcpp_SOURCE_DIR}/po"
-      MO_BUILD_DIR "${dcpp_BINARY_DIR}/locale"
+      PO_BUILD_DIR "${PROJECT_SOURCE_DIR}/po"
+      MO_BUILD_DIR "${PROJECT_BINARY_DIR}/locale"
       MO_INSTALL_DIR "/${LOCALE_DIR}"
       CREATE_POT_TARGET ${create_pot}
       CREATE_PO_TARGET ${create_po}




--- ./cmake/CMakeLists.txt.orig	2011-10-02 18:12:43.000000000 +0300
+++ ./cmake/CMakeLists.txt	2011-10-10 11:10:30.000000000 +0300
@@ -37,12 +37,14 @@
 
 endmacro(GET_RELATIVE_SOURCES)
 
+if (BUILD_LIB)
 get_absolute_sources(abs_dcpp_sources "${DCPP_SRCS};${DCPP_HDRS}")
 get_relative_sources(rel_dcpp_sources "${dcpp_SOURCE_DIR}/po" "${abs_dcpp_sources}")
 file(MAKE_DIRECTORY "${dcpp_BINARY_DIR}/po")
 set(dcpp_files_from "${dcpp_BINARY_DIR}/po/libeiskaltdcpp_srcs.txt")
 string(REGEX REPLACE ";" "\n" dcpp_contents "${rel_dcpp_sources}")
 file(WRITE "${dcpp_files_from}" "${dcpp_contents}")
+endif (BUILD_LIB)
 
 if (USE_GTK)
 get_absolute_sources(abs_gtk_cpp_sources "${GTK_SRCS};${GTK_HDRS}")
@@ -163,6 +165,7 @@
 			# if the po file doesn't exist. The case where a po file used to
 			# exist and no longer exists should never occur
 
+			if (BUILD_LIB)
 			if(NOT EXISTS ${dcpp_SOURCE_DIR}/po/${LANG}.po)
 				add_custom_command(
 					OUTPUT ${dcpp_SOURCE_DIR}/po/${LANG}.po
@@ -194,6 +197,7 @@
 				WORKING_DIRECTORY ${dcpp_SOURCE_DIR}/po
 				COMMENT "pot-update [dcpp-${LANG}]: Updated po file."
 			)
+			endif (BUILD_LIB)
 
 			if (USE_GTK)
 			if(NOT EXISTS ${eiskaltdcpp-gtk_SOURCE_DIR}/po/${LANG}.po)
@@ -231,15 +235,19 @@
 			SET(pot-update-SRC ${pot-update-SRC} ${eiskaltdcpp-gtk_SOURCE_DIR}/po/${LANG}.po.dummy )
 			endif (USE_GTK)
 
+			if (BUILD_LIB)
 			SET(pot-update-SRC ${pot-update-SRC} ${dcpp_SOURCE_DIR}/po/${LANG}.po.dummy)
+			endif (BUILD_LIB)
 		endforeach(LANG ${LANGUAGES})
 
 		# Add to target list
+		if (BUILD_LIB)
 		SET(pot-update-SRC
 			${pot-update-SRC}
 			${dcpp_SOURCE_DIR}/po/libeiskaltdcpp.pot # should depend on languages
 
 		)
+		endif (BUILD_LIB)
 		if (USE_GTK)
 		SET(pot-update-SRC
 			${pot-update-SRC}
@@ -329,6 +337,7 @@
 
 	foreach(LANG ${LANGUAGES})
 
+		if (BUILD_LIB)
 			add_custom_command(
 				OUTPUT ${dcpp_BINARY_DIR}/locale/${LANG}/LC_MESSAGES
 				COMMAND ${CMAKE_COMMAND} -E make_directory
@@ -346,6 +355,7 @@
 				WORKING_DIRECTORY ${dcpp_SOURCE_DIR}/po
 				COMMENT "mo-update [dcpp-${LANG}]: Creating mo file."
 			)
+			endif (BUILD_LIB)
 			if (USE_GTK)
 			add_custom_command(
 				OUTPUT ${eiskaltdcpp-gtk_BINARY_DIR}/locale/${LANG}/LC_MESSAGES
@@ -377,6 +387,7 @@
 			)
 			endif (USE_GTK)
 
+			if (BUILD_LIB)
 			install(FILES
 			    ${dcpp_BINARY_DIR}/locale/${LANG}/LC_MESSAGES/libeiskaltdcpp.mo
 					DESTINATION ${LOCALE_DIR}/${LANG}/LC_MESSAGES)
@@ -387,6 +398,7 @@
 			set(mo-update-LANG-SRC ${mo-update-LANG-SRC}
 			    ${dcpp_BINARY_DIR}/locale/${LANG}/LC_MESSAGES/libeiskaltdcpp.mo
 			)
+			endif (BUILD_LIB)
 
 		if(UPDATE_PO)
 			add_custom_target(mo-update-${LANG}




--- nasdc/CMakeLists.txt.orig	2011-10-02 18:12:43.000000000 +0300
+++ nasdc/CMakeLists.txt	2011-10-03 10:51:06.000000000 +0300
@@ -49,7 +49,16 @@
                 ${nasdc_SRCS}
                 )
 
-target_link_libraries (nasdc dcpp ${XMLRPCLIBS})
+if (BUILD_LIB)
+      set(DCPP_LIB dcpp)
+else (BUILD_LIB)
+      find_library(DCPP_LIB eiskaltdcpp)
+      if (DCPP_LIB)
+              message(STATUS "EiskaltDC++ shared library found at ${DCPP_LIB}")
+      endif (DCPP_LIB)
+endif (BUILD_LIB)
+
+target_link_libraries (nasdc ${DCPP_LIB} ${XMLRPCLIBS})
 
 if (UNIX)
  set (BINDIR bin)
@@ -81,5 +90,5 @@
 if (APPLE)
   install (FILES ${PROJECT_BINARY_DIR}/eiskaltdcpp-daemon.1.gz DESTINATION ${PROJECT_NAME_GLOBAL}.app/man/man1)
 elseif (UNIX AND NOT APPLE)




--- ./nasdc/nasdc.cpp.orig	2011-03-08 19:47:12.000000000 +0200
+++ ./nasdc/nasdc.cpp	2011-03-10 19:49:48.000000000 +0200
@@ -23,7 +23,6 @@
 #ifndef _WIN32
 #include <syslog.h>
 #include <signal.h>
-#include "extra/stacktrace.h"
 #endif
 
 #ifdef CLI_DAEMON
@@ -237,9 +236,6 @@
     temp = (char *)NULL;
     prompt = "edcppd$ ";
 #endif
-#ifndef _WIN32
-    signal(SIGSEGV, printBacktrace);
-#endif
     while (bServerRunning) {
         Thread::sleep(1);
         #ifdef CLI_DAEMON

Lines 6-12 Link Here

(-)b/net-p2p/eiskaltdcpp-data/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= eiskaltdcpp-data	8	PORTNAME= eiskaltdcpp-data
9	PORTVERSION= 2.2.1	9	PORTVERSION= 2.2.4
10	CATEGORIES= net-p2p	10	CATEGORIES= net-p2p
11	MASTER_SITES= GOOGLE_CODE	11	MASTER_SITES= GOOGLE_CODE
12	DISTNAME= eiskaltdcpp-${DISTVERSION}	12	DISTNAME= eiskaltdcpp-${DISTVERSION}

Lines 1-2 Link Here

(-)b/net-p2p/eiskaltdcpp-data/distinfo (-2 / +2 lines)
1	SHA256 (eiskaltdcpp-2.2.1.tar.xz) = 2b2bd627a1325c595f604766404ca4f4787db1b49b4b0c5c5d8e88ddfc2a2c40	1	SHA256 (eiskaltdcpp-2.2.4.tar.xz) = a14d44ad1c48dc97354e17d3d8d8fc9bdd7be646d275603d092c6d9ebf7061b4
2	SIZE (eiskaltdcpp-2.2.1.tar.xz) = 1916680	2	SIZE (eiskaltdcpp-2.2.4.tar.xz) = 2008920




#

PORTNAME=	eiskaltdcpp-gtk
PORTVERSION=	2.2.4
CATEGORIES=	net-p2p
MASTER_SITES=	GOOGLE_CODE
DISTNAME=	eiskaltdcpp-${DISTVERSION}

PROJECTHOST=	eiskaltdc

USE_XZ=		yes
USE_GCC=	4.4+
USE_CMAKE=	yes
USE_GETTEXT=	yes
USE_OPENSSL=	yes

		LIBGNOME2	"Sound notification support"	off \
		LIBNOTIFY	"Popup notification support"	on

USE_GNOME=	pango gtk20 glib20

CMAKE_ARGS+=	-DUSE_QT:BOOL=OFF
CMAKE_ARGS+=	-DUSE_GTK:BOOL=ON
CMAKE_ARGS+=	-DEISKALTDCPP_INCLUDE_DIR:STRING="${LOCALBASE}/include/eiskaltdcpp"
CMAKE_ARGS+=	-DCREATE_MO:BOOL=ON
CMAKE_ARGS+=	-DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib:${PREFIX}/lib"
CMAKE_ARGS+=    -DCMAKE_SKIP_RPATH:BOOL=ON
CMAKE_ARGS+=	-DINSTALL_DATA:BOOL=OFF
INSTALL_WRKSRC=	${WRKSRC}/${PORTNAME}

.include <bsd.port.options.mk>


Lines 1-2 Link Here

(-)b/net-p2p/eiskaltdcpp-gtk/distinfo (-2 / +2 lines)
1	SHA256 (eiskaltdcpp-2.2.1.tar.xz) = 2b2bd627a1325c595f604766404ca4f4787db1b49b4b0c5c5d8e88ddfc2a2c40	1	SHA256 (eiskaltdcpp-2.2.4.tar.xz) = a14d44ad1c48dc97354e17d3d8d8fc9bdd7be646d275603d092c6d9ebf7061b4
2	SIZE (eiskaltdcpp-2.2.1.tar.xz) = 1916680	2	SIZE (eiskaltdcpp-2.2.4.tar.xz) = 2008920




--- ./CMakeLists.txt.orig	2011-10-02 18:12:43.000000000 +0300
+++ ./CMakeLists.txt	2011-10-10 11:16:46.000000000 +0300
@@ -212,14 +212,14 @@
 
     if (USE_LIBGNOME2)
         message (STATUS "Building with LibGnome2 support")

     else (USE_LIBNOTIFY)
         message (STATUS "Building without libnotify support")
     endif (USE_LIBNOTIFY)
@@ -370,16 +370,14 @@
     else (MINGW)
         set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
     endif (MINGW)
-    if (NOT APPLE)
-        set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,--as-needed")

    ${eiskaltdcpp_SOURCE_DIR}
    ${GMP_INCLUDE_DIR}
    )
@@ -451,7 +449,9 @@
   add_subdirectory (dht)
 endif (WITH_DHT)
 
-add_subdirectory (dcpp)
+if (BUILD_LIB)

 
 if (USE_QT)
   add_subdirectory (eiskaltdcpp-qt)
@@ -482,7 +482,7 @@
     add_subdirectory(cmake)
 endif(GETTEXT_FOUND)
 
-if (USE_QT OR USE_GTK)
+if (INSTALL_DATA AND (USE_QT OR USE_GTK))
 
     if (WITH_EXAMPLES)
         install (DIRECTORY examples/ DESTINATION ${CLIENT_DATA_DIR}/examples
@@ -524,4 +524,4 @@
     install (FILES icons/icon_128x128.png DESTINATION ${SHARE_DIR}/pixmaps/ RENAME eiskaltdcpp.png)
   endif (NOT HAIKU)
 endif (APPLE)
-endif (USE_QT OR USE_GTK)
+endif (INSTALL_DATA AND (USE_QT OR USE_GTK))
       CREATE_PO_TARGET ${create_po}




--- ./cmake/CMakeLists.txt.orig	2011-10-02 18:12:43.000000000 +0300
+++ ./cmake/CMakeLists.txt	2011-10-10 11:10:30.000000000 +0300
@@ -37,12 +37,14 @@
 
 endmacro(GET_RELATIVE_SOURCES)
 
+if (BUILD_LIB)
 get_absolute_sources(abs_dcpp_sources "${DCPP_SRCS};${DCPP_HDRS}")
 get_relative_sources(rel_dcpp_sources "${dcpp_SOURCE_DIR}/po" "${abs_dcpp_sources}")
 file(MAKE_DIRECTORY "${dcpp_BINARY_DIR}/po")
 set(dcpp_files_from "${dcpp_BINARY_DIR}/po/libeiskaltdcpp_srcs.txt")
 string(REGEX REPLACE ";" "\n" dcpp_contents "${rel_dcpp_sources}")
 file(WRITE "${dcpp_files_from}" "${dcpp_contents}")
+endif (BUILD_LIB)
 
 if (USE_GTK)
 get_absolute_sources(abs_gtk_cpp_sources "${GTK_SRCS};${GTK_HDRS}")
@@ -163,6 +165,7 @@
 			# if the po file doesn't exist. The case where a po file used to
 			# exist and no longer exists should never occur
 
+			if (BUILD_LIB)
 			if(NOT EXISTS ${dcpp_SOURCE_DIR}/po/${LANG}.po)
 				add_custom_command(
 					OUTPUT ${dcpp_SOURCE_DIR}/po/${LANG}.po
@@ -194,6 +197,7 @@
 				WORKING_DIRECTORY ${dcpp_SOURCE_DIR}/po
 				COMMENT "pot-update [dcpp-${LANG}]: Updated po file."
 			)
+			endif (BUILD_LIB)
 
 			if (USE_GTK)
 			if(NOT EXISTS ${eiskaltdcpp-gtk_SOURCE_DIR}/po/${LANG}.po)
@@ -231,15 +235,19 @@
 			SET(pot-update-SRC ${pot-update-SRC} ${eiskaltdcpp-gtk_SOURCE_DIR}/po/${LANG}.po.dummy )
 			endif (USE_GTK)
 
+			if (BUILD_LIB)
 			SET(pot-update-SRC ${pot-update-SRC} ${dcpp_SOURCE_DIR}/po/${LANG}.po.dummy)
+			endif (BUILD_LIB)
 		endforeach(LANG ${LANGUAGES})
 
 		# Add to target list
+		if (BUILD_LIB)
 		SET(pot-update-SRC
 			${pot-update-SRC}
 			${dcpp_SOURCE_DIR}/po/libeiskaltdcpp.pot # should depend on languages
 
 		)
+		endif (BUILD_LIB)
 		if (USE_GTK)
 		SET(pot-update-SRC
 			${pot-update-SRC}
@@ -329,6 +337,7 @@
 
 	foreach(LANG ${LANGUAGES})
 
+		if (BUILD_LIB)
 			add_custom_command(
 				OUTPUT ${dcpp_BINARY_DIR}/locale/${LANG}/LC_MESSAGES
 				COMMAND ${CMAKE_COMMAND} -E make_directory
@@ -346,6 +355,7 @@
 				WORKING_DIRECTORY ${dcpp_SOURCE_DIR}/po
 				COMMENT "mo-update [dcpp-${LANG}]: Creating mo file."
 			)
+			endif (BUILD_LIB)
 			if (USE_GTK)
 			add_custom_command(
 				OUTPUT ${eiskaltdcpp-gtk_BINARY_DIR}/locale/${LANG}/LC_MESSAGES
@@ -377,6 +387,7 @@
 			)
 			endif (USE_GTK)
 
+			if (BUILD_LIB)
 			install(FILES
 			    ${dcpp_BINARY_DIR}/locale/${LANG}/LC_MESSAGES/libeiskaltdcpp.mo
 					DESTINATION ${LOCALE_DIR}/${LANG}/LC_MESSAGES)
@@ -387,6 +398,7 @@
 			set(mo-update-LANG-SRC ${mo-update-LANG-SRC}
 			    ${dcpp_BINARY_DIR}/locale/${LANG}/LC_MESSAGES/libeiskaltdcpp.mo
 			)
+			endif (BUILD_LIB)
 
 		if(UPDATE_PO)
 			add_custom_target(mo-update-${LANG}




--- ./eiskaltdcpp-gtk/CMakeLists.txt.orig	2011-10-02 18:12:43.000000000 +0300
+++ ./eiskaltdcpp-gtk/CMakeLists.txt	2011-10-10 11:10:30.000000000 +0300
@@ -12,7 +12,7 @@
 set (GTK_SRCS @gtk_srcs@ PARENT_SCOPE)
 set (GTK_HDRS @gtk_hdrs@ PARENT_SCOPE)
 set (GTK_UI   @gtk_ui@   PARENT_SCOPE)
-set (GTHREAD "-lgthread-2.0")
+find_library (GTHREAD "gthread-2.0")
 
 if (USE_GTK)
     set(GTK_INCLUDE_DIRS ${GTK2_INCLUDE_DIRS})
@@ -44,6 +44,10 @@
   list (APPEND LIBS ${LUA_LIBRARIES})
 endif (LUA_SCRIPT)
 
+if (USE_MINIUPNP OR FREE_SPACE_BAR_C)

 add_executable (eiskaltdcpp-gtk MACOSX_BUNDLE WIN32
                 ${gtk_srcs}
                 )
@@ -90,10 +94,19 @@
   add_definitions(-DCLIENT_RES_DIR="${CLIENT_DATA_DIR}/gtk/resources")
 endif (APPLE)
 

 endif (APPLE)
 
 if (UNIX)
@@ -131,6 +144,6 @@
 else (APPLE)
   if (UNIX)
     install (FILES eiskaltdcpp-gtk.desktop DESTINATION ${SHARE_DIR}/applications)




--- ./eiskaltdcpp-gtk/src/wulfor.cc.orig	2011-03-10 16:43:57.000000000 +0200
+++ ./eiskaltdcpp-gtk/src/wulfor.cc	2011-03-10 16:44:22.000000000 +0200
@@ -37,7 +37,6 @@
 #define GUI_PACKAGE "eiskaltdcpp-gtk"
 
 #include "VersionGlobal.h"
-#include "extra/stacktrace.h"
 
 void printHelp()
 {
@@ -135,7 +134,6 @@
     g_set_application_name("EiskaltDC++ Gtk");
 
     signal(SIGPIPE, SIG_IGN);
-    signal(SIGSEGV, printBacktrace);
 
     WulforSettingsManager::newInstance();
     WulforManager::start(argc, argv);




bin/eiskaltdcpp-gtk
share/applications/eiskaltdcpp-gtk.desktop
share/eiskaltdcpp/gtk/glade/adlsearch.glade
share/eiskaltdcpp/gtk/glade/cmddebug.glade
share/eiskaltdcpp/gtk/glade/downloadqueue.glade
share/eiskaltdcpp/gtk/glade/favoritehubs.glade
share/eiskaltdcpp/gtk/glade/favoriteusers.glade
share/eiskaltdcpp/gtk/glade/finishedtransfers.glade
share/eiskaltdcpp/gtk/glade/hash.glade
share/eiskaltdcpp/gtk/glade/hub.glade
share/eiskaltdcpp/gtk/glade/mainwindow.glade
share/eiskaltdcpp/gtk/glade/privatemessage.glade
share/eiskaltdcpp/gtk/glade/publichubs.glade
share/eiskaltdcpp/gtk/glade/search.glade
share/eiskaltdcpp/gtk/glade/searchspy.glade
share/eiskaltdcpp/gtk/glade/settingsdialog.glade
share/eiskaltdcpp/gtk/glade/sharebrowser.glade
share/eiskaltdcpp/gtk/glade/transfers.glade
share/eiskaltdcpp/gtk/icons/hicolor/128x128/apps/eiskaltdcpp.png
share/eiskaltdcpp/gtk/icons/hicolor/16x16/status/eiskaltdcpp-dc++-fw-op.png
share/eiskaltdcpp/gtk/icons/hicolor/16x16/status/eiskaltdcpp-dc++-fw.png

share/eiskaltdcpp/gtk/themes/humanity.theme
share/eiskaltdcpp/gtk/themes/linuxdcpp.theme
share/eiskaltdcpp/gtk/themes/mankthemedark.theme
share/eiskaltdcpp/gtk/ui/adlsearch.ui
share/eiskaltdcpp/gtk/ui/cmddebug.ui
share/eiskaltdcpp/gtk/ui/downloadqueue.ui
share/eiskaltdcpp/gtk/ui/favoritehubs.ui
share/eiskaltdcpp/gtk/ui/favoriteusers.ui
share/eiskaltdcpp/gtk/ui/finishedtransfers.ui
share/eiskaltdcpp/gtk/ui/hash.ui
share/eiskaltdcpp/gtk/ui/hub.ui
share/eiskaltdcpp/gtk/ui/mainwindow.ui
share/eiskaltdcpp/gtk/ui/privatemessage.ui
share/eiskaltdcpp/gtk/ui/publichubs.ui
share/eiskaltdcpp/gtk/ui/search.ui
share/eiskaltdcpp/gtk/ui/searchspy.ui
share/eiskaltdcpp/gtk/ui/settingsdialog.ui
share/eiskaltdcpp/gtk/ui/sharebrowser.ui
share/eiskaltdcpp/gtk/ui/transfers.ui
share/locale/be/LC_MESSAGES/eiskaltdcpp-gtk.mo
share/locale/bg/LC_MESSAGES/eiskaltdcpp-gtk.mo
share/locale/cs/LC_MESSAGES/eiskaltdcpp-gtk.mo
share/locale/de/LC_MESSAGES/eiskaltdcpp-gtk.mo
share/locale/en/LC_MESSAGES/eiskaltdcpp-gtk.mo
share/locale/es/LC_MESSAGES/eiskaltdcpp-gtk.mo
share/locale/fr/LC_MESSAGES/eiskaltdcpp-gtk.mo
share/locale/hu/LC_MESSAGES/eiskaltdcpp-gtk.mo
share/locale/pl/LC_MESSAGES/eiskaltdcpp-gtk.mo
share/locale/ru/LC_MESSAGES/eiskaltdcpp-gtk.mo
share/locale/sk/LC_MESSAGES/eiskaltdcpp-gtk.mo
share/locale/sr/LC_MESSAGES/eiskaltdcpp-gtk.mo
share/locale/uk/LC_MESSAGES/eiskaltdcpp-gtk.mo
@dirrm share/eiskaltdcpp/gtk/icons/hicolor/16x16/status
@dirrm share/eiskaltdcpp/gtk/icons/hicolor/16x16
@dirrm share/eiskaltdcpp/gtk/icons/hicolor/22x22/emotes

@dirrm share/eiskaltdcpp/gtk/themes/hicolor/16x16
@dirrm share/eiskaltdcpp/gtk/themes/hicolor
@dirrm share/eiskaltdcpp/gtk/themes
@dirrm share/eiskaltdcpp/gtk/ui
@dirrm share/eiskaltdcpp/gtk
@dirrmtry share/applications

Lines 6-12 Link Here

(-)b/net-p2p/eiskaltdcpp-lib/Makefile (-3 / +19 lines)
6	#	6	#
7		7
8	PORTNAME= eiskaltdcpp-lib	8	PORTNAME= eiskaltdcpp-lib
9	PORTVERSION= 2.2.1	9	PORTVERSION= 2.2.4
10	CATEGORIES= net-p2p	10	CATEGORIES= net-p2p
11	MASTER_SITES= GOOGLE_CODE	11	MASTER_SITES= GOOGLE_CODE
12	DISTNAME= eiskaltdcpp-${DISTVERSION}	12	DISTNAME= eiskaltdcpp-${DISTVERSION}
Lines 21-27 LIB_DEPENDS= boost_system:${PORTSDIR}/devel/boost-libs Link Here
21	PROJECTHOST= eiskaltdc	21	PROJECTHOST= eiskaltdc
22		22
23	USE_XZ= yes	23	USE_XZ= yes
24	USE_GCC= 4.2+	24	USE_GCC= 4.4+
25	USE_CMAKE= yes	25	USE_CMAKE= yes
26	USE_GETTEXT= yes	26	USE_GETTEXT= yes
27	USE_OPENSSL= yes	27	USE_OPENSSL= yes
Lines 29-35 USE_LDCONFIG= yes Link Here
29	MAKE_JOBS_SAFE= yes	29	MAKE_JOBS_SAFE= yes
30		30
31	OPTIONS= LUA "Lua scripting support" off \	31	OPTIONS= LUA "Lua scripting support" off \
32	PCRE "PCRE support in ADL Search" off	32	PCRE "PCRE support in ADL Search" off \
		33	IDN "IDN support" on \
		34	DHT "DHT support" on
33		35
34	.include <bsd.port.options.mk>	36	.include <bsd.port.options.mk>
35		37
Lines 38-43 CMAKE_ARGS+= -DUSE_QT:BOOL=OFF Link Here
38	CMAKE_ARGS+= -DUSE_GTK:BOOL=OFF	40	CMAKE_ARGS+= -DUSE_GTK:BOOL=OFF
39	CMAKE_ARGS+= -DUSE_ASPELL:BOOL=OFF	41	CMAKE_ARGS+= -DUSE_ASPELL:BOOL=OFF
40	CMAKE_ARGS+= -DUSE_MINIUPNP:BOOL=OFF	42	CMAKE_ARGS+= -DUSE_MINIUPNP:BOOL=OFF
		43	CMAKE_ARGS+= -DCMAKE_SKIP_RPATH:BOOL=ON
41		44
42	.if defined(WITH_LUA) && !defined(WITHOUT_LUA)	45	.if defined(WITH_LUA) && !defined(WITHOUT_LUA)
43	USE_LUA= 5.1	46	USE_LUA= 5.1
Lines 54-59 CMAKE_ARGS+= -DPERL_REGEX:BOOL=ON Link Here
54	CMAKE_ARGS+= -DPERL_REGEX:BOOL=OFF	57	CMAKE_ARGS+= -DPERL_REGEX:BOOL=OFF
55	.endif	58	.endif
56		59
		60	.if defined(WITH_IDN) && !defined(WITHOUT_IDN)
		61	LIB_DEPENDS+= idn:${PORTSDIR}/dns/libidn
		62	CMAKE_ARGS+= -DUSE_IDNA:BOOL=ON
		63	.else
		64	CMAKE_ARGS+= -DUSE_IDNA:BOOL=OFF
		65	.endif
		66
		67	.if defined(WITH_DHT) && !defined(WITHOUT_DHT)
		68	CMAKE_ARGS+= -DWITH_DHT:BOOL=ON
		69	.else
		70	CMAKE_ARGS+= -DWITH_DHT:BOOL=OFF
		71	.endif
		72
57	.if ${OSVERSION} < 700024	73	.if ${OSVERSION} < 700024
58	USE_OPENSSL_PORT=yes	74	USE_OPENSSL_PORT=yes
59	.endif	75	.endif

Lines 1-2 Link Here

(-)b/net-p2p/eiskaltdcpp-lib/distinfo (-2 / +2 lines)
1	SHA256 (eiskaltdcpp-2.2.1.tar.xz) = 2b2bd627a1325c595f604766404ca4f4787db1b49b4b0c5c5d8e88ddfc2a2c40	1	SHA256 (eiskaltdcpp-2.2.4.tar.xz) = a14d44ad1c48dc97354e17d3d8d8fc9bdd7be646d275603d092c6d9ebf7061b4
2	SIZE (eiskaltdcpp-2.2.1.tar.xz) = 1916680	2	SIZE (eiskaltdcpp-2.2.4.tar.xz) = 2008920




--- dcpp/CMakeLists.txt.orig	2011-10-02 18:12:43.000000000 +0300
+++ dcpp/CMakeLists.txt	2011-10-03 10:14:13.000000000 +0300
@@ -34,8 +34,6 @@
   set (APPLE_LIBS "iconv")
 endif (APPLE)
 

-
 add_library (dcpp ${LINK} ${dcpp_srcs})
 
 if (WITH_DHT)
@@ -76,8 +74,8 @@
 endif (WIN32)
 
 target_link_libraries (dcpp ${DHT_LIB} ${PTHREADS} ${BZIP2_LIBRARIES} ${ZLIB_LIBRARIES}
-${OPENSSL_LIBRARIES} ${GETTEXT_LIBRARIES} ${ICONV_LIBRARIES} ${WIN32_LIBS} ${APPLE_LIBS} ${LUA_LIBRARIES} ${UPNP} ${PCRE} ${IDNA_LIBRARIES})
-set_target_properties(dcpp PROPERTIES VERSION ${SOVERSION} OUTPUT_NAME "eiskaltdcpp")
+${OPENSSL_LIBRARIES} ${GETTEXT_LIBRARIES} ${ICONV_LIBRARIES} ${WIN32_LIBS} ${APPLE_LIBS} ${LUA_LIBRARIES} ${UPNP} ${PCRE} ${IDNA_LIBRARIES} extra)
+set_target_properties(dcpp PROPERTIES SOVERSION 2 VERSION ${SOVERSION} OUTPUT_NAME "eiskaltdcpp")
 
 if (APPLE)
   set (LIBDIR1 .)
@@ -86,6 +84,6 @@
 
 if (LINK STREQUAL SHARED)
 install (TARGETS dcpp




include/eiskaltdcpp/dcpp/AdcHub.h
include/eiskaltdcpp/dcpp/Atomic.h
include/eiskaltdcpp/dcpp/BZUtils.h
include/eiskaltdcpp/dcpp/BitInputStream.h
include/eiskaltdcpp/dcpp/BitOutputStream.h
include/eiskaltdcpp/dcpp/BloomFilter.h
include/eiskaltdcpp/dcpp/BufferedSocket.h
include/eiskaltdcpp/dcpp/BufferedSocketListener.h

include/eiskaltdcpp/dcpp/ScriptManager.h
include/eiskaltdcpp/dcpp/SearchManager.h
include/eiskaltdcpp/dcpp/SearchManagerListener.h
include/eiskaltdcpp/dcpp/SearchQueue.h
include/eiskaltdcpp/dcpp/SearchResult.h
include/eiskaltdcpp/dcpp/Segment.h
include/eiskaltdcpp/dcpp/Semaphore.h

include/eiskaltdcpp/dcpp/WindowManager.h
include/eiskaltdcpp/dcpp/WindowManagerListener.h
include/eiskaltdcpp/dcpp/ZUtils.h
include/eiskaltdcpp/dcpp/compiler.h
include/eiskaltdcpp/dcpp/debug.h
include/eiskaltdcpp/dcpp/format.h
include/eiskaltdcpp/dcpp/forward.h
include/eiskaltdcpp/dcpp/noexcept.h
include/eiskaltdcpp/dcpp/stdinc.h
include/eiskaltdcpp/dcpp/typedefs.h
include/eiskaltdcpp/dcpp/version.h
include/eiskaltdcpp/dcpp/w.h
@dirrm include/eiskaltdcpp/dcpp
@dirrm include/eiskaltdcpp
lib/libeiskaltdcpp.so.2.2

share/locale/be/LC_MESSAGES/libeiskaltdcpp.mo
share/locale/bg/LC_MESSAGES/libeiskaltdcpp.mo
share/locale/cs/LC_MESSAGES/libeiskaltdcpp.mo
share/locale/de/LC_MESSAGES/libeiskaltdcpp.mo
share/locale/en/LC_MESSAGES/libeiskaltdcpp.mo
share/locale/es/LC_MESSAGES/libeiskaltdcpp.mo
share/locale/fr/LC_MESSAGES/libeiskaltdcpp.mo




#

PORTNAME=	eiskaltdcpp-qt
PORTVERSION=	2.2.4
CATEGORIES=	net-p2p
MASTER_SITES=	GOOGLE_CODE
DISTNAME=	eiskaltdcpp-${DISTVERSION}

PROJECTHOST=	eiskaltdc

USE_XZ=		yes
USE_GCC=	4.4+
USE_GETTEXT=	yes
USE_CMAKE=	yes
USE_OPENSSL=	yes

CMAKE_ARGS+=	-DEISKALTDCPP_INCLUDE_DIR:STRING="${LOCALBASE}/include/eiskaltdcpp"
CMAKE_ARGS+=	-DCREATE_MO:BOOL=OFF
CMAKE_ARGS+=	-DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib:${PREFIX}/lib"
CMAKE_ARGS+=	-DCMAKE_SKIP_RPATH:BOOL=ON

BUILD_WRKSRC=	${WRKSRC}/${PORTNAME}
INSTALL_WRKSRC=	${WRKSRC}/${PORTNAME}

Lines 1-2 Link Here

(-)b/net-p2p/eiskaltdcpp-qt/distinfo (-2 / +2 lines)
1	SHA256 (eiskaltdcpp-2.2.1.tar.xz) = 2b2bd627a1325c595f604766404ca4f4787db1b49b4b0c5c5d8e88ddfc2a2c40	1	SHA256 (eiskaltdcpp-2.2.4.tar.xz) = a14d44ad1c48dc97354e17d3d8d8fc9bdd7be646d275603d092c6d9ebf7061b4
2	SIZE (eiskaltdcpp-2.2.1.tar.xz) = 1916680	2	SIZE (eiskaltdcpp-2.2.4.tar.xz) = 2008920




--- CMakeLists.txt.orig	2011-10-02 18:12:43.000000000 +0300
+++ CMakeLists.txt	2011-10-03 10:40:18.000000000 +0300
@@ -370,16 +370,14 @@
     else (MINGW)
         set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
     endif (MINGW)
-    if (NOT APPLE)
-        set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,--as-needed")

    ${eiskaltdcpp_SOURCE_DIR}
    ${GMP_INCLUDE_DIR}
    )
@@ -451,7 +449,9 @@
   add_subdirectory (dht)
 endif (WITH_DHT)
 
-add_subdirectory (dcpp)
+if (BUILD_LIB)

 
 if (USE_QT)
   add_subdirectory (eiskaltdcpp-qt)
@@ -443,11 +443,11 @@
       LOCALE_LIST "${LANGUAGES}"
       COPYRIGHT_HOLDER "EiskaltDC++ team"
       SOURCES "${DCPP_SRCS};${DCPP_HDRS}"
-      PO_DIR "${dcpp_SOURCE_DIR}/po"
-      POT_BUILD_DIR "${dcpp_SOURCE_DIR}/po"
+      PO_DIR "${PROJECT_SOURCE_DIR}/po"
+      POT_BUILD_DIR "${PROJECT_SOURCE_DIR}/po"
       #PO_PREFIX    ""
-      PO_BUILD_DIR "${dcpp_SOURCE_DIR}/po"
-      MO_BUILD_DIR "${dcpp_BINARY_DIR}/locale"
+      PO_BUILD_DIR "${PROJECT_SOURCE_DIR}/po"
+      MO_BUILD_DIR "${PROJECT_BINARY_DIR}/locale"
       MO_INSTALL_DIR "/${LOCALE_DIR}"
       CREATE_POT_TARGET ${create_pot}
       CREATE_PO_TARGET ${create_po}




--- ./cmake/CMakeLists.txt.orig	2011-10-02 18:12:43.000000000 +0300
+++ ./cmake/CMakeLists.txt	2011-10-10 11:10:30.000000000 +0300
@@ -37,12 +37,14 @@
 
 endmacro(GET_RELATIVE_SOURCES)
 
+if (BUILD_LIB)
 get_absolute_sources(abs_dcpp_sources "${DCPP_SRCS};${DCPP_HDRS}")
 get_relative_sources(rel_dcpp_sources "${dcpp_SOURCE_DIR}/po" "${abs_dcpp_sources}")
 file(MAKE_DIRECTORY "${dcpp_BINARY_DIR}/po")
 set(dcpp_files_from "${dcpp_BINARY_DIR}/po/libeiskaltdcpp_srcs.txt")
 string(REGEX REPLACE ";" "\n" dcpp_contents "${rel_dcpp_sources}")
 file(WRITE "${dcpp_files_from}" "${dcpp_contents}")
+endif (BUILD_LIB)
 
 if (USE_GTK)
 get_absolute_sources(abs_gtk_cpp_sources "${GTK_SRCS};${GTK_HDRS}")
@@ -163,6 +165,7 @@
 			# if the po file doesn't exist. The case where a po file used to
 			# exist and no longer exists should never occur
 
+			if (BUILD_LIB)
 			if(NOT EXISTS ${dcpp_SOURCE_DIR}/po/${LANG}.po)
 				add_custom_command(
 					OUTPUT ${dcpp_SOURCE_DIR}/po/${LANG}.po
@@ -194,6 +197,7 @@
 				WORKING_DIRECTORY ${dcpp_SOURCE_DIR}/po
 				COMMENT "pot-update [dcpp-${LANG}]: Updated po file."
 			)
+			endif (BUILD_LIB)
 
 			if (USE_GTK)
 			if(NOT EXISTS ${eiskaltdcpp-gtk_SOURCE_DIR}/po/${LANG}.po)
@@ -231,15 +235,19 @@
 			SET(pot-update-SRC ${pot-update-SRC} ${eiskaltdcpp-gtk_SOURCE_DIR}/po/${LANG}.po.dummy )
 			endif (USE_GTK)
 
+			if (BUILD_LIB)
 			SET(pot-update-SRC ${pot-update-SRC} ${dcpp_SOURCE_DIR}/po/${LANG}.po.dummy)
+			endif (BUILD_LIB)
 		endforeach(LANG ${LANGUAGES})
 
 		# Add to target list
+		if (BUILD_LIB)
 		SET(pot-update-SRC
 			${pot-update-SRC}
 			${dcpp_SOURCE_DIR}/po/libeiskaltdcpp.pot # should depend on languages
 
 		)
+		endif (BUILD_LIB)
 		if (USE_GTK)
 		SET(pot-update-SRC
 			${pot-update-SRC}
@@ -329,6 +337,7 @@
 
 	foreach(LANG ${LANGUAGES})
 
+		if (BUILD_LIB)
 			add_custom_command(
 				OUTPUT ${dcpp_BINARY_DIR}/locale/${LANG}/LC_MESSAGES
 				COMMAND ${CMAKE_COMMAND} -E make_directory
@@ -346,6 +355,7 @@
 				WORKING_DIRECTORY ${dcpp_SOURCE_DIR}/po
 				COMMENT "mo-update [dcpp-${LANG}]: Creating mo file."
 			)
+			endif (BUILD_LIB)
 			if (USE_GTK)
 			add_custom_command(
 				OUTPUT ${eiskaltdcpp-gtk_BINARY_DIR}/locale/${LANG}/LC_MESSAGES
@@ -377,6 +387,7 @@
 			)
 			endif (USE_GTK)
 
+			if (BUILD_LIB)
 			install(FILES
 			    ${dcpp_BINARY_DIR}/locale/${LANG}/LC_MESSAGES/libeiskaltdcpp.mo
 					DESTINATION ${LOCALE_DIR}/${LANG}/LC_MESSAGES)
@@ -387,6 +398,7 @@
 			set(mo-update-LANG-SRC ${mo-update-LANG-SRC}
 			    ${dcpp_BINARY_DIR}/locale/${LANG}/LC_MESSAGES/libeiskaltdcpp.mo
 			)
+			endif (BUILD_LIB)
 
 		if(UPDATE_PO)
 			add_custom_target(mo-update-${LANG}




--- eiskaltdcpp-qt/CMakeLists.txt.orig	2011-10-02 18:12:43.000000000 +0300
+++ eiskaltdcpp-qt/CMakeLists.txt	2011-10-03 11:20:59.000000000 +0300
@@ -359,6 +359,10 @@
     set_property(SOURCE ${PROJECT_SOURCE_DIR}/src/main.cpp PROPERTY COMPILE_DEFINITIONS ENABLE_STACKTRACE)
 endif (ENABLE_STACKTRACE)
 
+if (USE_MINIUPNP OR FREE_SPACE_BAR_C)
+	list(APPEND LIBS extra)

 if (APPLE)
   set (MACOSICON "${PROJECT_SOURCE_DIR}/../icons/icon_128x128.icns")
   set (MACOSICONINBUNDLE "icon_128x128.icns")
@@ -396,10 +400,19 @@
   add_definitions(-DCLIENT_RES_DIR="${CLIENT_DATA_DIR}/qt/resources")
 endif (APPLE)
 

 endif (APPLE)
 
 if (APPLE)
@@ -469,7 +482,7 @@
 else (APPLE)
   install (FILES ${PROJECT_BINARY_DIR}/default.rcc DESTINATION ${CLIENT_DATA_DIR}/qt/resources)
   if (UNIX AND NOT HAIKU)
-    install (FILES ${PROJECT_BINARY_DIR}/eiskaltdcpp-qt.1.gz DESTINATION ${SHARE_DIR}/man/man1)
+    install (FILES ${PROJECT_BINARY_DIR}/eiskaltdcpp-qt.1.gz DESTINATION man/man1)
     install (FILES eiskaltdcpp-qt.desktop DESTINATION ${SHARE_DIR}/applications)
   endif (UNIX AND NOT HAIKU)
 endif (APPLE)




--- ./eiskaltdcpp-qt/src/main.cpp.orig	2011-03-09 15:49:53.000000000 +0200
+++ ./eiskaltdcpp-qt/src/main.cpp	2011-03-09 15:50:14.000000000 +0200
@@ -58,8 +58,6 @@
 #include <signal.h>
 #include <execinfo.h>
 
-#include "extra/stacktrace.h"
-
 void installHandlers();
 
 #ifdef FORCE_XDG
@@ -214,8 +212,6 @@
         std::cout << QObject::tr("Cannot handle SIGPIPE").toStdString() << std::endl;
     }
 
-    signal(SIGSEGV, printBacktrace);
-
     std::cout << QObject::tr("Signal handlers installed.").toStdString() << std::endl;
 }
 




share/eiskaltdcpp/qt/icons/appl/faenza/view-filter.png
share/eiskaltdcpp/qt/icons/appl/faenza/zoom-in.png
share/eiskaltdcpp/qt/icons/appl/faenza/zoom-out.png
share/eiskaltdcpp/qt/icons/appl/monochrome/adls.png
share/eiskaltdcpp/qt/icons/appl/monochrome/application-exit.png
share/eiskaltdcpp/qt/icons/appl/monochrome/application-x-archive.png
share/eiskaltdcpp/qt/icons/appl/monochrome/application-x-executable.png
share/eiskaltdcpp/qt/icons/appl/monochrome/audio-x-generic.png
share/eiskaltdcpp/qt/icons/appl/monochrome/ball_green.png
share/eiskaltdcpp/qt/icons/appl/monochrome/bookmark-new.png
share/eiskaltdcpp/qt/icons/appl/monochrome/chat.png
share/eiskaltdcpp/qt/icons/appl/monochrome/configure.png
share/eiskaltdcpp/qt/icons/appl/monochrome/console.png
share/eiskaltdcpp/qt/icons/appl/monochrome/default.qrc
share/eiskaltdcpp/qt/icons/appl/monochrome/dialog-close.png
share/eiskaltdcpp/qt/icons/appl/monochrome/document-edit.png
share/eiskaltdcpp/qt/icons/appl/monochrome/download.png
share/eiskaltdcpp/qt/icons/appl/monochrome/edit-clear-locationbar-rtl.png
share/eiskaltdcpp/qt/icons/appl/monochrome/edit-clear.png
share/eiskaltdcpp/qt/icons/appl/monochrome/edit-copy.png
share/eiskaltdcpp/qt/icons/appl/monochrome/edit-delete.png
share/eiskaltdcpp/qt/icons/appl/monochrome/edit-find.png
share/eiskaltdcpp/qt/icons/appl/monochrome/eraser.png
share/eiskaltdcpp/qt/icons/appl/monochrome/face-smile.png
share/eiskaltdcpp/qt/icons/appl/monochrome/fav.png
share/eiskaltdcpp/qt/icons/appl/monochrome/favadd.png
share/eiskaltdcpp/qt/icons/appl/monochrome/favrem.png
share/eiskaltdcpp/qt/icons/appl/monochrome/favserver.png
share/eiskaltdcpp/qt/icons/appl/monochrome/favusers.png
share/eiskaltdcpp/qt/icons/appl/monochrome/find.png
share/eiskaltdcpp/qt/icons/appl/monochrome/folder-blue.png
share/eiskaltdcpp/qt/icons/appl/monochrome/freespace.png
share/eiskaltdcpp/qt/icons/appl/monochrome/go-down-search.png
share/eiskaltdcpp/qt/icons/appl/monochrome/go-down.png
share/eiskaltdcpp/qt/icons/appl/monochrome/go-up-search.png
share/eiskaltdcpp/qt/icons/appl/monochrome/go-up.png
share/eiskaltdcpp/qt/icons/appl/monochrome/gui.png
share/eiskaltdcpp/qt/icons/appl/monochrome/hashing.png
share/eiskaltdcpp/qt/icons/appl/monochrome/hubmsg.png
share/eiskaltdcpp/qt/icons/appl/monochrome/icon_appl.png
share/eiskaltdcpp/qt/icons/appl/monochrome/icon_appl_big.png
share/eiskaltdcpp/qt/icons/appl/monochrome/icon_msg.png
share/eiskaltdcpp/qt/icons/appl/monochrome/im-user-away.png
share/eiskaltdcpp/qt/icons/appl/monochrome/image-x-generic.png
share/eiskaltdcpp/qt/icons/appl/monochrome/list-add.png
share/eiskaltdcpp/qt/icons/appl/monochrome/log_file.png
share/eiskaltdcpp/qt/icons/appl/monochrome/message.png
share/eiskaltdcpp/qt/icons/appl/monochrome/network-connect.png
share/eiskaltdcpp/qt/icons/appl/monochrome/network-disconnect.png
share/eiskaltdcpp/qt/icons/appl/monochrome/openlist.png
share/eiskaltdcpp/qt/icons/appl/monochrome/own_filelist.png
share/eiskaltdcpp/qt/icons/appl/monochrome/plugin.png
share/eiskaltdcpp/qt/icons/appl/monochrome/pmmsg.png
share/eiskaltdcpp/qt/icons/appl/monochrome/qt-logo.png
share/eiskaltdcpp/qt/icons/appl/monochrome/reconnect.png
share/eiskaltdcpp/qt/icons/appl/monochrome/refrlist.png
share/eiskaltdcpp/qt/icons/appl/monochrome/reload.png
share/eiskaltdcpp/qt/icons/appl/monochrome/server.png
share/eiskaltdcpp/qt/icons/appl/monochrome/slow.png
share/eiskaltdcpp/qt/icons/appl/monochrome/slow_off.png
share/eiskaltdcpp/qt/icons/appl/monochrome/spam.png
share/eiskaltdcpp/qt/icons/appl/monochrome/spy.png
share/eiskaltdcpp/qt/icons/appl/monochrome/status.png
share/eiskaltdcpp/qt/icons/appl/monochrome/text-x-generic.png
share/eiskaltdcpp/qt/icons/appl/monochrome/transfer.png
share/eiskaltdcpp/qt/icons/appl/monochrome/unknown.png
share/eiskaltdcpp/qt/icons/appl/monochrome/users.png
share/eiskaltdcpp/qt/icons/appl/monochrome/video-x-generic.png
share/eiskaltdcpp/qt/icons/appl/monochrome/view-close.png
share/eiskaltdcpp/qt/icons/appl/monochrome/view-filter.png
share/eiskaltdcpp/qt/icons/appl/monochrome/zoom-in.png
share/eiskaltdcpp/qt/icons/appl/monochrome/zoom-out.png
share/eiskaltdcpp/qt/icons/user/valknut/usericons.png
%%QTSCRIPT%%share/eiskaltdcpp/qt/qtscripts/amarok_nowplay/amarok.png
%%QTSCRIPT%%share/eiskaltdcpp/qt/qtscripts/amarok_nowplay/amarok.sh

share/eiskaltdcpp/qt/ts/be.qm
share/eiskaltdcpp/qt/ts/bg.qm
share/eiskaltdcpp/qt/ts/cs.qm
share/eiskaltdcpp/qt/ts/de.qm
share/eiskaltdcpp/qt/ts/en.qm
share/eiskaltdcpp/qt/ts/es.qm
share/eiskaltdcpp/qt/ts/fr.qm

%%QTSCRIPT%%@dirrm share/eiskaltdcpp/qt/qtscripts
@dirrm share/eiskaltdcpp/qt/icons/appl/default
@dirrm share/eiskaltdcpp/qt/icons/appl/faenza
@dirrm share/eiskaltdcpp/qt/icons/appl/monochrome
@dirrm share/eiskaltdcpp/qt/icons/appl
@dirrm share/eiskaltdcpp/qt/icons/user/default
@dirrm share/eiskaltdcpp/qt/icons/user/valknut

Return to bug 161898

Added Link Here

(-)b/net-p2p/eiskaltdcpp-cli/Makefile (+41 lines)
1	# New ports collection makefile for: net-p2p/eiskaltdcpp-cli
2	# Date created: 06 Oct @011
3	# Whom: Maxim Ignatenko <gelraen.ua@gmail.com>
4	#
5	# $FreeBSD$
6	#
7
8	PORTNAME= eiskaltdcpp-cli
9	PORTVERSION= 2.2.4
10	CATEGORIES= net-p2p
11	MASTER_SITES= GOOGLE_CODE
12	DISTNAME= eiskaltdcpp-${DISTVERSION}
13
14	MAINTAINER= gelraen.ua@gmail.com
15	COMMENT= Shared data for EiskaltDC++ GUIs
16
17	PROJECTHOST= eiskaltdc
18
19	LICENSE= GPLv3
20
21	USE_XZ= yes
22	NO_BUILD= yes
23	USE_PERL5_RUN= yes
24
25	MAN1= ${PORTNAME}.1
26	MANCOMPRESSED= no
27
28	RUN_DEPENDS= p5-RPC-XML>=0:${PORTSDIR}/net/p5-RPC-XML \
29	p5-Term-ShellUI>=0:${PORTSDIR}/shells/p5-Term-ShellUI
30
31	do-install:
32	@${INSTALL_SCRIPT} "${WRKSRC}/${PORTNAME}/cli.pl" "${PREFIX}/bin/eiskaltdcpp-cli"
33	@${INSTALL_MAN} "${WRKSRC}/${PORTNAME}/eiskaltdcpp-cli.1" "${PREFIX}/man/man1/"
34	@${MKDIR} "${PREFIX}/etc/eiskaltdcpp" \|\| true
35	@${INSTALL_DATA} "${WRKSRC}/${PORTNAME}/config.pl" "${PREFIX}/etc/eiskaltdcpp/config.pl.dist"
36	@if [ ! -e "${PREFIX}/etc/eiskaltdcpp/config.pl" ]; then \
37	${CP} -v "${PREFIX}/etc/eiskaltdcpp/config.pl.dist" \
38	"${PREFIX}/etc/eiskaltdcpp/config.pl"; \
39	fi
40
41	.include <bsd.port.mk>

Added Link Here

(-)b/net-p2p/eiskaltdcpp-cli/files/patch-eiskaltdcpp-cli__cli.pl (+12 lines)
1	--- ./eiskaltdcpp-cli/cli.pl.orig 2011-10-02 18:12:43.000000000 +0300
2	+++ ./eiskaltdcpp-cli/cli.pl 2011-10-06 09:30:39.000000000 +0300
3	@@ -36,8 +36,7 @@
4	unshift @INC,
5	"$XDG_CONFIG_HOME/eiskaltdc++",
6	"~/.config/eiskaltdc++/",
7	- "/usr/local/share/eiskaltdcpp/cli",
8	- "/usr/share/eiskaltdcpp/cli"
9	+ "/usr/local/etc/eiskaltdcpp"
10	}
11
12	# preparing terminal

Lines 1-8 Link Here

(-)b/net-p2p/eiskaltdcpp-daemon/files/patch-CMakeLists.txt (-24 / +8 lines)
1	--- ./CMakeLists.txt.orig 2011-03-08 19:47:12.000000000 +0200	1	--- CMakeLists.txt.orig 2011-10-02 18:12:43.000000000 +0300
2	+++ ./CMakeLists.txt 2011-03-10 19:49:48.000000000 +0200	2	+++ CMakeLists.txt 2011-10-03 10:40:18.000000000 +0300
3	@@ -316,16 +316,14 @@	3	@@ -370,16 +370,14 @@
4	if (MINGW)	4	else (MINGW)
5	set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--enable-auto-import")	5	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
6	endif (MINGW)	6	endif (MINGW)
7	- if (NOT APPLE)	7	- if (NOT APPLE)
8	- set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,--as-needed")	8	- set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,--as-needed")
Lines 20-28 Link Here
20	${eiskaltdcpp_SOURCE_DIR}	20	${eiskaltdcpp_SOURCE_DIR}
21	${GMP_INCLUDE_DIR}	21	${GMP_INCLUDE_DIR}
22	)	22	)
23	@@ -395,7 +393,9 @@	23	@@ -451,7 +449,9 @@
24	add_subdirectory (dht)	24	add_subdirectory (dht)
25	endif (DHT)	25	endif (WITH_DHT)
26		26
27	-add_subdirectory (dcpp)	27	-add_subdirectory (dcpp)
28	+if (BUILD_LIB)	28	+if (BUILD_LIB)
Lines 31-49 Link Here
31		31
32	if (USE_QT)	32	if (USE_QT)
33	add_subdirectory (eiskaltdcpp-qt)	33	add_subdirectory (eiskaltdcpp-qt)
34	@@ -443,11 +443,11 @@
35	LOCALE_LIST "${LANGUAGES}"
36	COPYRIGHT_HOLDER "EiskaltDC++ team"
37	SOURCES "${DCPP_SRCS};${DCPP_HDRS}"
38	- PO_DIR "${dcpp_SOURCE_DIR}/po"
39	- POT_BUILD_DIR "${dcpp_SOURCE_DIR}/po"
40	+ PO_DIR "${PROJECT_SOURCE_DIR}/po"
41	+ POT_BUILD_DIR "${PROJECT_SOURCE_DIR}/po"
42	#PO_PREFIX ""
43	- PO_BUILD_DIR "${dcpp_SOURCE_DIR}/po"
44	- MO_BUILD_DIR "${dcpp_BINARY_DIR}/locale"
45	+ PO_BUILD_DIR "${PROJECT_SOURCE_DIR}/po"
46	+ MO_BUILD_DIR "${PROJECT_BINARY_DIR}/locale"
47	MO_INSTALL_DIR "/${LOCALE_DIR}"
48	CREATE_POT_TARGET ${create_pot}
49	CREATE_PO_TARGET ${create_po}

Added Link Here

(-)b/net-p2p/eiskaltdcpp-daemon/files/patch-cmake__CMakeLists.txt (+85 lines)
1	--- ./cmake/CMakeLists.txt.orig 2011-10-02 18:12:43.000000000 +0300
2	+++ ./cmake/CMakeLists.txt 2011-10-10 11:10:30.000000000 +0300
3	@@ -37,12 +37,14 @@
4
5	endmacro(GET_RELATIVE_SOURCES)
6
7	+if (BUILD_LIB)
8	get_absolute_sources(abs_dcpp_sources "${DCPP_SRCS};${DCPP_HDRS}")
9	get_relative_sources(rel_dcpp_sources "${dcpp_SOURCE_DIR}/po" "${abs_dcpp_sources}")
10	file(MAKE_DIRECTORY "${dcpp_BINARY_DIR}/po")
11	set(dcpp_files_from "${dcpp_BINARY_DIR}/po/libeiskaltdcpp_srcs.txt")
12	string(REGEX REPLACE ";" "\n" dcpp_contents "${rel_dcpp_sources}")
13	file(WRITE "${dcpp_files_from}" "${dcpp_contents}")
14	+endif (BUILD_LIB)
15
16	if (USE_GTK)
17	get_absolute_sources(abs_gtk_cpp_sources "${GTK_SRCS};${GTK_HDRS}")
18	@@ -163,6 +165,7 @@
19	# if the po file doesn't exist. The case where a po file used to
20	# exist and no longer exists should never occur
21
22	+ if (BUILD_LIB)
23	if(NOT EXISTS ${dcpp_SOURCE_DIR}/po/${LANG}.po)
24	add_custom_command(
25	OUTPUT ${dcpp_SOURCE_DIR}/po/${LANG}.po
26	@@ -194,6 +197,7 @@
27	WORKING_DIRECTORY ${dcpp_SOURCE_DIR}/po
28	COMMENT "pot-update [dcpp-${LANG}]: Updated po file."
29	)
30	+ endif (BUILD_LIB)
31
32	if (USE_GTK)
33	if(NOT EXISTS ${eiskaltdcpp-gtk_SOURCE_DIR}/po/${LANG}.po)
34	@@ -231,15 +235,19 @@
35	SET(pot-update-SRC ${pot-update-SRC} ${eiskaltdcpp-gtk_SOURCE_DIR}/po/${LANG}.po.dummy )
36	endif (USE_GTK)
37
38	+ if (BUILD_LIB)
39	SET(pot-update-SRC ${pot-update-SRC} ${dcpp_SOURCE_DIR}/po/${LANG}.po.dummy)
40	+ endif (BUILD_LIB)
41	endforeach(LANG ${LANGUAGES})
42
43	# Add to target list
44	+ if (BUILD_LIB)
45	SET(pot-update-SRC
46	${pot-update-SRC}
47	${dcpp_SOURCE_DIR}/po/libeiskaltdcpp.pot # should depend on languages
48
49	)
50	+ endif (BUILD_LIB)
51	if (USE_GTK)
52	SET(pot-update-SRC
53	${pot-update-SRC}
54	@@ -329,6 +337,7 @@
55
56	foreach(LANG ${LANGUAGES})
57
58	+ if (BUILD_LIB)
59	add_custom_command(
60	OUTPUT ${dcpp_BINARY_DIR}/locale/${LANG}/LC_MESSAGES
61	COMMAND ${CMAKE_COMMAND} -E make_directory
62	@@ -346,6 +355,7 @@
63	WORKING_DIRECTORY ${dcpp_SOURCE_DIR}/po
64	COMMENT "mo-update [dcpp-${LANG}]: Creating mo file."
65	)
66	+ endif (BUILD_LIB)
67	if (USE_GTK)
68	add_custom_command(
69	OUTPUT ${eiskaltdcpp-gtk_BINARY_DIR}/locale/${LANG}/LC_MESSAGES
70	@@ -377,6 +387,7 @@
71	)
72	endif (USE_GTK)
73
74	+ if (BUILD_LIB)
75	install(FILES
76	${dcpp_BINARY_DIR}/locale/${LANG}/LC_MESSAGES/libeiskaltdcpp.mo
77	DESTINATION ${LOCALE_DIR}/${LANG}/LC_MESSAGES)
78	@@ -387,6 +398,7 @@
79	set(mo-update-LANG-SRC ${mo-update-LANG-SRC}
80	${dcpp_BINARY_DIR}/locale/${LANG}/LC_MESSAGES/libeiskaltdcpp.mo
81	)
82	+ endif (BUILD_LIB)
83
84	if(UPDATE_PO)
85	add_custom_target(mo-update-${LANG}

Lines 1-24 Link Here

(-)b/net-p2p/eiskaltdcpp-daemon/files/patch-nasdc__CMakeLists.txt (-13 / +13 lines)
1	--- ./nasdc/CMakeLists.txt.orig 2011-03-08 19:47:12.000000000 +0200	1	--- nasdc/CMakeLists.txt.orig 2011-10-02 18:12:43.000000000 +0300
2	+++ ./nasdc/CMakeLists.txt 2011-03-10 19:52:25.000000000 +0200	2	+++ nasdc/CMakeLists.txt 2011-10-03 10:51:06.000000000 +0300
3	@@ -47,7 +47,16 @@	3	@@ -49,7 +49,16 @@
4	target_link_libraries (sampleclient ${XMLRPCLIBS})	4	${nasdc_SRCS}
5	endif()	5	)
6		6
7	-target_link_libraries (nasdc dcpp ${XMLRPCLIBS} ${RL_LIBS})	7	-target_link_libraries (nasdc dcpp ${XMLRPCLIBS})
8	+if (BUILD_LIB)	8	+if (BUILD_LIB)
9	+ set(DCPP_LIB dcpp)	9	+ set(DCPP_LIB dcpp)
10	+else (BUILD_LIB)	10	+else (BUILD_LIB)
11	+ find_library(DCPP_LIB eiskaltdcpp)	11	+ find_library(DCPP_LIB eiskaltdcpp)
12	+ if (DCPP_LIB)	12	+ if (DCPP_LIB)
13	+ message(STATUS "EiskaltDC++ shared library found at ${DCPP_LIB}")	13	+ message(STATUS "EiskaltDC++ shared library found at ${DCPP_LIB}")
14	+ endif (DCPP_LIB)	14	+ endif (DCPP_LIB)
15	+endif (BUILD_LIB)	15	+endif (BUILD_LIB)
16	+	16	+
17	+target_link_libraries (nasdc ${DCPP_LIB} ${XMLRPCLIBS} ${RL_LIBS})	17	+target_link_libraries (nasdc ${DCPP_LIB} ${XMLRPCLIBS})
18		18
19	if (UNIX)	19	if (UNIX)
20	set (BINDIR bin)	20	set (BINDIR bin)
21	@@ -77,5 +86,5 @@	21	@@ -81,5 +90,5 @@
22	if (APPLE)	22	if (APPLE)
23	install (FILES ${PROJECT_BINARY_DIR}/eiskaltdcpp-daemon.1.gz DESTINATION ${PROJECT_NAME_GLOBAL}.app/man/man1)	23	install (FILES ${PROJECT_BINARY_DIR}/eiskaltdcpp-daemon.1.gz DESTINATION ${PROJECT_NAME_GLOBAL}.app/man/man1)
24	elseif (UNIX AND NOT APPLE)	24	elseif (UNIX AND NOT APPLE)

Removed Link Here

(-)a/net-p2p/eiskaltdcpp-daemon/files/patch-nasdc__nasdc.cpp (-20 lines)
1	--- ./nasdc/nasdc.cpp.orig 2011-03-08 19:47:12.000000000 +0200
2	+++ ./nasdc/nasdc.cpp 2011-03-10 19:49:48.000000000 +0200
3	@@ -23,7 +23,6 @@
4	#ifndef _WIN32
5	#include <syslog.h>
6	#include <signal.h>
7	-#include "extra/stacktrace.h"
8	#endif
9
10	#ifdef CLI_DAEMON
11	@@ -237,9 +236,6 @@
12	temp = (char *)NULL;
13	prompt = "edcppd$ ";
14	#endif
15	-#ifndef _WIN32
16	- signal(SIGSEGV, printBacktrace);
17	-#endif
18	while (bServerRunning) {
19	Thread::sleep(1);
20	#ifdef CLI_DAEMON

Lines 6-12 Link Here

(-)b/net-p2p/eiskaltdcpp-gtk/Makefile (-7 / +6 lines)
6	#	6	#
7		7
8	PORTNAME= eiskaltdcpp-gtk	8	PORTNAME= eiskaltdcpp-gtk
9	PORTVERSION= 2.2.1	9	PORTVERSION= 2.2.4
10	CATEGORIES= net-p2p	10	CATEGORIES= net-p2p
11	MASTER_SITES= GOOGLE_CODE	11	MASTER_SITES= GOOGLE_CODE
12	DISTNAME= eiskaltdcpp-${DISTVERSION}	12	DISTNAME= eiskaltdcpp-${DISTVERSION}
Lines 23-29 CMAKE_ARGS+= -DBUILD_LIB:BOOL=OFF Link Here
23	PROJECTHOST= eiskaltdc	23	PROJECTHOST= eiskaltdc
24		24
25	USE_XZ= yes	25	USE_XZ= yes
26	USE_GCC= 4.2+	26	USE_GCC= 4.4+
27	USE_CMAKE= yes	27	USE_CMAKE= yes
28	USE_GETTEXT= yes	28	USE_GETTEXT= yes
29	USE_OPENSSL= yes	29	USE_OPENSSL= yes
Lines 36-51 OPTIONS= MINIUPNP "UPnP support" on \ Link Here
36	LIBGNOME2 "Sound notification support" off \	36	LIBGNOME2 "Sound notification support" off \
37	LIBNOTIFY "Popup notification support" on	37	LIBNOTIFY "Popup notification support" on
38		38
39	USE_GNOME= pango gtk20 glib20 libglade2	39	USE_GNOME= pango gtk20 glib20
40		40
41	CMAKE_ARGS+= -DUSE_QT:BOOL=OFF	41	CMAKE_ARGS+= -DUSE_QT:BOOL=OFF
42	CMAKE_ARGS+= -DUSE_GTK:BOOL=ON	42	CMAKE_ARGS+= -DUSE_GTK:BOOL=ON
43	CMAKE_ARGS+= -DEISKALTDCPP_INCLUDE_DIR:STRING="${LOCALBASE}/include/eiskaltdcpp"	43	CMAKE_ARGS+= -DEISKALTDCPP_INCLUDE_DIR:STRING="${LOCALBASE}/include/eiskaltdcpp"
44	CMAKE_ARGS+= -DCREATE_MO:BOOL=OFF	44	CMAKE_ARGS+= -DCREATE_MO:BOOL=ON
45	CMAKE_ARGS+= -DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib:${PREFIX}/lib"	45	CMAKE_ARGS+= -DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib:${PREFIX}/lib"
46		46	CMAKE_ARGS+= -DCMAKE_SKIP_RPATH:BOOL=ON
47	BUILD_WRKSRC= ${WRKSRC}/${PORTNAME}	47	CMAKE_ARGS+= -DINSTALL_DATA:BOOL=OFF
48	INSTALL_WRKSRC= ${WRKSRC}/${PORTNAME}
49		48
50	.include <bsd.port.options.mk>	49	.include <bsd.port.options.mk>
51		50

Lines 1-6 Link Here

(-)b/net-p2p/eiskaltdcpp-gtk/files/patch-CMakeLists.txt (-25 / +24 lines)
1	--- ./CMakeLists.txt.orig 2011-03-08 19:47:12.000000000 +0200	1	--- ./CMakeLists.txt.orig 2011-10-02 18:12:43.000000000 +0300
2	+++ ./CMakeLists.txt 2011-03-10 16:22:20.000000000 +0200	2	+++ ./CMakeLists.txt 2011-10-10 11:16:46.000000000 +0300
3	@@ -184,14 +184,14 @@	3	@@ -212,14 +212,14 @@
4		4
5	if (USE_LIBGNOME2)	5	if (USE_LIBGNOME2)
6	message (STATUS "Building with LibGnome2 support")	6	message (STATUS "Building with LibGnome2 support")
Lines 17-25 Link Here
17	else (USE_LIBNOTIFY)	17	else (USE_LIBNOTIFY)
18	message (STATUS "Building without libnotify support")	18	message (STATUS "Building without libnotify support")
19	endif (USE_LIBNOTIFY)	19	endif (USE_LIBNOTIFY)
20	@@ -316,16 +316,14 @@	20	@@ -370,16 +370,14 @@
21	if (MINGW)	21	else (MINGW)
22	set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--enable-auto-import")	22	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
23	endif (MINGW)	23	endif (MINGW)
24	- if (NOT APPLE)	24	- if (NOT APPLE)
25	- set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,--as-needed")	25	- set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,--as-needed")
Lines 37-45 Link Here
37	${eiskaltdcpp_SOURCE_DIR}	37	${eiskaltdcpp_SOURCE_DIR}
38	${GMP_INCLUDE_DIR}	38	${GMP_INCLUDE_DIR}
39	)	39	)
40	@@ -395,7 +393,9 @@	40	@@ -451,7 +449,9 @@
41	add_subdirectory (dht)	41	add_subdirectory (dht)
42	endif (DHT)	42	endif (WITH_DHT)
43		43
44	-add_subdirectory (dcpp)	44	-add_subdirectory (dcpp)
45	+if (BUILD_LIB)	45	+if (BUILD_LIB)
Lines 48-66 Link Here
48		48
49	if (USE_QT)	49	if (USE_QT)
50	add_subdirectory (eiskaltdcpp-qt)	50	add_subdirectory (eiskaltdcpp-qt)
51	@@ -443,11 +443,11 @@	51	@@ -482,7 +482,7 @@
52	LOCALE_LIST "${LANGUAGES}"	52	add_subdirectory(cmake)
53	COPYRIGHT_HOLDER "EiskaltDC++ team"	53	endif(GETTEXT_FOUND)
54	SOURCES "${DCPP_SRCS};${DCPP_HDRS}"	54
55	- PO_DIR "${dcpp_SOURCE_DIR}/po"	55	-if (USE_QT OR USE_GTK)
56	- POT_BUILD_DIR "${dcpp_SOURCE_DIR}/po"	56	+if (INSTALL_DATA AND (USE_QT OR USE_GTK))
57	+ PO_DIR "${PROJECT_SOURCE_DIR}/po"	57
58	+ POT_BUILD_DIR "${PROJECT_SOURCE_DIR}/po"	58	if (WITH_EXAMPLES)
59	#PO_PREFIX ""	59	install (DIRECTORY examples/ DESTINATION ${CLIENT_DATA_DIR}/examples
60	- PO_BUILD_DIR "${dcpp_SOURCE_DIR}/po"	60	@@ -524,4 +524,4 @@
61	- MO_BUILD_DIR "${dcpp_BINARY_DIR}/locale"	61	install (FILES icons/icon_128x128.png DESTINATION ${SHARE_DIR}/pixmaps/ RENAME eiskaltdcpp.png)
62	+ PO_BUILD_DIR "${PROJECT_SOURCE_DIR}/po"	62	endif (NOT HAIKU)
63	+ MO_BUILD_DIR "${PROJECT_BINARY_DIR}/locale"	63	endif (APPLE)
64	MO_INSTALL_DIR "/${LOCALE_DIR}"	64	-endif (USE_QT OR USE_GTK)
65	CREATE_POT_TARGET ${create_pot}	65	+endif (INSTALL_DATA AND (USE_QT OR USE_GTK))
66	CREATE_PO_TARGET ${create_po}

Lines 1-16 Link Here

(-)b/net-p2p/eiskaltdcpp-gtk/files/patch-eiskaltdcpp-gtk__CMakeLists.txt (-9 / +9 lines)
1	--- ./eiskaltdcpp-gtk/CMakeLists.txt.orig 2011-03-08 19:47:12.000000000 +0200	1	--- ./eiskaltdcpp-gtk/CMakeLists.txt.orig 2011-10-02 18:12:43.000000000 +0300
2	+++ ./eiskaltdcpp-gtk/CMakeLists.txt 2011-03-10 16:22:20.000000000 +0200	2	+++ ./eiskaltdcpp-gtk/CMakeLists.txt 2011-10-10 11:10:30.000000000 +0300
3	@@ -12,7 +12,7 @@	3	@@ -12,7 +12,7 @@
4	set (GTK_SRCS @gtk_srcs@ PARENT_SCOPE)	4	set (GTK_SRCS @gtk_srcs@ PARENT_SCOPE)
5	set (GTK_HDRS @gtk_hdrs@ PARENT_SCOPE)	5	set (GTK_HDRS @gtk_hdrs@ PARENT_SCOPE)
6	set (GTK_GLADE @gtk_glade@ PARENT_SCOPE)	6	set (GTK_UI @gtk_ui@ PARENT_SCOPE)
7	-set (GTHREAD "-lgthread-2.0")	7	-set (GTHREAD "-lgthread-2.0")
8	+find_library (GTHREAD "gthread-2.0")	8	+find_library (GTHREAD "gthread-2.0")
9		9
10	include_directories (	10	if (USE_GTK)
11	${GTK2_INCLUDE_DIRS}	11	set(GTK_INCLUDE_DIRS ${GTK2_INCLUDE_DIRS})
12	@@ -37,6 +37,10 @@	12	@@ -44,6 +44,10 @@
13	set_property(SOURCE ${PROJECT_SOURCE_DIR}/src/mainwindow.cc ${PROJECT_SOURCE_DIR}/src/hub.cc PROPERTY COMPILE_DEFINITIONS LUA_SCRIPT)	13	list (APPEND LIBS ${LUA_LIBRARIES})
14	endif (LUA_SCRIPT)	14	endif (LUA_SCRIPT)
15		15
16	+if (USE_MINIUPNP OR FREE_SPACE_BAR_C)	16	+if (USE_MINIUPNP OR FREE_SPACE_BAR_C)
Lines 20-26 Link Here
20	add_executable (eiskaltdcpp-gtk MACOSX_BUNDLE WIN32	20	add_executable (eiskaltdcpp-gtk MACOSX_BUNDLE WIN32
21	${gtk_srcs}	21	${gtk_srcs}
22	)	22	)
23	@@ -71,10 +75,19 @@	23	@@ -90,10 +94,19 @@
24	add_definitions(-DCLIENT_RES_DIR="${CLIENT_DATA_DIR}/gtk/resources")	24	add_definitions(-DCLIENT_RES_DIR="${CLIENT_DATA_DIR}/gtk/resources")
25	endif (APPLE)	25	endif (APPLE)
26		26
Lines 42-48 Link Here
42	endif (APPLE)	42	endif (APPLE)
43		43
44	if (UNIX)	44	if (UNIX)
45	@@ -113,6 +126,6 @@	45	@@ -131,6 +144,6 @@
46	else (APPLE)	46	else (APPLE)
47	if (UNIX)	47	if (UNIX)
48	install (FILES eiskaltdcpp-gtk.desktop DESTINATION ${SHARE_DIR}/applications)	48	install (FILES eiskaltdcpp-gtk.desktop DESTINATION ${SHARE_DIR}/applications)

Removed Link Here

(-)a/net-p2p/eiskaltdcpp-gtk/files/patch-eiskaltdcpp-gtk__src__wulfor.cc (-18 lines)
1	--- ./eiskaltdcpp-gtk/src/wulfor.cc.orig 2011-03-10 16:43:57.000000000 +0200
2	+++ ./eiskaltdcpp-gtk/src/wulfor.cc 2011-03-10 16:44:22.000000000 +0200
3	@@ -37,7 +37,6 @@
4	#define GUI_PACKAGE "eiskaltdcpp-gtk"
5
6	#include "VersionGlobal.h"
7	-#include "extra/stacktrace.h"
8
9	void printHelp()
10	{
11	@@ -135,7 +134,6 @@
12	g_set_application_name("EiskaltDC++ Gtk");
13
14	signal(SIGPIPE, SIG_IGN);
15	- signal(SIGSEGV, printBacktrace);
16
17	WulforSettingsManager::newInstance();
18	WulforManager::start(argc, argv);

Lines 1-21 Link Here

(-)b/net-p2p/eiskaltdcpp-gtk/pkg-plist (-17 / +30 lines)
1	bin/eiskaltdcpp-gtk	1	bin/eiskaltdcpp-gtk
2	share/applications/eiskaltdcpp-gtk.desktop	2	share/applications/eiskaltdcpp-gtk.desktop
3	share/eiskaltdcpp/gtk/glade/adlsearch.glade
4	share/eiskaltdcpp/gtk/glade/cmddebug.glade
5	share/eiskaltdcpp/gtk/glade/downloadqueue.glade
6	share/eiskaltdcpp/gtk/glade/favoritehubs.glade
7	share/eiskaltdcpp/gtk/glade/favoriteusers.glade
8	share/eiskaltdcpp/gtk/glade/finishedtransfers.glade
9	share/eiskaltdcpp/gtk/glade/hash.glade
10	share/eiskaltdcpp/gtk/glade/hub.glade
11	share/eiskaltdcpp/gtk/glade/mainwindow.glade
12	share/eiskaltdcpp/gtk/glade/privatemessage.glade
13	share/eiskaltdcpp/gtk/glade/publichubs.glade
14	share/eiskaltdcpp/gtk/glade/search.glade
15	share/eiskaltdcpp/gtk/glade/searchspy.glade
16	share/eiskaltdcpp/gtk/glade/settingsdialog.glade
17	share/eiskaltdcpp/gtk/glade/sharebrowser.glade
18	share/eiskaltdcpp/gtk/glade/transfers.glade
19	share/eiskaltdcpp/gtk/icons/hicolor/128x128/apps/eiskaltdcpp.png	3	share/eiskaltdcpp/gtk/icons/hicolor/128x128/apps/eiskaltdcpp.png
20	share/eiskaltdcpp/gtk/icons/hicolor/16x16/status/eiskaltdcpp-dc++-fw-op.png	4	share/eiskaltdcpp/gtk/icons/hicolor/16x16/status/eiskaltdcpp-dc++-fw-op.png
21	share/eiskaltdcpp/gtk/icons/hicolor/16x16/status/eiskaltdcpp-dc++-fw.png	5	share/eiskaltdcpp/gtk/icons/hicolor/16x16/status/eiskaltdcpp-dc++-fw.png
Lines 103-109 share/eiskaltdcpp/gtk/themes/hicolor/32x32/categories/zoom1.png Link Here
103	share/eiskaltdcpp/gtk/themes/humanity.theme	87	share/eiskaltdcpp/gtk/themes/humanity.theme
104	share/eiskaltdcpp/gtk/themes/linuxdcpp.theme	88	share/eiskaltdcpp/gtk/themes/linuxdcpp.theme
105	share/eiskaltdcpp/gtk/themes/mankthemedark.theme	89	share/eiskaltdcpp/gtk/themes/mankthemedark.theme
106	@dirrm share/eiskaltdcpp/gtk/glade	90	share/eiskaltdcpp/gtk/ui/adlsearch.ui
		91	share/eiskaltdcpp/gtk/ui/cmddebug.ui
		92	share/eiskaltdcpp/gtk/ui/downloadqueue.ui
		93	share/eiskaltdcpp/gtk/ui/favoritehubs.ui
		94	share/eiskaltdcpp/gtk/ui/favoriteusers.ui
		95	share/eiskaltdcpp/gtk/ui/finishedtransfers.ui
		96	share/eiskaltdcpp/gtk/ui/hash.ui
		97	share/eiskaltdcpp/gtk/ui/hub.ui
		98	share/eiskaltdcpp/gtk/ui/mainwindow.ui
		99	share/eiskaltdcpp/gtk/ui/privatemessage.ui
		100	share/eiskaltdcpp/gtk/ui/publichubs.ui
		101	share/eiskaltdcpp/gtk/ui/search.ui
		102	share/eiskaltdcpp/gtk/ui/searchspy.ui
		103	share/eiskaltdcpp/gtk/ui/settingsdialog.ui
		104	share/eiskaltdcpp/gtk/ui/sharebrowser.ui
		105	share/eiskaltdcpp/gtk/ui/transfers.ui
		106	share/locale/be/LC_MESSAGES/eiskaltdcpp-gtk.mo
		107	share/locale/bg/LC_MESSAGES/eiskaltdcpp-gtk.mo
		108	share/locale/cs/LC_MESSAGES/eiskaltdcpp-gtk.mo
		109	share/locale/de/LC_MESSAGES/eiskaltdcpp-gtk.mo
		110	share/locale/en/LC_MESSAGES/eiskaltdcpp-gtk.mo
		111	share/locale/es/LC_MESSAGES/eiskaltdcpp-gtk.mo
		112	share/locale/fr/LC_MESSAGES/eiskaltdcpp-gtk.mo
		113	share/locale/hu/LC_MESSAGES/eiskaltdcpp-gtk.mo
		114	share/locale/pl/LC_MESSAGES/eiskaltdcpp-gtk.mo
		115	share/locale/ru/LC_MESSAGES/eiskaltdcpp-gtk.mo
		116	share/locale/sk/LC_MESSAGES/eiskaltdcpp-gtk.mo
		117	share/locale/sr/LC_MESSAGES/eiskaltdcpp-gtk.mo
		118	share/locale/uk/LC_MESSAGES/eiskaltdcpp-gtk.mo
107	@dirrm share/eiskaltdcpp/gtk/icons/hicolor/16x16/status	119	@dirrm share/eiskaltdcpp/gtk/icons/hicolor/16x16/status
108	@dirrm share/eiskaltdcpp/gtk/icons/hicolor/16x16	120	@dirrm share/eiskaltdcpp/gtk/icons/hicolor/16x16
109	@dirrm share/eiskaltdcpp/gtk/icons/hicolor/22x22/emotes	121	@dirrm share/eiskaltdcpp/gtk/icons/hicolor/22x22/emotes
Lines 123-127 share/eiskaltdcpp/gtk/themes/mankthemedark.theme Link Here
123	@dirrm share/eiskaltdcpp/gtk/themes/hicolor/16x16	135	@dirrm share/eiskaltdcpp/gtk/themes/hicolor/16x16
124	@dirrm share/eiskaltdcpp/gtk/themes/hicolor	136	@dirrm share/eiskaltdcpp/gtk/themes/hicolor
125	@dirrm share/eiskaltdcpp/gtk/themes	137	@dirrm share/eiskaltdcpp/gtk/themes
		138	@dirrm share/eiskaltdcpp/gtk/ui
126	@dirrm share/eiskaltdcpp/gtk	139	@dirrm share/eiskaltdcpp/gtk
127	@dirrmtry share/applications	140	@dirrmtry share/applications

Lines 1-6 Link Here

(-)b/net-p2p/eiskaltdcpp-lib/files/patch-dcpp__CMakeLists.txt (-9 / +9 lines)
1	--- ./dcpp/CMakeLists.txt.orig 2011-03-08 19:47:12.000000000 +0200	1	--- dcpp/CMakeLists.txt.orig 2011-10-02 18:12:43.000000000 +0300
2	+++ ./dcpp/CMakeLists.txt 2011-03-09 19:22:26.000000000 +0200	2	+++ dcpp/CMakeLists.txt 2011-10-03 10:14:13.000000000 +0300
3	@@ -30,8 +30,6 @@	3	@@ -34,8 +34,6 @@
4	set (APPLE_LIBS "iconv")	4	set (APPLE_LIBS "iconv")
5	endif (APPLE)	5	endif (APPLE)
6		6
Lines 8-26 Link Here
8	-	8	-
9	add_library (dcpp ${LINK} ${dcpp_srcs})	9	add_library (dcpp ${LINK} ${dcpp_srcs})
10		10
11	if (USE_DHT)	11	if (WITH_DHT)
12	@@ -71,8 +69,8 @@	12	@@ -76,8 +74,8 @@
13	endif (WIN32)	13	endif (WIN32)
14		14
15	target_link_libraries (dcpp ${PTHREADS} ${BZIP2_LIBRARIES} ${ZLIB_LIBRARIES}	15	target_link_libraries (dcpp ${DHT_LIB} ${PTHREADS} ${BZIP2_LIBRARIES} ${ZLIB_LIBRARIES}
16	-${OPENSSL_LIBRARIES} ${GETTEXT_LIBRARIES} ${ICONV_LIBRARIES} ${WIN32_LIBS} ${APPLE_LIBS} ${LUA_LIBRARIES} ${UPNP} ${PCRE} ${DHT_LIB})	16	-${OPENSSL_LIBRARIES} ${GETTEXT_LIBRARIES} ${ICONV_LIBRARIES} ${WIN32_LIBS} ${APPLE_LIBS} ${LUA_LIBRARIES} ${UPNP} ${PCRE} ${IDNA_LIBRARIES})
17	-set_target_properties(dcpp PROPERTIES VERSION ${SOVERSION} OUTPUT_NAME "eiskaltdcpp")	17	-set_target_properties(dcpp PROPERTIES VERSION ${SOVERSION} OUTPUT_NAME "eiskaltdcpp")
18	+${OPENSSL_LIBRARIES} ${GETTEXT_LIBRARIES} ${ICONV_LIBRARIES} ${WIN32_LIBS} ${APPLE_LIBS} ${LUA_LIBRARIES} ${UPNP} ${PCRE} ${DHT_LIB} extra)	18	+${OPENSSL_LIBRARIES} ${GETTEXT_LIBRARIES} ${ICONV_LIBRARIES} ${WIN32_LIBS} ${APPLE_LIBS} ${LUA_LIBRARIES} ${UPNP} ${PCRE} ${IDNA_LIBRARIES} extra)
19	+set_target_properties(dcpp PROPERTIES SOVERSION 2 VERSION ${SOVERSION} OUTPUT_NAME "eiskaltdcpp")	19	+set_target_properties(dcpp PROPERTIES SOVERSION 2 VERSION ${SOVERSION} OUTPUT_NAME "eiskaltdcpp")
20		20
21	if (APPLE)	21	if (APPLE)
22	set (LIBDIR1 .)	22	set (LIBDIR1 .)
23	@@ -81,6 +79,6 @@	23	@@ -86,6 +84,6 @@
24		24
25	if (LINK STREQUAL SHARED)	25	if (LINK STREQUAL SHARED)
26	install (TARGETS dcpp	26	install (TARGETS dcpp

Lines 3-10 include/eiskaltdcpp/dcpp/AdcCommand.h Link Here

(-)b/net-p2p/eiskaltdcpp-lib/pkg-plist (-2 / +8 lines)
3	include/eiskaltdcpp/dcpp/AdcHub.h	3	include/eiskaltdcpp/dcpp/AdcHub.h
4	include/eiskaltdcpp/dcpp/Atomic.h	4	include/eiskaltdcpp/dcpp/Atomic.h
5	include/eiskaltdcpp/dcpp/BZUtils.h	5	include/eiskaltdcpp/dcpp/BZUtils.h
6	include/eiskaltdcpp/dcpp/BitInputStream.h
7	include/eiskaltdcpp/dcpp/BitOutputStream.h
8	include/eiskaltdcpp/dcpp/BloomFilter.h	6	include/eiskaltdcpp/dcpp/BloomFilter.h
9	include/eiskaltdcpp/dcpp/BufferedSocket.h	7	include/eiskaltdcpp/dcpp/BufferedSocket.h
10	include/eiskaltdcpp/dcpp/BufferedSocketListener.h	8	include/eiskaltdcpp/dcpp/BufferedSocketListener.h
Lines 61-66 include/eiskaltdcpp/dcpp/SSLSocket.h Link Here
61	include/eiskaltdcpp/dcpp/ScriptManager.h	59	include/eiskaltdcpp/dcpp/ScriptManager.h
62	include/eiskaltdcpp/dcpp/SearchManager.h	60	include/eiskaltdcpp/dcpp/SearchManager.h
63	include/eiskaltdcpp/dcpp/SearchManagerListener.h	61	include/eiskaltdcpp/dcpp/SearchManagerListener.h
		62	include/eiskaltdcpp/dcpp/SearchQueue.h
64	include/eiskaltdcpp/dcpp/SearchResult.h	63	include/eiskaltdcpp/dcpp/SearchResult.h
65	include/eiskaltdcpp/dcpp/Segment.h	64	include/eiskaltdcpp/dcpp/Segment.h
66	include/eiskaltdcpp/dcpp/Semaphore.h	65	include/eiskaltdcpp/dcpp/Semaphore.h
Lines 96-104 include/eiskaltdcpp/dcpp/WindowInfo.h Link Here
96	include/eiskaltdcpp/dcpp/WindowManager.h	95	include/eiskaltdcpp/dcpp/WindowManager.h
97	include/eiskaltdcpp/dcpp/WindowManagerListener.h	96	include/eiskaltdcpp/dcpp/WindowManagerListener.h
98	include/eiskaltdcpp/dcpp/ZUtils.h	97	include/eiskaltdcpp/dcpp/ZUtils.h
		98	include/eiskaltdcpp/dcpp/compiler.h
		99	include/eiskaltdcpp/dcpp/debug.h
		100	include/eiskaltdcpp/dcpp/format.h
99	include/eiskaltdcpp/dcpp/forward.h	101	include/eiskaltdcpp/dcpp/forward.h
		102	include/eiskaltdcpp/dcpp/noexcept.h
100	include/eiskaltdcpp/dcpp/stdinc.h	103	include/eiskaltdcpp/dcpp/stdinc.h
		104	include/eiskaltdcpp/dcpp/typedefs.h
101	include/eiskaltdcpp/dcpp/version.h	105	include/eiskaltdcpp/dcpp/version.h
		106	include/eiskaltdcpp/dcpp/w.h
102	@dirrm include/eiskaltdcpp/dcpp	107	@dirrm include/eiskaltdcpp/dcpp
103	@dirrm include/eiskaltdcpp	108	@dirrm include/eiskaltdcpp
104	lib/libeiskaltdcpp.so.2.2	109	lib/libeiskaltdcpp.so.2.2
Lines 107-112 lib/libeiskaltdcpp.so Link Here
107	share/locale/be/LC_MESSAGES/libeiskaltdcpp.mo	112	share/locale/be/LC_MESSAGES/libeiskaltdcpp.mo
108	share/locale/bg/LC_MESSAGES/libeiskaltdcpp.mo	113	share/locale/bg/LC_MESSAGES/libeiskaltdcpp.mo
109	share/locale/cs/LC_MESSAGES/libeiskaltdcpp.mo	114	share/locale/cs/LC_MESSAGES/libeiskaltdcpp.mo
		115	share/locale/de/LC_MESSAGES/libeiskaltdcpp.mo
110	share/locale/en/LC_MESSAGES/libeiskaltdcpp.mo	116	share/locale/en/LC_MESSAGES/libeiskaltdcpp.mo
111	share/locale/es/LC_MESSAGES/libeiskaltdcpp.mo	117	share/locale/es/LC_MESSAGES/libeiskaltdcpp.mo
112	share/locale/fr/LC_MESSAGES/libeiskaltdcpp.mo	118	share/locale/fr/LC_MESSAGES/libeiskaltdcpp.mo

Lines 6-12 Link Here

(-)b/net-p2p/eiskaltdcpp-qt/Makefile (-2 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= eiskaltdcpp-qt	8	PORTNAME= eiskaltdcpp-qt
9	PORTVERSION= 2.2.1	9	PORTVERSION= 2.2.4
10	CATEGORIES= net-p2p	10	CATEGORIES= net-p2p
11	MASTER_SITES= GOOGLE_CODE	11	MASTER_SITES= GOOGLE_CODE
12	DISTNAME= eiskaltdcpp-${DISTVERSION}	12	DISTNAME= eiskaltdcpp-${DISTVERSION}
Lines 25-31 CMAKE_ARGS+= -DBUILD_LIB:BOOL=OFF Link Here
25	PROJECTHOST= eiskaltdc	25	PROJECTHOST= eiskaltdc
26		26
27	USE_XZ= yes	27	USE_XZ= yes
28	USE_GCC= 4.2+	28	USE_GCC= 4.4+
29	USE_GETTEXT= yes	29	USE_GETTEXT= yes
30	USE_CMAKE= yes	30	USE_CMAKE= yes
31	USE_OPENSSL= yes	31	USE_OPENSSL= yes
Lines 50-55 CMAKE_ARGS+= -DUSE_GTK:BOOL=OFF Link Here
50	CMAKE_ARGS+= -DEISKALTDCPP_INCLUDE_DIR:STRING="${LOCALBASE}/include/eiskaltdcpp"	50	CMAKE_ARGS+= -DEISKALTDCPP_INCLUDE_DIR:STRING="${LOCALBASE}/include/eiskaltdcpp"
51	CMAKE_ARGS+= -DCREATE_MO:BOOL=OFF	51	CMAKE_ARGS+= -DCREATE_MO:BOOL=OFF
52	CMAKE_ARGS+= -DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib:${PREFIX}/lib"	52	CMAKE_ARGS+= -DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib:${PREFIX}/lib"
		53	CMAKE_ARGS+= -DCMAKE_SKIP_RPATH:BOOL=ON
53		54
54	BUILD_WRKSRC= ${WRKSRC}/${PORTNAME}	55	BUILD_WRKSRC= ${WRKSRC}/${PORTNAME}
55	INSTALL_WRKSRC= ${WRKSRC}/${PORTNAME}	56	INSTALL_WRKSRC= ${WRKSRC}/${PORTNAME}

Lines 1-8 Link Here

(-)b/net-p2p/eiskaltdcpp-qt/files/patch-CMakeLists.txt (-24 / +8 lines)
1	--- ./CMakeLists.txt.orig 2011-03-08 19:47:12.000000000 +0200	1	--- CMakeLists.txt.orig 2011-10-02 18:12:43.000000000 +0300
2	+++ ./CMakeLists.txt 2011-03-09 15:49:15.000000000 +0200	2	+++ CMakeLists.txt 2011-10-03 10:40:18.000000000 +0300
3	@@ -316,16 +316,14 @@	3	@@ -370,16 +370,14 @@
4	if (MINGW)	4	else (MINGW)
5	set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--enable-auto-import")	5	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
6	endif (MINGW)	6	endif (MINGW)
7	- if (NOT APPLE)	7	- if (NOT APPLE)
8	- set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,--as-needed")	8	- set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,--as-needed")
Lines 20-28 Link Here
20	${eiskaltdcpp_SOURCE_DIR}	20	${eiskaltdcpp_SOURCE_DIR}
21	${GMP_INCLUDE_DIR}	21	${GMP_INCLUDE_DIR}
22	)	22	)
23	@@ -395,7 +393,9 @@	23	@@ -451,7 +449,9 @@
24	add_subdirectory (dht)	24	add_subdirectory (dht)
25	endif (DHT)	25	endif (WITH_DHT)
26		26
27	-add_subdirectory (dcpp)	27	-add_subdirectory (dcpp)
28	+if (BUILD_LIB)	28	+if (BUILD_LIB)
Lines 31-49 Link Here
31		31
32	if (USE_QT)	32	if (USE_QT)
33	add_subdirectory (eiskaltdcpp-qt)	33	add_subdirectory (eiskaltdcpp-qt)
34	@@ -443,11 +443,11 @@
35	LOCALE_LIST "${LANGUAGES}"
36	COPYRIGHT_HOLDER "EiskaltDC++ team"
37	SOURCES "${DCPP_SRCS};${DCPP_HDRS}"
38	- PO_DIR "${dcpp_SOURCE_DIR}/po"
39	- POT_BUILD_DIR "${dcpp_SOURCE_DIR}/po"
40	+ PO_DIR "${PROJECT_SOURCE_DIR}/po"
41	+ POT_BUILD_DIR "${PROJECT_SOURCE_DIR}/po"
42	#PO_PREFIX ""
43	- PO_BUILD_DIR "${dcpp_SOURCE_DIR}/po"
44	- MO_BUILD_DIR "${dcpp_BINARY_DIR}/locale"
45	+ PO_BUILD_DIR "${PROJECT_SOURCE_DIR}/po"
46	+ MO_BUILD_DIR "${PROJECT_BINARY_DIR}/locale"
47	MO_INSTALL_DIR "/${LOCALE_DIR}"
48	CREATE_POT_TARGET ${create_pot}
49	CREATE_PO_TARGET ${create_po}

Lines 1-8 Link Here

(-)b/net-p2p/eiskaltdcpp-qt/files/patch-eiskaltdcpp-qt__CMakeLists.txt (-9 / +9 lines)
1	--- ./eiskaltdcpp-qt/CMakeLists.txt.orig 2011-03-08 19:47:12.000000000 +0200	1	--- eiskaltdcpp-qt/CMakeLists.txt.orig 2011-10-02 18:12:43.000000000 +0300
2	+++ ./eiskaltdcpp-qt/CMakeLists.txt 2011-03-09 15:49:15.000000000 +0200	2	+++ eiskaltdcpp-qt/CMakeLists.txt 2011-10-03 11:20:59.000000000 +0300
3	@@ -356,6 +356,10 @@	3	@@ -359,6 +359,10 @@
4	set_property(SOURCE ${PROJECT_SOURCE_DIR}/src/main.cpp PROPERTY COMPILE_DEFINITIONS FORCE_XDG )	4	set_property(SOURCE ${PROJECT_SOURCE_DIR}/src/main.cpp PROPERTY COMPILE_DEFINITIONS ENABLE_STACKTRACE)
5	endif (FORCE_XDG)	5	endif (ENABLE_STACKTRACE)
6		6
7	+if (USE_MINIUPNP OR FREE_SPACE_BAR_C)	7	+if (USE_MINIUPNP OR FREE_SPACE_BAR_C)
8	+ list(APPEND LIBS extra)	8	+ list(APPEND LIBS extra)
Lines 11-17 Link Here
11	if (APPLE)	11	if (APPLE)
12	set (MACOSICON "${PROJECT_SOURCE_DIR}/../icons/icon_128x128.icns")	12	set (MACOSICON "${PROJECT_SOURCE_DIR}/../icons/icon_128x128.icns")
13	set (MACOSICONINBUNDLE "icon_128x128.icns")	13	set (MACOSICONINBUNDLE "icon_128x128.icns")
14	@@ -393,10 +397,19 @@	14	@@ -396,10 +400,19 @@
15	add_definitions(-DCLIENT_RES_DIR="${CLIENT_DATA_DIR}/qt/resources")	15	add_definitions(-DCLIENT_RES_DIR="${CLIENT_DATA_DIR}/qt/resources")
16	endif (APPLE)	16	endif (APPLE)
17		17
Lines 33-44 Link Here
33	endif (APPLE)	33	endif (APPLE)
34		34
35	if (APPLE)	35	if (APPLE)
36	@@ -464,7 +477,7 @@	36	@@ -469,7 +482,7 @@
37	else (APPLE)	37	else (APPLE)
38	install (FILES ${PROJECT_BINARY_DIR}/default.rcc DESTINATION ${CLIENT_DATA_DIR}/qt/resources)	38	install (FILES ${PROJECT_BINARY_DIR}/default.rcc DESTINATION ${CLIENT_DATA_DIR}/qt/resources)
39	if (UNIX)	39	if (UNIX AND NOT HAIKU)
40	- install (FILES ${PROJECT_BINARY_DIR}/eiskaltdcpp-qt.1.gz DESTINATION ${SHARE_DIR}/man/man1)	40	- install (FILES ${PROJECT_BINARY_DIR}/eiskaltdcpp-qt.1.gz DESTINATION ${SHARE_DIR}/man/man1)
41	+ install (FILES ${PROJECT_BINARY_DIR}/eiskaltdcpp-qt.1.gz DESTINATION man/man1)	41	+ install (FILES ${PROJECT_BINARY_DIR}/eiskaltdcpp-qt.1.gz DESTINATION man/man1)
42	install (FILES eiskaltdcpp-qt.desktop DESTINATION ${SHARE_DIR}/applications)	42	install (FILES eiskaltdcpp-qt.desktop DESTINATION ${SHARE_DIR}/applications)
43	endif (UNIX)	43	endif (UNIX AND NOT HAIKU)
44	endif (APPLE)	44	endif (APPLE)

Removed Link Here

(-)a/net-p2p/eiskaltdcpp-qt/files/patch-eiskaltdcpp-qt__src__main.cpp (-20 lines)
1	--- ./eiskaltdcpp-qt/src/main.cpp.orig 2011-03-09 15:49:53.000000000 +0200
2	+++ ./eiskaltdcpp-qt/src/main.cpp 2011-03-09 15:50:14.000000000 +0200
3	@@ -58,8 +58,6 @@
4	#include <signal.h>
5	#include <execinfo.h>
6
7	-#include "extra/stacktrace.h"
8	-
9	void installHandlers();
10
11	#ifdef FORCE_XDG
12	@@ -214,8 +212,6 @@
13	std::cout << QObject::tr("Cannot handle SIGPIPE").toStdString() << std::endl;
14	}
15
16	- signal(SIGSEGV, printBacktrace);
17	-
18	std::cout << QObject::tr("Signal handlers installed.").toStdString() << std::endl;
19	}
20

Lines 138-143 share/eiskaltdcpp/qt/icons/appl/faenza/view-close.png Link Here

(-)b/net-p2p/eiskaltdcpp-qt/pkg-plist (+71 lines)
138	share/eiskaltdcpp/qt/icons/appl/faenza/view-filter.png	138	share/eiskaltdcpp/qt/icons/appl/faenza/view-filter.png
139	share/eiskaltdcpp/qt/icons/appl/faenza/zoom-in.png	139	share/eiskaltdcpp/qt/icons/appl/faenza/zoom-in.png
140	share/eiskaltdcpp/qt/icons/appl/faenza/zoom-out.png	140	share/eiskaltdcpp/qt/icons/appl/faenza/zoom-out.png
		141	share/eiskaltdcpp/qt/icons/appl/monochrome/adls.png
		142	share/eiskaltdcpp/qt/icons/appl/monochrome/application-exit.png
		143	share/eiskaltdcpp/qt/icons/appl/monochrome/application-x-archive.png
		144	share/eiskaltdcpp/qt/icons/appl/monochrome/application-x-executable.png
		145	share/eiskaltdcpp/qt/icons/appl/monochrome/audio-x-generic.png
		146	share/eiskaltdcpp/qt/icons/appl/monochrome/ball_green.png
		147	share/eiskaltdcpp/qt/icons/appl/monochrome/bookmark-new.png
		148	share/eiskaltdcpp/qt/icons/appl/monochrome/chat.png
		149	share/eiskaltdcpp/qt/icons/appl/monochrome/configure.png
		150	share/eiskaltdcpp/qt/icons/appl/monochrome/console.png
		151	share/eiskaltdcpp/qt/icons/appl/monochrome/default.qrc
		152	share/eiskaltdcpp/qt/icons/appl/monochrome/dialog-close.png
		153	share/eiskaltdcpp/qt/icons/appl/monochrome/document-edit.png
		154	share/eiskaltdcpp/qt/icons/appl/monochrome/download.png
		155	share/eiskaltdcpp/qt/icons/appl/monochrome/edit-clear-locationbar-rtl.png
		156	share/eiskaltdcpp/qt/icons/appl/monochrome/edit-clear.png
		157	share/eiskaltdcpp/qt/icons/appl/monochrome/edit-copy.png
		158	share/eiskaltdcpp/qt/icons/appl/monochrome/edit-delete.png
		159	share/eiskaltdcpp/qt/icons/appl/monochrome/edit-find.png
		160	share/eiskaltdcpp/qt/icons/appl/monochrome/eraser.png
		161	share/eiskaltdcpp/qt/icons/appl/monochrome/face-smile.png
		162	share/eiskaltdcpp/qt/icons/appl/monochrome/fav.png
		163	share/eiskaltdcpp/qt/icons/appl/monochrome/favadd.png
		164	share/eiskaltdcpp/qt/icons/appl/monochrome/favrem.png
		165	share/eiskaltdcpp/qt/icons/appl/monochrome/favserver.png
		166	share/eiskaltdcpp/qt/icons/appl/monochrome/favusers.png
		167	share/eiskaltdcpp/qt/icons/appl/monochrome/find.png
		168	share/eiskaltdcpp/qt/icons/appl/monochrome/folder-blue.png
		169	share/eiskaltdcpp/qt/icons/appl/monochrome/freespace.png
		170	share/eiskaltdcpp/qt/icons/appl/monochrome/go-down-search.png
		171	share/eiskaltdcpp/qt/icons/appl/monochrome/go-down.png
		172	share/eiskaltdcpp/qt/icons/appl/monochrome/go-up-search.png
		173	share/eiskaltdcpp/qt/icons/appl/monochrome/go-up.png
		174	share/eiskaltdcpp/qt/icons/appl/monochrome/gui.png
		175	share/eiskaltdcpp/qt/icons/appl/monochrome/hashing.png
		176	share/eiskaltdcpp/qt/icons/appl/monochrome/hubmsg.png
		177	share/eiskaltdcpp/qt/icons/appl/monochrome/icon_appl.png
		178	share/eiskaltdcpp/qt/icons/appl/monochrome/icon_appl_big.png
		179	share/eiskaltdcpp/qt/icons/appl/monochrome/icon_msg.png
		180	share/eiskaltdcpp/qt/icons/appl/monochrome/im-user-away.png
		181	share/eiskaltdcpp/qt/icons/appl/monochrome/image-x-generic.png
		182	share/eiskaltdcpp/qt/icons/appl/monochrome/list-add.png
		183	share/eiskaltdcpp/qt/icons/appl/monochrome/log_file.png
		184	share/eiskaltdcpp/qt/icons/appl/monochrome/message.png
		185	share/eiskaltdcpp/qt/icons/appl/monochrome/network-connect.png
		186	share/eiskaltdcpp/qt/icons/appl/monochrome/network-disconnect.png
		187	share/eiskaltdcpp/qt/icons/appl/monochrome/openlist.png
		188	share/eiskaltdcpp/qt/icons/appl/monochrome/own_filelist.png
		189	share/eiskaltdcpp/qt/icons/appl/monochrome/plugin.png
		190	share/eiskaltdcpp/qt/icons/appl/monochrome/pmmsg.png
		191	share/eiskaltdcpp/qt/icons/appl/monochrome/qt-logo.png
		192	share/eiskaltdcpp/qt/icons/appl/monochrome/reconnect.png
		193	share/eiskaltdcpp/qt/icons/appl/monochrome/refrlist.png
		194	share/eiskaltdcpp/qt/icons/appl/monochrome/reload.png
		195	share/eiskaltdcpp/qt/icons/appl/monochrome/server.png
		196	share/eiskaltdcpp/qt/icons/appl/monochrome/slow.png
		197	share/eiskaltdcpp/qt/icons/appl/monochrome/slow_off.png
		198	share/eiskaltdcpp/qt/icons/appl/monochrome/spam.png
		199	share/eiskaltdcpp/qt/icons/appl/monochrome/spy.png
		200	share/eiskaltdcpp/qt/icons/appl/monochrome/status.png
		201	share/eiskaltdcpp/qt/icons/appl/monochrome/text-x-generic.png
		202	share/eiskaltdcpp/qt/icons/appl/monochrome/transfer.png
		203	share/eiskaltdcpp/qt/icons/appl/monochrome/unknown.png
		204	share/eiskaltdcpp/qt/icons/appl/monochrome/users.png
205	share/eiskaltdcpp/qt/icons/appl/monochrome/video-x-generic.png
206	share/eiskaltdcpp/qt/icons/appl/monochrome/view-close.png
207	share/eiskaltdcpp/qt/icons/appl/monochrome/view-filter.png
208	share/eiskaltdcpp/qt/icons/appl/monochrome/zoom-in.png
209	share/eiskaltdcpp/qt/icons/appl/monochrome/zoom-out.png
141	share/eiskaltdcpp/qt/icons/user/valknut/usericons.png	210	share/eiskaltdcpp/qt/icons/user/valknut/usericons.png
142	%%QTSCRIPT%%share/eiskaltdcpp/qt/qtscripts/amarok_nowplay/amarok.png	211	%%QTSCRIPT%%share/eiskaltdcpp/qt/qtscripts/amarok_nowplay/amarok.png
143	%%QTSCRIPT%%share/eiskaltdcpp/qt/qtscripts/amarok_nowplay/amarok.sh	212	%%QTSCRIPT%%share/eiskaltdcpp/qt/qtscripts/amarok_nowplay/amarok.sh
Lines 171-176 share/eiskaltdcpp/qt/resources/default.rcc Link Here
171	share/eiskaltdcpp/qt/ts/be.qm	240	share/eiskaltdcpp/qt/ts/be.qm
172	share/eiskaltdcpp/qt/ts/bg.qm	241	share/eiskaltdcpp/qt/ts/bg.qm
173	share/eiskaltdcpp/qt/ts/cs.qm	242	share/eiskaltdcpp/qt/ts/cs.qm
		243	share/eiskaltdcpp/qt/ts/de.qm
174	share/eiskaltdcpp/qt/ts/en.qm	244	share/eiskaltdcpp/qt/ts/en.qm
175	share/eiskaltdcpp/qt/ts/es.qm	245	share/eiskaltdcpp/qt/ts/es.qm
176	share/eiskaltdcpp/qt/ts/fr.qm	246	share/eiskaltdcpp/qt/ts/fr.qm
Lines 191-196 share/eiskaltdcpp/qt/ts/uk.qm Link Here
191	%%QTSCRIPT%%@dirrm share/eiskaltdcpp/qt/qtscripts	261	%%QTSCRIPT%%@dirrm share/eiskaltdcpp/qt/qtscripts
192	@dirrm share/eiskaltdcpp/qt/icons/appl/default	262	@dirrm share/eiskaltdcpp/qt/icons/appl/default
193	@dirrm share/eiskaltdcpp/qt/icons/appl/faenza	263	@dirrm share/eiskaltdcpp/qt/icons/appl/faenza
		264	@dirrm share/eiskaltdcpp/qt/icons/appl/monochrome
194	@dirrm share/eiskaltdcpp/qt/icons/appl	265	@dirrm share/eiskaltdcpp/qt/icons/appl
195	@dirrm share/eiskaltdcpp/qt/icons/user/default	266	@dirrm share/eiskaltdcpp/qt/icons/user/default
196	@dirrm share/eiskaltdcpp/qt/icons/user/valknut	267	@dirrm share/eiskaltdcpp/qt/icons/user/valknut