Attachment #228228 for bug #258717




PORTNAME=	dxirc
PORTVERSION=	1.40.0
PORTREVISION=	3
CATEGORIES=	irc
MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}

MAINTAINER=	archdvx@dxsolutions.org
COMMENT=	Simple IRC client

LICENSE=	GPLv3+

QT5_USES=	qt:5
QT5_USE=		QT=core,gui,multimedia,network,widgets \
			QT=buildtools_build,qmake_build
QT5_CMAKE_ON=		-DQT5:BOOL=ON

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/irc/dxirc/distinfo (-3 / +2 lines)
1	TIMESTAMP = 1479762158	1	SHA256 (dxirc-1.40.0.tar.gz) = 15d2fc8c86ef1a91714cb0255db39bf2dda0162d46ff6a8cd2439e44e9041548
2	SHA256 (dxirc-1.30.0.tar.gz) = 8a98441f8e3ce3a77e5af8f783e439690ac08f7672616a03151b9892e9ff948d	2	SIZE (dxirc-1.40.0.tar.gz) = 1343202
3	SIZE (dxirc-1.30.0.tar.gz) = 1300576

Lines 1-7 Link Here

(-)b/irc/dxirc/files/patch-CMakeLists.txt (-4 / +4 lines)
1	--- CMakeLists.txt.orig 2015-10-28 18:53:26 UTC	1	--- CMakeLists.txt.orig
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -5,13 +5,17 @@ set(PROJECT_VERSION "1.30.0")	3	@@ -22,13 +22,17 @@
4	list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")	4	endif()
5		5
6	find_package(PkgConfig)	6	find_package(PkgConfig)
7	-find_package(Libintl)	7	-find_package(Libintl)
Lines 22-28 Link Here
22		22
23	if(NOT WIN32)	23	if(NOT WIN32)
24	option(HAVE_ENCHANT "Enable spellchecking" FALSE)	24	option(HAVE_ENCHANT "Enable spellchecking" FALSE)
25	@@ -23,11 +27,14 @@ if(APPLE)	25	@@ -40,11 +40,14 @@
26	option(ENABLE_OSX_BUNDLE "Package dxirc as an OSX bundle (ignored on other platforms)." OFF)	26	option(ENABLE_OSX_BUNDLE "Package dxirc as an OSX bundle (ignored on other platforms)." OFF)
27	endif(APPLE)	27	endif(APPLE)
28		28




--- data/CMakeLists.txt.orig
+++ data/CMakeLists.txt
@@ -1,7 +1,14 @@
-add_subdirectory(translations)
-
+if(WITH_NLS)
+ add_subdirectory(translations)
+endif(WITH_NLS)
+ 
 if(NOT WIN32)
-install(FILES dxirc-fox.desktop dxirc-qt.desktop DESTINATION share/applications)
+  if(BUILD_FOX)




--- fox/CMakeLists.txt.orig	2015-11-16 14:35:35 UTC
+++ fox/CMakeLists.txt
@@ -16,8 +16,17 @@
 
 if(PKG_CONFIG_FOUND)
     pkg_check_modules(FOX fox)

 endif(PKG_CONFIG_FOUND)
 
 if(NOT FOX_FOUND)
@@ -43,16 +52,14 @@
 
 set(HAVE_X11 FALSE)
 if(NOT WIN32)

 else(NOT WIN32)
     list(APPEND DXIRCFOX_LIBS "ws2_32" "winmm")
 endif(NOT WIN32)
@@ -86,21 +93,21 @@
 set(HAVE_ENCHANT2 FALSE)
 if(USE_ENCHANT)
     if(PKG_CONFIG_FOUND)
-        pkg_check_modules(ENCHANT enchant-2)
-        list(APPEND DXIRCFOX_LIBS ${ENCHANT_LIBRARIES})
-        list(APPEND DXIRCFOX_INCLUDE_DIRS ${ENCHANT_INCLUDE_DIRS})
+         pkg_check_modules(ENCHANT enchant)
+        find_path(ENCHANT_INCLUDE_DIR enchant++.h
+        PATHS
+        ${ENCHANT_INCLUDE_DIRS}

+        /usr/local/lib)
+        list(APPEND DXIRCFOX_LIBS ${ENCHANT_LIBRARY})
+        list(APPEND DXIRCFOX_INCLUDE_DIRS ${ENCHANT_INCLUDE_DIR})
         set(HAVE_ENCHANT TRUE)
         if(${ENCHANT_VERSION} VERSION_GREATER "1.6")
             set(HAVE_ENCHANT2 TRUE)
-        endif()
-        if(NOT ENCHANT_FOUND)
-            pkg_check_modules(ENCHANT enchant)
-            list(APPEND DXIRCFOX_LIBS ${ENCHANT_LIBRARIES})
-            list(APPEND DXIRCFOX_INCLUDE_DIRS ${ENCHANT_INCLUDE_DIRS})
-            set(HAVE_ENCHANT TRUE)
-            if(${ENCHANT_VERSION} VERSION_GREATER "1.6")
-                set(HAVE_ENCHANT2 TRUE)
-            endif()
         endif()
     endif(PKG_CONFIG_FOUND)
     if(NOT ENCHANT_FOUND)





--- qt/CMakeLists.txt.orig
+++ qt/CMakeLists.txt
@@ -5,11 +5,11 @@
 option(QT6 "Compile with Qt6" FALSE)
 
 if(UNIX)
-    if(BSD)

 endif(UNIX)
 
 SET(DXIRCQT_LIBS "")
@@ -30,22 +30,22 @@
 
 if(NOT APPLE)
     if(USE_ENCHANT)
         if(PKG_CONFIG_FOUND)
-            pkg_check_modules(ENCHANT enchant-2)
-            list(APPEND DXIRCQT_LIBS ${ENCHANT_LIBRARIES})
-            list(APPEND DXIRCQT_INCLUDE_DIRS ${ENCHANT_INCLUDE_DIRS})
-            set(HAVE_ENCHANT TRUE)
-            if(${ENCHANT_VERSION} VERSION_GREATER "1.6")
-                set(HAVE_ENCHANT2 TRUE)
-            endif()
-            if(NOT ENCHANT_FOUND)
-                pkg_check_modules(ENCHANT enchant)
-                list(APPEND DXIRCQT_LIBS ${ENCHANT_LIBRARIES})
-                list(APPEND DXIRCQT_INCLUDE_DIRS ${ENCHANT_INCLUDE_DIRS})
-                set(HAVE_ENCHANT TRUE)
-                if(${ENCHANT_VERSION} VERSION_GREATER "1.6")
-                    set(HAVE_ENCHANT2 TRUE)
-                endif()
-            endif()
+         pkg_check_modules(ENCHANT enchant)
+         find_path(ENCHANT_INCLUDE_DIR enchant++.h
+         PATHS

+         /usr/local/lib)
+         list(APPEND DXIRCQT_LIBS ${ENCHANT_LIBRARY})
+         list(APPEND DXIRCQT_INCLUDE_DIRS ${ENCHANT_INCLUDE_DIR})
+         set(HAVE_ENCHANT TRUE)
+         if(${ENCHANT_VERSION} VERSION_GREATER "1.6")
+             set(HAVE_ENCHANT2 TRUE)
+          endif()
         endif(PKG_CONFIG_FOUND)
         if(NOT ENCHANT_FOUND)
             set(ENCHANT_INCLUDE_DIR "" CACHE PATH "Path to enchant include dir")
@@ -122,6 +122,7 @@
@@ -110,6 +119,7 @@ dialogs/scriptdialog.h
 dialogs/dccsenddialog.h
 dialogs/configdialog.h
 dialogs/keydialog.h

Lines 31-36 Link Here

(-)b/irc/dxirc/pkg-plist (+9 lines)
31	%%DATADIR%%/icons/dxirc.png	31	%%DATADIR%%/icons/dxirc.png
32	%%DATADIR%%/icons/file.png	32	%%DATADIR%%/icons/file.png
33	%%DATADIR%%/icons/find.png	33	%%DATADIR%%/icons/find.png
		34	%%DATADIR%%/icons/flags/ad.png
		35	%%DATADIR%%/icons/flags/ae.png
		36	%%DATADIR%%/icons/flags/af.png
		37	%%DATADIR%%/icons/flags/ag.png
		38	%%DATADIR%%/icons/flags/ai.png
		39	%%DATADIR%%/icons/flags/al.png
		40	%%DATADIR%%/icons/flags/am.png
		41	%%DATADIR%%/icons/flags/an.png
		42	%%DATADIR%%/icons/flags/ao.png
34	%%DATADIR%%/icons/flags/ar.png	43	%%DATADIR%%/icons/flags/ar.png
35	%%DATADIR%%/icons/flags/as.png	44	%%DATADIR%%/icons/flags/as.png
36	%%DATADIR%%/icons/flags/at.png	45	%%DATADIR%%/icons/flags/at.png

Return to bug 258717

Lines 1-10 Link Here

(-)b/irc/dxirc/Makefile (-4 / +2 lines)
1	PORTNAME= dxirc	1	PORTNAME= dxirc
2	PORTVERSION= 1.30.0	2	PORTVERSION= 1.40.0
3	PORTREVISION= 3
4	CATEGORIES= irc	3	CATEGORIES= irc
5	MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}	4	MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}
6		5
7	MAINTAINER= arch_dvx@users.sourceforge.net	6	MAINTAINER= archdvx@dxsolutions.org
8	COMMENT= Simple IRC client	7	COMMENT= Simple IRC client
9		8
10	LICENSE= GPLv3+	9	LICENSE= GPLv3+
Lines 42-47 NOTIFY_RUN_DEPENDS= notify-send:devel/libnotify Link Here
42	QT5_USES= qt:5	41	QT5_USES= qt:5
43	QT5_USE= QT=core,gui,multimedia,network,widgets \	42	QT5_USE= QT=core,gui,multimedia,network,widgets \
44	QT=buildtools_build,qmake_build	43	QT=buildtools_build,qmake_build
45	QT5_CMAKE_ON= -DQT5:BOOL=ON
46		44
47	.include <bsd.port.mk>	45	.include <bsd.port.mk>

Lines 1-12 Link Here

(-)b/irc/dxirc/files/patch-data_CMakeLists.txt (-6 / +6 lines)
1	--- data/CMakeLists.txt.orig 2015-10-28 18:53:26 UTC	1	--- data/CMakeLists.txt.orig
2	+++ data/CMakeLists.txt	2	+++ data/CMakeLists.txt
3	@@ -1,9 +1,16 @@	3	@@ -1,7 +1,14 @@
4	CMAKE_MINIMUM_REQUIRED(VERSION 2.8)	4	-add_subdirectory(translations)
5		5	-
6	+if(WITH_NLS)	6	+if(WITH_NLS)
7	add_subdirectory(translations)	7	+ add_subdirectory(translations)
8	+endif(WITH_NLS)	8	+endif(WITH_NLS)
9		9	+
10	if(NOT WIN32)	10	if(NOT WIN32)
11	-install(FILES dxirc-fox.desktop dxirc-qt.desktop DESTINATION share/applications)	11	-install(FILES dxirc-fox.desktop dxirc-qt.desktop DESTINATION share/applications)
12	+ if(BUILD_FOX)	12	+ if(BUILD_FOX)

Lines 1-6 Link Here

(-)b/irc/dxirc/files/patch-fox_CMakeLists.txt (-6 / +21 lines)
1	--- fox/CMakeLists.txt.orig 2015-11-16 14:35:35 UTC	1	--- fox/CMakeLists.txt.orig 2015-11-16 14:35:35 UTC
2	+++ fox/CMakeLists.txt	2	+++ fox/CMakeLists.txt
3	@@ -20,8 +20,17 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_C	3	@@ -16,8 +16,17 @@
4		4
5	if(PKG_CONFIG_FOUND)	5	if(PKG_CONFIG_FOUND)
6	pkg_check_modules(FOX fox)	6	pkg_check_modules(FOX fox)
Lines 20-26 Link Here
20	endif(PKG_CONFIG_FOUND)	20	endif(PKG_CONFIG_FOUND)
21		21
22	if(NOT FOX_FOUND)	22	if(NOT FOX_FOUND)
23	@@ -47,16 +56,14 @@ endif()	23	@@ -43,16 +52,14 @@
24		24
25	set(HAVE_X11 FALSE)	25	set(HAVE_X11 FALSE)
26	if(NOT WIN32)	26	if(NOT WIN32)
Lines 39-50 Link Here
39	else(NOT WIN32)	39	else(NOT WIN32)
40	list(APPEND DXIRCFOX_LIBS "ws2_32" "winmm")	40	list(APPEND DXIRCFOX_LIBS "ws2_32" "winmm")
41	endif(NOT WIN32)	41	endif(NOT WIN32)
42	@@ -89,8 +96,17 @@ endif(HAVE_LUA)	42	@@ -86,21 +93,21 @@
43	if(HAVE_ENCHANT)	43	set(HAVE_ENCHANT2 FALSE)
		44	if(USE_ENCHANT)
44	if(PKG_CONFIG_FOUND)	45	if(PKG_CONFIG_FOUND)
45	pkg_check_modules(ENCHANT enchant)	46	- pkg_check_modules(ENCHANT enchant-2)
46	- list(APPEND DXIRCFOX_LIBS ${ENCHANT_LIBRARIES})	47	- list(APPEND DXIRCFOX_LIBS ${ENCHANT_LIBRARIES})
47	- list(APPEND DXIRCFOX_INCLUDE_DIRS ${ENCHANT_INCLUDE_DIRS})	48	- list(APPEND DXIRCFOX_INCLUDE_DIRS ${ENCHANT_INCLUDE_DIRS})
		49	+ pkg_check_modules(ENCHANT enchant)
48	+ find_path(ENCHANT_INCLUDE_DIR enchant++.h	50	+ find_path(ENCHANT_INCLUDE_DIR enchant++.h
49	+ PATHS	51	+ PATHS
50	+ ${ENCHANT_INCLUDE_DIRS}	52	+ ${ENCHANT_INCLUDE_DIRS}
Lines 56-61 Link Here
56	+ /usr/local/lib)	58	+ /usr/local/lib)
57	+ list(APPEND DXIRCFOX_LIBS ${ENCHANT_LIBRARY})	59	+ list(APPEND DXIRCFOX_LIBS ${ENCHANT_LIBRARY})
58	+ list(APPEND DXIRCFOX_INCLUDE_DIRS ${ENCHANT_INCLUDE_DIR})	60	+ list(APPEND DXIRCFOX_INCLUDE_DIRS ${ENCHANT_INCLUDE_DIR})
		61	set(HAVE_ENCHANT TRUE)
		62	if(${ENCHANT_VERSION} VERSION_GREATER "1.6")
		63	set(HAVE_ENCHANT2 TRUE)
		64	- endif()
		65	- if(NOT ENCHANT_FOUND)
		66	- pkg_check_modules(ENCHANT enchant)
		67	- list(APPEND DXIRCFOX_LIBS ${ENCHANT_LIBRARIES})
		68	- list(APPEND DXIRCFOX_INCLUDE_DIRS ${ENCHANT_INCLUDE_DIRS})
		69	- set(HAVE_ENCHANT TRUE)
		70	- if(${ENCHANT_VERSION} VERSION_GREATER "1.6")
		71	- set(HAVE_ENCHANT2 TRUE)
		72	- endif()
		73	endif()
59	endif(PKG_CONFIG_FOUND)	74	endif(PKG_CONFIG_FOUND)
60	if(NOT ENCHANT_FOUND)	75	if(NOT ENCHANT_FOUND)
61	set(ENCHANT_INCLUDE_DIR "" CACHE PATH "Path to enchant include dir")	76

Lines 1-7 Link Here

(-)b/irc/dxirc/files/patch-qt_CMakeLists.txt (-13 / +26 lines)
1	--- qt/CMakeLists.txt.orig 2015-11-16 14:35:35 UTC	1	--- qt/CMakeLists.txt.orig
2	+++ qt/CMakeLists.txt	2	+++ qt/CMakeLists.txt
3	@@ -13,11 +13,11 @@ project(dxirc-qt)	3	@@ -5,11 +5,11 @@
4	option(QT5 "Compile with Qt 5" TRUE)	4	option(QT6 "Compile with Qt6" FALSE)
5		5
6	if(UNIX)	6	if(UNIX)
7	- if(BSD)	7	- if(BSD)
Lines 14-29 Link Here
14	endif(UNIX)	14	endif(UNIX)
15		15
16	SET(DXIRCQT_LIBS "")	16	SET(DXIRCQT_LIBS "")
17	@@ -35,11 +35,20 @@ endif(HAVE_LUA)	17	@@ -30,22 +30,22 @@
18
19	if(NOT APPLE)	18	if(NOT APPLE)
20	if(HAVE_ENCHANT)	19	if(USE_ENCHANT)
21	- if(PKG_CONFIG_FOUND)	20	if(PKG_CONFIG_FOUND)
22	- pkg_check_modules(ENCHANT enchant)	21	- pkg_check_modules(ENCHANT enchant-2)
23	- list(APPEND DXIRCQT_LIBS ${ENCHANT_LIBRARIES})	22	- list(APPEND DXIRCQT_LIBS ${ENCHANT_LIBRARIES})
24	- list(APPEND DXIRCQT_INCLUDE_DIRS ${ENCHANT_INCLUDE_DIRS})	23	- list(APPEND DXIRCQT_INCLUDE_DIRS ${ENCHANT_INCLUDE_DIRS})
25	- endif(PKG_CONFIG_FOUND)	24	- set(HAVE_ENCHANT TRUE)
26	+ if(PKG_CONFIG_FOUND)	25	- if(${ENCHANT_VERSION} VERSION_GREATER "1.6")
		26	- set(HAVE_ENCHANT2 TRUE)
		27	- endif()
		28	- if(NOT ENCHANT_FOUND)
		29	- pkg_check_modules(ENCHANT enchant)
		30	- list(APPEND DXIRCQT_LIBS ${ENCHANT_LIBRARIES})
		31	- list(APPEND DXIRCQT_INCLUDE_DIRS ${ENCHANT_INCLUDE_DIRS})
		32	- set(HAVE_ENCHANT TRUE)
		33	- if(${ENCHANT_VERSION} VERSION_GREATER "1.6")
		34	- set(HAVE_ENCHANT2 TRUE)
		35	- endif()
		36	- endif()
27	+ pkg_check_modules(ENCHANT enchant)	37	+ pkg_check_modules(ENCHANT enchant)
28	+ find_path(ENCHANT_INCLUDE_DIR enchant++.h	38	+ find_path(ENCHANT_INCLUDE_DIR enchant++.h
29	+ PATHS	39	+ PATHS
Lines 36-46 Link Here
36	+ /usr/local/lib)	46	+ /usr/local/lib)
37	+ list(APPEND DXIRCQT_LIBS ${ENCHANT_LIBRARY})	47	+ list(APPEND DXIRCQT_LIBS ${ENCHANT_LIBRARY})
38	+ list(APPEND DXIRCQT_INCLUDE_DIRS ${ENCHANT_INCLUDE_DIR})	48	+ list(APPEND DXIRCQT_INCLUDE_DIRS ${ENCHANT_INCLUDE_DIR})
39	+ endif(PKG_CONFIG_FOUND)	49	+ set(HAVE_ENCHANT TRUE)
		50	+ if(${ENCHANT_VERSION} VERSION_GREATER "1.6")
		51	+ set(HAVE_ENCHANT2 TRUE)
		52	+ endif()
		53	endif(PKG_CONFIG_FOUND)
40	if(NOT ENCHANT_FOUND)	54	if(NOT ENCHANT_FOUND)
41	set(ENCHANT_INCLUDE_DIR "" CACHE PATH "Path to enchant include dir")	55	set(ENCHANT_INCLUDE_DIR "" CACHE PATH "Path to enchant include dir")
42	set(ENCHANT_LIBRARY "" CACHE FILEPATH "Filepath to enchant library")	56	@@ -122,6 +122,7 @@
43	@@ -110,6 +119,7 @@ dialogs/scriptdialog.h
44	dialogs/dccsenddialog.h	57	dialogs/dccsenddialog.h
45	dialogs/configdialog.h	58	dialogs/configdialog.h
46	dialogs/keydialog.h	59	dialogs/keydialog.h