Date: Wed, 23 Nov 2016 19:21:20 +0000 (UTC) From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r426961 - in head/irc/dxirc: . files Message-ID: <201611231921.uANJLKwk002812@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhale Date: Wed Nov 23 19:21:19 2016 New Revision: 426961 URL: https://svnweb.freebsd.org/changeset/ports/426961 Log: Update to 1.30.0 Switch to CMake build Convert to options helpers Add support for Qt and set Qt 5.x as the default toolkit Update pkg-descr PR: 210234 Submitted by: David Vachulka <arch_dvx@users.sourceforge.net> (maintainer) Added: head/irc/dxirc/files/ head/irc/dxirc/files/patch-CMakeLists.txt (contents, props changed) head/irc/dxirc/files/patch-data_CMakeLists.txt (contents, props changed) head/irc/dxirc/files/patch-fox_CMakeLists.txt (contents, props changed) head/irc/dxirc/files/patch-qt_CMakeLists.txt (contents, props changed) Modified: head/irc/dxirc/Makefile head/irc/dxirc/distinfo head/irc/dxirc/pkg-descr head/irc/dxirc/pkg-plist Modified: head/irc/dxirc/Makefile ============================================================================== --- head/irc/dxirc/Makefile Wed Nov 23 19:14:19 2016 (r426960) +++ head/irc/dxirc/Makefile Wed Nov 23 19:21:19 2016 (r426961) @@ -1,80 +1,62 @@ # $FreeBSD$ PORTNAME= dxirc -PORTVERSION= 1.10.0 -PORTREVISION= 3 -CATEGORIES= irc +PORTVERSION= 1.30.0 +CATEGORIES= irc ipv6 MASTER_SITES= SF/${PORTNAME}/${PORTVERSION} MAINTAINER= arch_dvx@users.sourceforge.net -COMMENT= Simple IRC client written using the FOX toolkit +COMMENT= Simple IRC client LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libFOX-1.6.so:x11-toolkits/fox16 - -USE_XORG= xft -USES= gmake pkgconfig -GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -lpthread -L${LOCALBASE}/lib - -OPTIONS_DEFINE= NLS TRAY IPV6 SSL LUA ENCHANT NOTIFY DOCS -OPTIONS_DEFAULT= TRAY SSL LUA - -TRAY_DESC= Trayicon -ENCHANT_DESC= Spellchecking support -NOTIFY_DESC= Libnotify support - -PORTDOCS= README +USE_XORG= ice sm x11 xext +USES= cmake pkgconfig +INSTALLS_ICONS= yes + +OPTIONS_DEFINE= NLS LUA ENCHANT NOTIFY +OPTIONS_SINGLE= GUI +OPTIONS_SINGLE_GUI= FOX16 QT4 QT5 +OPTIONS_DEFAULT= LUA QT5 +OPTIONS_SUB= yes + +ENCHANT_DESC= Spell checking support via Enchant +ENCHANT_LIB_DEPENDS= libenchant.so:textproc/enchant +ENCHANT_CMAKE_ON= -DHAVE_ENCHANT:BOOL=ON +ENCHANT_CMAKE_OFF= -DHAVE_ENCHANT:BOOL=OFF + +FOX16_DESC= FOX 1.6 toolkit support +FOX16_LIB_DEPENDS= libFOX-1.6.so:x11-toolkits/fox16 +FOX16_USES= ssl +FOX16_CMAKE_ON= -DFOX_ENABLE_IPV6:BOOL=ON + +LUA_USES= lua +LUA_CMAKE_ON= -DWITH_LUA:BOOL=ON +LUA_CMAKE_OFF= -DWITH_LUA:BOOL=OFF + +NLS_USES= gettext +NLS_CMAKE_ON= -DWITH_NLS:BOOL=ON +NLS_CMAKE_OFF= -DWITH_NLS:BOOL=OFF + +NOTIFY_RUN_DEPENDS= notify-send:devel/libnotify + +QT4_USE= QT4=corelib,gui,network \ + QT4=moc_build,rcc_build,uic_build,qmake_build +QT4_CMAKE_ON= -DQT5:BOOL=OFF + +QT5_USE= QT5=core,gui,multimedia,network,widgets \ + QT5=buildtools_build,qmake_build +QT5_CMAKE_ON= -DQT5:BOOL=ON .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MNLS} -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB+= NLS="@comment " -.else -USES+= gettext -PLIST_SUB+= NLS="" -.endif - -.if ! ${PORT_OPTIONS:MTRAY} -CONFIGURE_ARGS+= --disable-tray -.endif - -.if ! ${PORT_OPTIONS:MIPV6} -CONFIGURE_ARGS+= --disable-ipv6 -.endif - -.if ${PORT_OPTIONS:MSSL} -USE_OPENSSL= yes +.if ${PORT_OPTIONS:MFOX16} +CMAKE_ARGS+= -DBUILD_FOX:BOOL=ON -DBUILD_QT:BOOL=OFF +PLIST_SUB+= FOX="" QT="@comment " .else -CONFIGURE_ARGS+= --disable-ssl -.endif - -.if ${PORT_OPTIONS:MLUA} -USES+= lua:51 -CONFIGURE_ENV+= LUA_CFLAGS="-I${LUA_INCDIR}" LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}" -CONFIGURE_ARGS+= --enable-lua -.else -CONFIGURE_ARGS+= --disable-lua -.endif - -.if ${PORT_OPTIONS:MENCHANT} -LIB_DEPENDS+= libenchant.so:textproc/enchant -CONFIGURE_ARGS+= --enable-enchant -.endif - -.if ${PORT_OPTIONS:MNOTIFY} -LIB_DEPENDS+= libnotify.so:devel/libnotify -CONFIGURE_ARGS+= --enable-libnotify -.endif - -post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} +CMAKE_ARGS+= -DBUILD_FOX:BOOL=OFF -DBUILD_QT:BOOL=ON +PLIST_SUB+= FOX="@comment " QT="" .endif .include <bsd.port.mk> Modified: head/irc/dxirc/distinfo ============================================================================== --- head/irc/dxirc/distinfo Wed Nov 23 19:14:19 2016 (r426960) +++ head/irc/dxirc/distinfo Wed Nov 23 19:21:19 2016 (r426961) @@ -1,2 +1,3 @@ -SHA256 (dxirc-1.10.0.tar.gz) = 92c2827cde8b08cca3b5595d05beab727afce8dc9d30fdbb71face6be567ec65 -SIZE (dxirc-1.10.0.tar.gz) = 1496185 +TIMESTAMP = 1479762158 +SHA256 (dxirc-1.30.0.tar.gz) = 8a98441f8e3ce3a77e5af8f783e439690ac08f7672616a03151b9892e9ff948d +SIZE (dxirc-1.30.0.tar.gz) = 1300576 Added: head/irc/dxirc/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/irc/dxirc/files/patch-CMakeLists.txt Wed Nov 23 19:21:19 2016 (r426961) @@ -0,0 +1,44 @@ +--- CMakeLists.txt.orig 2015-10-28 18:53:26 UTC ++++ CMakeLists.txt +@@ -5,13 +5,17 @@ set(PROJECT_VERSION "1.30.0") + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") + + find_package(PkgConfig) +-find_package(Libintl) +-find_package(Gettext) + + # Enable i10n. +-if(LIBINTL_LIB_FOUND) ++option(WITH_NLS "Enable NLS support" TRUE) ++if(WITH_NLS) ++ find_package(Libintl) ++ find_package(Gettext) ++ ++ if(LIBINTL_LIB_FOUND) + set(ENABLE_NLS TRUE) +-endif(LIBINTL_LIB_FOUND) ++ endif(LIBINTL_LIB_FOUND) ++endif(WITH_NLS) + + if(NOT WIN32) + option(HAVE_ENCHANT "Enable spellchecking" FALSE) +@@ -23,11 +27,14 @@ if(APPLE) + option(ENABLE_OSX_BUNDLE "Package dxirc as an OSX bundle (ignored on other platforms)." OFF) + endif(APPLE) + +-set(HAVE_LUA FALSE) +-find_package(Lua) +-if(LUA_FOUND) +- set(HAVE_LUA TRUE) +-endif(LUA_FOUND) ++option(WITH_LUA "Enable LUA support" FALSE) ++if(WITH_LUA) ++ set(HAVE_LUA FALSE) ++ find_package(Lua) ++ if(LUA_FOUND) ++ set(HAVE_LUA TRUE) ++ endif(LUA_FOUND) ++endif(WITH_LUA) + + if(APPLE AND ENABLE_OSX_BUNDLE) + add_definitions(-DLOCALEDIR="./locale") Added: head/irc/dxirc/files/patch-data_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/irc/dxirc/files/patch-data_CMakeLists.txt Wed Nov 23 19:21:19 2016 (r426961) @@ -0,0 +1,20 @@ +--- data/CMakeLists.txt.orig 2015-10-28 18:53:26 UTC ++++ data/CMakeLists.txt +@@ -1,9 +1,16 @@ + CMAKE_MINIMUM_REQUIRED(VERSION 2.8) + ++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) ++ install(FILES dxirc-fox.desktop DESTINATION share/applications) ++ endif(BUILD_FOX) ++ if(BUILD_QT) ++ install(FILES dxirc-qt.desktop DESTINATION share/applications) ++ endif(BUILD_QT) + endif(NOT WIN32) + install(FILES icons/dxirc.png DESTINATION share/icons/hicolor/48x48/apps) + install(DIRECTORY icons/ DESTINATION share/dxirc/icons FILES_MATCHING PATTERN "*.png" PATTERN "*.smiley" PATTERN ".svn" EXCLUDE) Added: head/irc/dxirc/files/patch-fox_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/irc/dxirc/files/patch-fox_CMakeLists.txt Wed Nov 23 19:21:19 2016 (r426961) @@ -0,0 +1,61 @@ +--- fox/CMakeLists.txt.orig 2015-11-16 14:35:35 UTC ++++ fox/CMakeLists.txt +@@ -20,8 +20,17 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_C + + if(PKG_CONFIG_FOUND) + pkg_check_modules(FOX fox) +- list(APPEND DXIRCFOX_LIBS ${FOX_LIBRARIES}) +- list(APPEND DXIRCFOX_INCLUDE_DIRS ${FOX_INCLUDE_DIRS}) ++ find_path(FOX_INCLUDE_DIR FXApp.h ++ PATHS ++ ${FOX_INCLUDE_DIRS} ++ /usr/include/fox-1.6 ++ /usr/local/include/fox-1.6) ++ find_library(FOX_LIBRARY FOX-1.6 ++ ${FOX_LIBRARY_DIRS} ++ /usr/lib ++ /usr/local/lib) ++ list(APPEND DXIRCFOX_LIBS ${FOX_LIBRARY}) ++ list(APPEND DXIRCFOX_INCLUDE_DIRS ${FOX_INCLUDE_DIR}) + endif(PKG_CONFIG_FOUND) + + if(NOT FOX_FOUND) +@@ -47,16 +56,14 @@ endif() + + set(HAVE_X11 FALSE) + if(NOT WIN32) +- if(PKG_CONFIG_FOUND) +- pkg_check_modules(X11 x11) ++ find_package(X11) + list(APPEND DXIRCFOX_LIBS ${X11_LIBRARIES}) +- list(APPEND DXIRCFOX_INCLUDE_DIRS ${X11_INCLUDE_DIRS}) ++ list(APPEND DXIRCFOX_INCLUDE_DIRS ${X11_INCLUDE_DIR}) + if(X11_FOUND) + set(HAVE_X11 TRUE) + else(X11_FOUND) + set(FOX_HAVE_TRAY FALSE) + endif(X11_FOUND) +- endif(PKG_CONFIG_FOUND) + else(NOT WIN32) + list(APPEND DXIRCFOX_LIBS "ws2_32" "winmm") + endif(NOT WIN32) +@@ -89,8 +96,17 @@ endif(HAVE_LUA) + if(HAVE_ENCHANT) + if(PKG_CONFIG_FOUND) + pkg_check_modules(ENCHANT enchant) +- list(APPEND DXIRCFOX_LIBS ${ENCHANT_LIBRARIES}) +- list(APPEND DXIRCFOX_INCLUDE_DIRS ${ENCHANT_INCLUDE_DIRS}) ++ find_path(ENCHANT_INCLUDE_DIR enchant++.h ++ PATHS ++ ${ENCHANT_INCLUDE_DIRS} ++ /usr/include/enchant ++ /usr/local/include/enchant) ++ find_library(ENCHANT_LIBRARY enchant ++ ${ENCHANT_LIBRARY_DIRS} ++ /usr/lib ++ /usr/local/lib) ++ list(APPEND DXIRCFOX_LIBS ${ENCHANT_LIBRARY}) ++ list(APPEND DXIRCFOX_INCLUDE_DIRS ${ENCHANT_INCLUDE_DIR}) + endif(PKG_CONFIG_FOUND) + if(NOT ENCHANT_FOUND) + set(ENCHANT_INCLUDE_DIR "" CACHE PATH "Path to enchant include dir") Added: head/irc/dxirc/files/patch-qt_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/irc/dxirc/files/patch-qt_CMakeLists.txt Wed Nov 23 19:21:19 2016 (r426961) @@ -0,0 +1,50 @@ +--- qt/CMakeLists.txt.orig 2015-11-16 14:35:35 UTC ++++ qt/CMakeLists.txt +@@ -13,11 +13,11 @@ project(dxirc-qt) + option(QT5 "Compile with Qt 5" TRUE) + + if(UNIX) +- if(BSD) ++ if(${CMAKE_SYSTEM_NAME} MATCHES "BSD") + set(CMAKE_THREAD_LIBS -pthread) + set(CMAKE_USE_PTHREADS ON) + set(CMAKE_EXE_LINKER_FLAGS -pthread) +- endif(BSD) ++ endif(${CMAKE_SYSTEM_NAME} MATCHES "BSD") + endif(UNIX) + + SET(DXIRCQT_LIBS "") +@@ -35,11 +35,20 @@ endif(HAVE_LUA) + + if(NOT APPLE) + if(HAVE_ENCHANT) +- if(PKG_CONFIG_FOUND) +- pkg_check_modules(ENCHANT enchant) +- list(APPEND DXIRCQT_LIBS ${ENCHANT_LIBRARIES}) +- list(APPEND DXIRCQT_INCLUDE_DIRS ${ENCHANT_INCLUDE_DIRS}) +- endif(PKG_CONFIG_FOUND) ++ if(PKG_CONFIG_FOUND) ++ pkg_check_modules(ENCHANT enchant) ++ find_path(ENCHANT_INCLUDE_DIR enchant++.h ++ PATHS ++ ${ENCHANT_INCLUDE_DIRS} ++ /usr/include ++ /usr/local/include) ++ find_library(ENCHANT_LIBRARY enchant ++ ${ENCHANT_LIBRARY_DIRS} ++ /usr/lib ++ /usr/local/lib) ++ list(APPEND DXIRCQT_LIBS ${ENCHANT_LIBRARY}) ++ list(APPEND DXIRCQT_INCLUDE_DIRS ${ENCHANT_INCLUDE_DIR}) ++ endif(PKG_CONFIG_FOUND) + if(NOT ENCHANT_FOUND) + set(ENCHANT_INCLUDE_DIR "" CACHE PATH "Path to enchant include dir") + set(ENCHANT_LIBRARY "" CACHE FILEPATH "Filepath to enchant library") +@@ -110,6 +119,7 @@ dialogs/scriptdialog.h + dialogs/dccsenddialog.h + dialogs/configdialog.h + dialogs/keydialog.h ++dialogs/listdialog.h + engine/dxsocket.h + engine/ircengine.h + engine/dccengine.h Modified: head/irc/dxirc/pkg-descr ============================================================================== --- head/irc/dxirc/pkg-descr Wed Nov 23 19:14:19 2016 (r426960) +++ head/irc/dxirc/pkg-descr Wed Nov 23 19:21:19 2016 (r426961) @@ -1,4 +1,10 @@ -dxirc is a simple IRC client for various os (Linux, *BSD, Windows), written -using the FOX toolkit. +dxirc is a simple, yet capable, cross-platform IRC client written +in C++ for the FOX toolkit and the Qt toolkit. + +Features: + - Fully customizable look independent of system-wide settings + - Automated join to specified channels on selected server + - Support for multiple simultaneously connected servers + - Well-arranged and flexible configuration dialog WWW: http://www.dxirc.org/ Modified: head/irc/dxirc/pkg-plist ============================================================================== --- head/irc/dxirc/pkg-plist Wed Nov 23 19:14:19 2016 (r426960) +++ head/irc/dxirc/pkg-plist Wed Nov 23 19:21:19 2016 (r426961) @@ -1,11 +1,15 @@ -bin/dxirc -share/applications/dxirc.desktop -share/pixmaps/dxirc.png +%%FOX%%bin/dxirc-fox +%%QT%%bin/dxirc-qt +%%FOX%%share/applications/dxirc-fox.desktop +%%QT%%share/applications/dxirc-qt.desktop %%DATADIR%%/COPYING %%DATADIR%%/icons/arrow_down.png %%DATADIR%%/icons/arrow_refresh.png %%DATADIR%%/icons/arrow_up.png %%DATADIR%%/icons/big_dxirc.png +%%DATADIR%%/icons/black_dxirc.png +%%DATADIR%%/icons/bnewfile.png +%%DATADIR%%/icons/bnewm.png %%DATADIR%%/icons/cancel.png %%DATADIR%%/icons/channel.png %%DATADIR%%/icons/chnewm.png @@ -15,31 +19,6 @@ share/pixmaps/dxirc.png %%DATADIR%%/icons/cross.png %%DATADIR%%/icons/dcc.png %%DATADIR%%/icons/dccnewm.png -%%DATADIR%%/icons/disconnect.png -%%DATADIR%%/icons/door_out.png -%%DATADIR%%/icons/file.png -%%DATADIR%%/icons/find.png -%%DATADIR%%/icons/folder.png -%%DATADIR%%/icons/folder_go.png -%%DATADIR%%/icons/help.png -%%DATADIR%%/icons/keyboard.png -%%DATADIR%%/icons/logs.png -%%DATADIR%%/icons/newfile.png -%%DATADIR%%/icons/newm.png -%%DATADIR%%/icons/page.png -%%DATADIR%%/icons/play.png -%%DATADIR%%/icons/script.png -%%DATADIR%%/icons/select_all.png -%%DATADIR%%/icons/server.png -%%DATADIR%%/icons/small_dxirc.png -%%DATADIR%%/icons/tick.png -%%DATADIR%%/icons/unewm.png -%%DATADIR%%/icons/user.png -%%DATADIR%%/icons/world.png -%%DATADIR%%/icons/wrench.png -%%DATADIR%%/sounds/connected.wav -%%DATADIR%%/sounds/disconnected.wav -%%DATADIR%%/sounds/message.wav %%DATADIR%%/icons/default/irc_admin.png %%DATADIR%%/icons/default/irc_away.png %%DATADIR%%/icons/default/irc_halfop.png @@ -47,6 +26,11 @@ share/pixmaps/dxirc.png %%DATADIR%%/icons/default/irc_op.png %%DATADIR%%/icons/default/irc_owner.png %%DATADIR%%/icons/default/irc_voice.png +%%DATADIR%%/icons/disconnect.png +%%DATADIR%%/icons/door_out.png +%%DATADIR%%/icons/dxirc.png +%%DATADIR%%/icons/file.png +%%DATADIR%%/icons/find.png %%DATADIR%%/icons/flags/ar.png %%DATADIR%%/icons/flags/as.png %%DATADIR%%/icons/flags/at.png @@ -280,11 +264,36 @@ share/pixmaps/dxirc.png %%DATADIR%%/icons/flags/za.png %%DATADIR%%/icons/flags/zm.png %%DATADIR%%/icons/flags/zw.png +%%DATADIR%%/icons/folder.png +%%DATADIR%%/icons/folder_go.png +%%DATADIR%%/icons/ft.png +%%DATADIR%%/icons/groupclose.png +%%DATADIR%%/icons/groupopen.png +%%DATADIR%%/icons/help.png +%%DATADIR%%/icons/keyboard.png +%%DATADIR%%/icons/logs.png +%%DATADIR%%/icons/newfile.png +%%DATADIR%%/icons/newm.png +%%DATADIR%%/icons/page.png +%%DATADIR%%/icons/play.png +%%DATADIR%%/icons/script.png +%%DATADIR%%/icons/select_all.png +%%DATADIR%%/icons/server.png +%%DATADIR%%/icons/small_dxirc.png %%DATADIR%%/icons/smileys/biggrin.png %%DATADIR%%/icons/smileys/cry.png %%DATADIR%%/icons/smileys/dxirc.smiley %%DATADIR%%/icons/smileys/smile.png %%DATADIR%%/icons/smileys/tongue.png %%DATADIR%%/icons/smileys/unhappy.png +%%DATADIR%%/icons/tick.png +%%DATADIR%%/icons/unewm.png +%%DATADIR%%/icons/user.png +%%DATADIR%%/icons/world.png +%%DATADIR%%/icons/wrench.png +%%DATADIR%%/sounds/connected.wav +%%DATADIR%%/sounds/disconnected.wav +%%DATADIR%%/sounds/message.wav +share/icons/hicolor/48x48/apps/dxirc.png %%NLS%%share/locale/cs/LC_MESSAGES/dxirc.mo %%NLS%%share/locale/sk/LC_MESSAGES/dxirc.mo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611231921.uANJLKwk002812>