From owner-freebsd-ports-bugs@FreeBSD.ORG Sat May 14 13:30:03 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6435816A4CE for ; Sat, 14 May 2005 13:30:03 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 373D443D2F for ; Sat, 14 May 2005 13:30:03 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j4EDU2Kr023588 for ; Sat, 14 May 2005 13:30:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j4EDU2nx023587; Sat, 14 May 2005 13:30:02 GMT (envelope-from gnats) Resent-Date: Sat, 14 May 2005 13:30:02 GMT Resent-Message-Id: <200505141330.j4EDU2nx023587@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Vsevolod Stakhov Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4318416A4CE for ; Sat, 14 May 2005 13:20:05 +0000 (GMT) Received: from mail.icn.bmstu.ru (h133.net37.bmstu.ru [195.19.37.133]) by mx1.FreeBSD.org (Postfix) with ESMTP id 16EAB43D45 for ; Sat, 14 May 2005 13:20:04 +0000 (GMT) (envelope-from vsevolod@highsecure.ru) Received: by mail.icn.bmstu.ru (Postfix, from userid 8) id 9F3D69377C; Fri, 20 May 2005 05:21:55 +0400 (MSD) Received: from cebka.icn.bmstu.ru (cebka.icn.bmstu.ru [192.168.5.31]) by mail.icn.bmstu.ru (Postfix) with ESMTP id 2ABD393330 for ; Fri, 20 May 2005 05:21:55 +0400 (MSD) Received: (from cebka@localhost) by cebka.icn.bmstu.ru (8.13.1/8.12.10/Submit) id j4EDKMce012088; Sat, 14 May 2005 17:20:22 +0400 (MSD) (envelope-from cebka) Message-Id: <200505141320.j4EDKMce012088@cebka.icn.bmstu.ru> Date: Sat, 14 May 2005 17:20:22 +0400 (MSD) From: Vsevolod Stakhov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/81016: Add support of kde to net/psi X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Vsevolod Stakhov List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 May 2005 13:30:03 -0000 >Number: 81016 >Category: ports >Synopsis: Add support of kde to net/psi >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat May 14 13:30:02 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Vsevolod Stakhov >Release: FreeBSD 5.3-RELEASE i386 >Organization: >Environment: System: FreeBSD nemezida.highsecure.ru 5.3-RELEASE FreeBSD 5.3-RELEASE #0: Fri Dec 3 03:56:35 MSK 2004 root@nemezida.highsecure.ru:/usr/obj/usr/src/sys/NK i386 >Description: Add support of kde tray icon to net/psi. Thanks to Andrei Zverev for testing. >How-To-Repeat: >Fix: diff -ruNP psi.orig/Makefile psi/Makefile --- psi.orig/Makefile Sat May 14 17:13:16 2005 +++ psi/Makefile Sat May 14 17:14:12 2005 @@ -7,7 +7,7 @@ PORTNAME= psi PORTVERSION= 0.9.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -26,12 +26,31 @@ CONFIGURE_ENV= QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ \ PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ - PTHREAD_LDFLAGS=${PTHREAD_LIBS} -CONFIGURE_ARGS= --prefix=${PREFIX} --qtdir=${X11BASE} --disable-kde \ + PTHREAD_LDFLAGS=${PTHREAD_LIBS} \ + KDEDIR=${X11BASE} +CONFIGURE_ARGS= --prefix=${PREFIX} --qtdir=${X11BASE} \ --with-qca-inc=${X11BASE}/include/plugins/qca \ --with-qca-lib=${X11BASE}/lib MAKE_ARGS+= QTDIR=${X11BASE} \ QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ + +.ifdef(WITH_KDE) +LIB_DEPENDS+= kdecore:${PORTSDIR}/x11/kdelibs3 +_NO_KDE_CONFTARGET_HACK= yes +PLIST_SUB+= KDE="" +.else +CONFIGURE_ARGS+= --disable-kde +PLIST_SUB+= KDE="@comment " +.endif + +pre-everything:: + @${ECHO} "=============================================================" + @${ECHO} + @${ECHO} "You can build ${PKGNAME} with the following options:" + @${ECHO} + @${ECHO} "WITH_KDE enable kde tray support" + @${ECHO} + @${ECHO} "=============================================================" post-install: ${STRIP_CMD} ${PREFIX}/bin/psi diff -ruNP psi.orig/pkg-plist psi/pkg-plist --- psi.orig/pkg-plist Fri May 13 18:42:08 2005 +++ psi/pkg-plist Sat May 14 17:12:59 2005 @@ -220,6 +220,21 @@ %%DATADIR%%/sound/offline.wav %%DATADIR%%/sound/online.wav %%DATADIR%%/sound/send.wav +%%KDE%%@cwd %%LOCALBASE%% +%%KDE%%share/applnk/Internet/psi.desktop +%%KDE%%share/icons/hicolor/16x16/apps/psi.png +%%KDE%%share/icons/hicolor/32x32/apps/psi.png +%%KDE%%share/icons/hicolor/48x48/apps/psi.png +%%KDE%%@unexec rmdir %D/share/applnk/Internet 2>/dev/null || true +%%KDE%%@unexec rmdir %D/share/applnk 2>/dev/null || true +%%KDE%%@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true +%%KDE%%@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true +%%KDE%%@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true +%%KDE%%@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true +%%KDE%%@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true +%%KDE%%@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true +%%KDE%%@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true +%%KDE%%@unexec rmdir %D/share/icons 2>/dev/null || true @dirrm %%DATADIR%%/sound @dirrm %%DATADIR%%/iconsets/system/default/clients @dirrm %%DATADIR%%/iconsets/system/default >Release-Note: >Audit-Trail: >Unformatted: