pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Remove psi, a newer version was committed to pkgsrc.
Module Name: pkgsrc-wip
Committed By: nia <nia%NetBSD.org@localhost>
Pushed By: nee
Date: Thu Feb 21 09:39:47 2019 +0000
Changeset: 4f79ad3ec6fb56ed6bc3331d56adc89b5fc61022
Modified Files:
Makefile
Removed Files:
psi/DESCR
psi/Makefile
psi/PLIST
psi/TODO
psi/distinfo
psi/options.mk
psi/patches/patch-ad
psi/patches/patch-cmake_modules_FindEnchant.cmake
psi/patches/patch-iris_src_jdns_src_jdns_jdns__sys.c
Log Message:
Remove psi, a newer version was committed to pkgsrc.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4f79ad3ec6fb56ed6bc3331d56adc89b5fc61022
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 1 -
psi/DESCR | 24 ---
psi/Makefile | 74 --------
psi/PLIST | 192 ---------------------
psi/TODO | 4 -
psi/distinfo | 9 -
psi/options.mk | 44 -----
psi/patches/patch-ad | 21 ---
psi/patches/patch-cmake_modules_FindEnchant.cmake | 15 --
.../patch-iris_src_jdns_src_jdns_jdns__sys.c | 13 --
10 files changed, 397 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index bbbde9ec11..e4e253f231 100644
--- a/Makefile
+++ b/Makefile
@@ -2968,7 +2968,6 @@ SUBDIR+= prozilla
SUBDIR+= prpltwtr
SUBDIR+= prtunnel
SUBDIR+= psh
-SUBDIR+= psi
SUBDIR+= psybnc
SUBDIR+= pt-ttf
SUBDIR+= ptlib
diff --git a/psi/DESCR b/psi/DESCR
deleted file mode 100644
index 9241715720..0000000000
--- a/psi/DESCR
+++ /dev/null
@@ -1,24 +0,0 @@
-XMPP is an open, XML based, distributed, Instant Messaging system
-that seeks to be the standard IM network.
-
-Psi is a client for the Jabber system. Written in C++ and based on
-the Qt library, there are versions available for NetBSD, Linux (and
-other flavors of Unix/X11), Microsoft Windows, and Apple MacOS X.
-Psi is released under the GNU General Public License.
-
-Features:
-* Message (ICQ-style) and Chat (AIM-style) modes
-* Drag and drop to send to multiple contacts
-* Full Unicode support
-* Secure connections
-* Saving contact list locally, and server sync on login
-* Icon Themes
-* Agent registration and searching
-* Retrieving and updating User Info
-* Sound support for incoming events
-* Auto-away after a configurable amount of time
-* Tray/dock icon for KDE/GNOME environments
-* Language plugins
-* OpenPGP integration (via GnuPG via security/qca2-gnupg)
-* Groupchat invites / private-messaging
-* File transfer
diff --git a/psi/Makefile b/psi/Makefile
deleted file mode 100644
index a4e8178e2a..0000000000
--- a/psi/Makefile
+++ /dev/null
@@ -1,74 +0,0 @@
-# $NetBSD: Makefile,v 1.86 2018/07/18 00:06:11 joerg Exp $
-
-DISTNAME= psi-1.3
-CATEGORIES= chat
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=psi/}
-EXTRACT_SUFX= .tar.xz
-
-MAINTAINER= schnoebe%NetBSD.org@localhost
-HOMEPAGE= http://psi-im.org/
-COMMENT= Psi XMPP/Jabber Client
-LICENSE= gnu-gpl-v2
-
-#DEPENDS+= qca2-ossl>=2.0.0beta3:../../security/qca2-ossl
-
-DIST_SUBDIR= ${DISTNAME}
-DISTFILES= ${DEFAULT_DISTFILES}
-
-USE_CMAKE= yes
-USE_TOOLS+= unzip pkg-config
-USE_LANGUAGES= c c++11
-
-CONFIG_SHELL= ${SH}
-
-#
-# a group of scripts that aren't to be installed, and aren't used
-# by the pkgsrc system. But they all have the non-standard
-# "==" in them. (silly linux developers thinking [ bash = sh ].
-#
-CHECK_PORTABILITY_SKIP= admin/build/devconfig.sh \
- admin/build/build_package.sh \
- admin/build/prep_dist.sh
-
-
-INSTALLATION_DIRS= bin share/psi share/doc/psi
-INSTALL_DIRS= src
-INSTALL_TARGET= install_target install_sharedfiles
-INSTALL_MAKE_FLAGS= INSTALL_ROOT=${DESTDIR}
-
-.include "options.mk"
-
-#
-# LANG_FILES are the translations we're going to install
-#
-# LANG_FILES= psi_be.qm psi_cs.qm psi_de.qm psi_eo.qm psi_es.qm \
-# psi_es_ES.qm psi_fr.qm psi_it.qm psi_ja.qm psi_mk.qm \
-# psi_pl.qm psi_pt_BR.qm psi_ru.qm psi_sl.qm psi_sv.qm \
-# psi_uk.qm psi_ur_PK.qm psi_vi.qm psi_zh_CN.qm psi_zh_TW.qm
-
-.for f in ${LANG_FILES}
-DISTFILES+= ${f}
-SITES.${f}= http://psi-im.org/download/lang/
-.endfor
-
-post-install:
- # remove some files that shouldn't be there,
- # install some files where they should be installed
- ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/psi
- ${RM} ${DESTDIR}${PREFIX}/share/psi/README
- ${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/share/doc/psi
- ${RM} ${DESTDIR}${PREFIX}/share/psi/COPYING
- # install the translations
-.for f in ${LANG_FILES}
- ${INSTALL_DATA} ${WRKDIR}/${f} ${DESTDIR}${PREFIX}/share/psi
-.endfor
-
-.include "../../devel/libidn/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../security/qca2-qt5/buildlink3.mk"
-.include "../../x11/qt5-qtbase/buildlink3.mk"
-.include "../../x11/qt5-qtmultimedia/buildlink3.mk"
-.include "../../x11/qt5-qtsvg/buildlink3.mk"
-.include "../../x11/qt5-qtwebkit/buildlink3.mk"
-.include "../../x11/qt5-qtx11extras/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/psi/PLIST b/psi/PLIST
deleted file mode 100644
index cd05c87faf..0000000000
--- a/psi/PLIST
+++ /dev/null
@@ -1,192 +0,0 @@
-@comment $NetBSD: PLIST,v 1.15 2012/12/07 23:52:09 schnoebe Exp $
-bin/psi
-share/doc/psi/COPYING
-share/doc/psi/README
-share/psi/certs/README
-share/psi/certs/startcom_ca.crt
-share/psi/certs/startcom_ca_new.crt
-share/psi/iconsets/emoticons/default/angry.png
-share/psi/iconsets/emoticons/default/bat.png
-share/psi/iconsets/emoticons/default/beer.png
-share/psi/iconsets/emoticons/default/biggrin.png
-share/psi/iconsets/emoticons/default/blush.png
-share/psi/iconsets/emoticons/default/boy.png
-share/psi/iconsets/emoticons/default/brflower.png
-share/psi/iconsets/emoticons/default/brheart.png
-share/psi/iconsets/emoticons/default/coffee.png
-share/psi/iconsets/emoticons/default/coolglasses.png
-share/psi/iconsets/emoticons/default/cry.png
-share/psi/iconsets/emoticons/default/cuffs.png
-share/psi/iconsets/emoticons/default/devil.png
-share/psi/iconsets/emoticons/default/drink.png
-share/psi/iconsets/emoticons/default/flower.png
-share/psi/iconsets/emoticons/default/frowning.png
-share/psi/iconsets/emoticons/default/girl.png
-share/psi/iconsets/emoticons/default/heart.png
-share/psi/iconsets/emoticons/default/hugleft.png
-share/psi/iconsets/emoticons/default/hugright.png
-share/psi/iconsets/emoticons/default/icondef.xml
-share/psi/iconsets/emoticons/default/kiss.png
-share/psi/iconsets/emoticons/default/lamp.png
-share/psi/iconsets/emoticons/default/mail.png
-share/psi/iconsets/emoticons/default/music.png
-share/psi/iconsets/emoticons/default/no.png
-share/psi/iconsets/emoticons/default/oh.png
-share/psi/iconsets/emoticons/default/phone.png
-share/psi/iconsets/emoticons/default/photo.png
-share/psi/iconsets/emoticons/default/pussy.png
-share/psi/iconsets/emoticons/default/rainbow.png
-share/psi/iconsets/emoticons/default/smile.png
-share/psi/iconsets/emoticons/default/star.png
-share/psi/iconsets/emoticons/default/stare.png
-share/psi/iconsets/emoticons/default/tongue.png
-share/psi/iconsets/emoticons/default/unhappy.png
-share/psi/iconsets/emoticons/default/wink.png
-share/psi/iconsets/emoticons/default/yes.png
-share/psi/iconsets/roster/README
-share/psi/iconsets/roster/crystal-aim.jisp
-share/psi/iconsets/roster/crystal-gadu.jisp
-share/psi/iconsets/roster/crystal-icq.jisp
-share/psi/iconsets/roster/crystal-msn.jisp
-share/psi/iconsets/roster/crystal-roster.jisp
-share/psi/iconsets/roster/crystal-service.jisp
-share/psi/iconsets/roster/crystal-sms.jisp
-share/psi/iconsets/roster/crystal-yahoo.jisp
-share/psi/iconsets/roster/default/ask.png
-share/psi/iconsets/roster/default/away.png
-share/psi/iconsets/roster/default/call.png
-share/psi/iconsets/roster/default/chat.fading.png
-share/psi/iconsets/roster/default/chatty.png
-share/psi/iconsets/roster/default/dnd.png
-share/psi/iconsets/roster/default/file.fading.png
-share/psi/iconsets/roster/default/groupclose.png
-share/psi/iconsets/roster/default/groupopen.png
-share/psi/iconsets/roster/default/headline.png
-share/psi/iconsets/roster/default/icondef.xml
-share/psi/iconsets/roster/default/invisible.png
-share/psi/iconsets/roster/default/message.fading.png
-share/psi/iconsets/roster/default/noauth.png
-share/psi/iconsets/roster/default/offline.png
-share/psi/iconsets/roster/default/online.dimming.png
-share/psi/iconsets/roster/default/online.png
-share/psi/iconsets/roster/default/perr.png
-share/psi/iconsets/roster/default/system.png
-share/psi/iconsets/roster/default/xa.png
-share/psi/iconsets/roster/stellar-1.jisp
-share/psi/iconsets/system/README
-share/psi/iconsets/system/default/account.png
-share/psi/iconsets/system/default/add.png
-share/psi/iconsets/system/default/advanced.png
-share/psi/iconsets/system/default/appearance.png
-share/psi/iconsets/system/default/arrow_down.png
-share/psi/iconsets/system/default/arrow_left.png
-share/psi/iconsets/system/default/arrow_right.png
-share/psi/iconsets/system/default/arrow_up.png
-share/psi/iconsets/system/default/browse.png
-share/psi/iconsets/system/default/cancel.png
-share/psi/iconsets/system/default/changeacc.png
-share/psi/iconsets/system/default/chatclear.png
-share/psi/iconsets/system/default/close.png
-share/psi/iconsets/system/default/closetab.png
-share/psi/iconsets/system/default/command.png
-share/psi/iconsets/system/default/configure-room.png
-share/psi/iconsets/system/default/configure_toolbars.png
-share/psi/iconsets/system/default/disco.png
-share/psi/iconsets/system/default/download.png
-share/psi/iconsets/system/default/events.png
-share/psi/iconsets/system/default/eye_blue.png
-share/psi/iconsets/system/default/filemanager.png
-share/psi/iconsets/system/default/groupchat.png
-share/psi/iconsets/system/default/gstreamer-logo-50.png
-share/psi/iconsets/system/default/help.png
-share/psi/iconsets/system/default/history.png
-share/psi/iconsets/system/default/icondef.xml
-share/psi/iconsets/system/default/info.png
-share/psi/iconsets/system/default/jabber.png
-share/psi/iconsets/system/default/key.png
-share/psi/iconsets/system/default/key_bad.png
-share/psi/iconsets/system/default/key_unknown.png
-share/psi/iconsets/system/default/logo_128.png
-share/psi/iconsets/system/default/logo_16.png
-share/psi/iconsets/system/default/logo_32.png
-share/psi/iconsets/system/default/logo_48.png
-share/psi/iconsets/system/default/logo_64.png
-share/psi/iconsets/system/default/ok.png
-share/psi/iconsets/system/default/options.png
-share/psi/iconsets/system/default/pgp.png
-share/psi/iconsets/system/default/play.png
-share/psi/iconsets/system/default/play_sounds.png
-share/psi/iconsets/system/default/psilogo.png
-share/psi/iconsets/system/default/psimain.png
-share/psi/iconsets/system/default/publish_tune.png
-share/psi/iconsets/system/default/quit.png
-share/psi/iconsets/system/default/register.png
-share/psi/iconsets/system/default/reload.png
-share/psi/iconsets/system/default/remove.png
-share/psi/iconsets/system/default/search.png
-share/psi/iconsets/system/default/self.png
-share/psi/iconsets/system/default/send.png
-share/psi/iconsets/system/default/shortcuts.png
-share/psi/iconsets/system/default/show_away.png
-share/psi/iconsets/system/default/show_hidden.png
-share/psi/iconsets/system/default/show_offline.png
-share/psi/iconsets/system/default/smile.png
-share/psi/iconsets/system/default/ssl_no.png
-share/psi/iconsets/system/default/ssl_yes.png
-share/psi/iconsets/system/default/start-chat.png
-share/psi/iconsets/system/default/status.png
-share/psi/iconsets/system/default/stop.png
-share/psi/iconsets/system/default/time.png
-share/psi/iconsets/system/default/tip.png
-share/psi/iconsets/system/default/upload.png
-share/psi/iconsets/system/default/url.png
-share/psi/iconsets/system/default/vcard.png
-share/psi/iconsets/system/default/whiteboarding/add_image.png
-share/psi/iconsets/system/default/whiteboarding/add_text.png
-share/psi/iconsets/system/default/whiteboarding/bring_forwards.png
-share/psi/iconsets/system/default/whiteboarding/bring_to_front.png
-share/psi/iconsets/system/default/whiteboarding/draw_circles.png
-share/psi/iconsets/system/default/whiteboarding/draw_ellipses.png
-share/psi/iconsets/system/default/whiteboarding/draw_lines.png
-share/psi/iconsets/system/default/whiteboarding/draw_paths.png
-share/psi/iconsets/system/default/whiteboarding/draw_rectangles.png
-share/psi/iconsets/system/default/whiteboarding/erase.png
-share/psi/iconsets/system/default/whiteboarding/group.png
-share/psi/iconsets/system/default/whiteboarding/rotate.png
-share/psi/iconsets/system/default/whiteboarding/save.png
-share/psi/iconsets/system/default/whiteboarding/scale.png
-share/psi/iconsets/system/default/whiteboarding/scroll.png
-share/psi/iconsets/system/default/whiteboarding/select.png
-share/psi/iconsets/system/default/whiteboarding/send_backwards.png
-share/psi/iconsets/system/default/whiteboarding/send_to_back.png
-share/psi/iconsets/system/default/whiteboarding/translate.png
-share/psi/iconsets/system/default/whiteboarding/ungroup.png
-share/psi/iconsets/system/default/whiteboarding/whiteboard.png
-share/psi/iconsets/system/default/xml.png
-${PLIST.be}share/psi/psi_be.qm
-${PLIST.cs}share/psi/psi_cs.qm
-${PLIST.de}share/psi/psi_de.qm
-${PLIST.eo}share/psi/psi_eo.qm
-${PLIST.es}share/psi/psi_es.qm
-${PLIST.es-es}share/psi/psi_es_ES.qm
-${PLIST.fr}share/psi/psi_fr.qm
-${PLIST.it}share/psi/psi_it.qm
-${PLIST.ja}share/psi/psi_ja.qm
-${PLIST.mk}share/psi/psi_mk.qm
-${PLIST.pl}share/psi/psi_pl.qm
-${PLIST.pt-br}share/psi/psi_pt_BR.qm
-${PLIST.ru}share/psi/psi_ru.qm
-${PLIST.sl}share/psi/psi_sl.qm
-${PLIST.sv}share/psi/psi_sv.qm
-${PLIST.uk}share/psi/psi_uk.qm
-${PLIST.ur-pk}share/psi/psi_ur_PK.qm
-${PLIST.vi}share/psi/psi_vi.qm
-${PLIST.zh-cn}share/psi/psi_zh_CN.qm
-${PLIST.zh-tw}share/psi/psi_zh_TW.qm
-share/psi/sound/chat1.wav
-share/psi/sound/chat2.wav
-share/psi/sound/ft_complete.wav
-share/psi/sound/ft_incoming.wav
-share/psi/sound/offline.wav
-share/psi/sound/online.wav
-share/psi/sound/send.wav
diff --git a/psi/TODO b/psi/TODO
deleted file mode 100644
index 5cf3f237a4..0000000000
--- a/psi/TODO
+++ /dev/null
@@ -1,4 +0,0 @@
-- make enchant and hunspell options work
-- get it to finish building
-- see if we can get away without the extra installation targets
-- re-gen PLIST
diff --git a/psi/distinfo b/psi/distinfo
deleted file mode 100644
index 9843fd29e8..0000000000
--- a/psi/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.27 2015/11/03 01:20:23 agc Exp $
-
-SHA1 (psi-1.3/psi-1.3.tar.xz) = c8ff6be45b0bd478359bd3ac8d83ae4536677ed9
-RMD160 (psi-1.3/psi-1.3.tar.xz) = 699e9c0442efccbd54296978c1e6fc6ed641f40b
-SHA512 (psi-1.3/psi-1.3.tar.xz) = b1b0f8d0c8326d486cb908d7b7de8f48579a2775f4cad0721ebeb646abd35e890712df176dd8676bf6c6089db88e73cf1b0423bd7a0ea0054661bdcea89349fe
-Size (psi-1.3/psi-1.3.tar.xz) = 2143076 bytes
-SHA1 (patch-ad) = 3ee21a1cb17637ed650b6b58e5575c8fa246a4f0
-SHA1 (patch-cmake_modules_FindEnchant.cmake) = 9a6f3746139ab3d6a9269ca86dbeefed966836d8
-SHA1 (patch-iris_src_jdns_src_jdns_jdns__sys.c) = bbbeceda6d4ec9005058da46185af471ca02f86d
diff --git a/psi/options.mk b/psi/options.mk
deleted file mode 100644
index 47dd26efba..0000000000
--- a/psi/options.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2012/12/07 23:52:09 schnoebe Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.psi
-PKG_SUPPORTED_OPTIONS+= hunspell enchant
-PKG_SUGGESTED_OPTIONS+= enchant
-
-# from an idea stolen from ../../misc/openoffice3.
-PSI_SUPPORTED_LANGUAGES=be cs de eo es es-es fr it ja mk pl pt-br ru \
- sl sv uk ur-pk vi zh-cn zh-tw
-
-.for l in ${PSI_SUPPORTED_LANGUAGES}
-PKG_SUPPORTED_OPTIONS+= lang-${l}
-PLIST_VARS+=${l}
-.endfor
-
-.include "../../mk/bsd.options.mk"
-
-# handle the languages first
-# bit of special logic, as the dialects of languages are handled
-# as lang_DIALECT (aka, lower underscore UPPER) in the PSI translations
-.for lang in ${PKG_OPTIONS:Mlang-*:S/lang-//g}
-PLIST.${lang} = yes
-. if ${lang:M??-??}
- LANG_FILES+= psi_${lang:C/-.*//g}_${lang:C/.*-//g:tu}.qm
-. else
- LANG_FILES+= psi_${lang}.qm
-. endif
-.endfor
-
-# enable hunspell
-.if !empty(PKG_OPTIONS:Mhunspell)
-CMAKE_ARGS+= -DUSE_HUNSPELL:BOOL=TRUE
-.include "../../textproc/hunspell/buildlink3.mk"
-.else
-CMAKE_ARGS+= -DUSE_HUNSPELL:BOOL=FALSE
-.endif
-
-# enable enchant
-.if !empty(PKG_OPTIONS:Menchant)
-CMAKE_ARGS+= -DUSE_ENCHANT:BOOL=TRUE
-.include "../../textproc/enchant2/buildlink3.mk"
-.else
-CMAKE_ARGS+= -DUSE_ENCHANT:BOOL=FALSE
-.endif
diff --git a/psi/patches/patch-ad b/psi/patches/patch-ad
deleted file mode 100644
index c2a4575585..0000000000
--- a/psi/patches/patch-ad
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2011/01/02 23:53:13 schnoebe Exp $
-
-Some old versions of zlib defined OF; not needed, but provide compat for it.
-
---- src/libpsi/tools/zip/minizip/unzip.h.orig 2007-10-14 09:00:55.000000000 -0500
-+++ src/libpsi/tools/zip/minizip/unzip.h
-@@ -49,6 +49,14 @@ extern "C" {
- #include "zlib.h"
- #endif
-
-+#ifndef OF
-+# ifdef STDC
-+# define OF(x) x
-+# else
-+# define OF(x)
-+# endif
-+#endif
-+
- #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
- /* like the STRICT of WIN32, we define a pointer that cannot be converted
- from (void*) without cast */
diff --git a/psi/patches/patch-cmake_modules_FindEnchant.cmake b/psi/patches/patch-cmake_modules_FindEnchant.cmake
deleted file mode 100644
index 6462892de7..0000000000
--- a/psi/patches/patch-cmake_modules_FindEnchant.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Prefer enchant-2.
-
---- cmake/modules/FindEnchant.cmake.orig 2017-09-24 06:42:59.000000000 +0000
-+++ cmake/modules/FindEnchant.cmake
-@@ -32,7 +32,7 @@ endif ()
-
- if ( UNIX AND NOT( APPLE OR CYGWIN ) )
- find_package( PkgConfig QUIET )
-- pkg_check_modules( PC_Enchant QUIET enchant )
-+ pkg_check_modules( PC_Enchant QUIET enchant-2 )
- set ( Enchant_DEFINITIONS
- ${PC_Enchant_CFLAGS}
- ${PC_Enchant_CFLAGS_OTHER}
diff --git a/psi/patches/patch-iris_src_jdns_src_jdns_jdns__sys.c b/psi/patches/patch-iris_src_jdns_src_jdns_jdns__sys.c
deleted file mode 100644
index ae2dc31522..0000000000
--- a/psi/patches/patch-iris_src_jdns_src_jdns_jdns__sys.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- iris/src/jdns/src/jdns/jdns_sys.c.orig 2018-11-18 10:47:00.011865328 +0000
-+++ iris/src/jdns/src/jdns/jdns_sys.c
-@@ -700,7 +700,7 @@ static jdns_dnsparams_t *dnsparams_get_u
- return params;
- }
-
--#if defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 3)))
-+#if defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 3))) || defined(JDNS_OS_NETBSD)
- # define JDNS_MODERN_RES_API
- #endif
-
Home |
Main Index |
Thread Index |
Old Index