From owner-freebsd-ports-bugs@FreeBSD.ORG Tue May 1 09:40:12 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A3372106566B for ; Tue, 1 May 2012 09:40:12 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 738498FC12 for ; Tue, 1 May 2012 09:40:12 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q419eC1G051471 for ; Tue, 1 May 2012 09:40:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q419eCdM051470; Tue, 1 May 2012 09:40:12 GMT (envelope-from gnats) Resent-Date: Tue, 1 May 2012 09:40:12 GMT Resent-Message-Id: <201205010940.q419eCdM051470@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, Po-Chien Lin Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8E16E106564A for ; Tue, 1 May 2012 09:37:01 +0000 (UTC) (envelope-from linpc@csvmnet67.cs.nctu.edu.tw) Received: from csvmnet67.cs.nctu.edu.tw (csvmnet67.cs.nctu.edu.tw [140.113.23.197]) by mx1.freebsd.org (Postfix) with ESMTP id 1E95D8FC08 for ; Tue, 1 May 2012 09:37:00 +0000 (UTC) Received: from csvmnet67.cs.nctu.edu.tw (localhost [127.0.0.1]) by csvmnet67.cs.nctu.edu.tw (8.14.5/8.14.5) with ESMTP id q419b0Qr094589 for ; Tue, 1 May 2012 17:37:00 +0800 (CST) (envelope-from linpc@csvmnet67.cs.nctu.edu.tw) Received: (from linpc@localhost) by csvmnet67.cs.nctu.edu.tw (8.14.5/8.14.5/Submit) id q419b05b094588; Tue, 1 May 2012 17:37:00 +0800 (CST) (envelope-from linpc) Message-Id: <201205010937.q419b05b094588@csvmnet67.cs.nctu.edu.tw> Date: Tue, 1 May 2012 17:37:00 +0800 (CST) From: Po-Chien Lin To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/167475: [PATCH] chinese/pcmanx: update to 1.1, take maintainership X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 May 2012 09:40:12 -0000 >Number: 167475 >Category: ports >Synopsis: [PATCH] chinese/pcmanx: update to 1.1, take maintainership >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue May 01 09:40:12 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Po-Chien Lin >Release: FreeBSD 9.0-RELEASE amd64 >Organization: >Environment: System: FreeBSD csvmnet67.cs.nctu.edu.tw 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan 3 07:46:30 UTC >Description: - Update to 1.1 - Passed test on FreeBSD 9.0-RELEASE {i386,amd64} machine. - Take maintainership Added file(s): - files/patch-src-core-proxy.c - files/patch-src-mainframe.cpp - files/patch-src-pcmanx_gtk2.cpp Removed file(s): - files/patch-src-core-pcmanx_utils.h Generated with FreeBSD Port Tools 0.99_6 (mode: update, diff: suffix) >How-To-Repeat: >Fix: --- pcmanx-1.1.patch begins here --- diff -ruN --exclude=CVS ../pcmanx.orig/Makefile ./Makefile --- ../pcmanx.orig/Makefile 2012-05-01 15:15:56.000000000 +0800 +++ ./Makefile 2012-05-01 17:30:01.000000000 +0800 @@ -1,34 +1,42 @@ -# New ports collection makefile for: pcmanx -# Date created: 2005/07/16 -# Whom: chinsan +# New ports collection makefile for: pcmanx +# Date created: 2005-07-16 +# Whom: chinsan # # $FreeBSD: ports/chinese/pcmanx/Makefile,v 1.37 2011/09/23 22:21:24 amdmi3 Exp $ # PORTNAME= pcmanx -PORTVERSION= 0.3.9 +PORTVERSION= 1.1 CATEGORIES= chinese net gnome -MASTER_SITES= http://pcmanx-gtk2.googlecode.com/svn/website/release/ +MASTER_SITES= http://pcmanx-gtk2.googlecode.com/files/ DISTNAME= ${PORTNAME}-gtk2-${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= linpc@cs.nctu.edu.tw COMMENT= BBS client using GTK+ 2.x -USE_BZIP2= yes +LICENSE= GPLv2 + +USE_XZ= yes USE_GNOME= gtk20 intlhack USE_GMAKE= yes USE_ICONV= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -OPTIONS= WGET "enable wget support for download articles" on +OPTIONS= NLS "Use Native Language Support" on \ + DEBUG "Build with debugging support" off \ + DOCKLET "Docklet / system tray support" on \ + NOTIFIER "Popup notifier support" on \ + LIBNOTIFY "Popup notifier support by libnotify" off \ + NANCY "Nancy bot support" on \ + MOUSE "Mouse click and wheel support" on \ + EXTERNAL "Eexternal SSH/Telnet support" on \ + IPLOOKUP "IP location lookup support" off \ + PROXY "Proxy support" off -.include +MAN1= pcmanx.1 -.if !defined(WITHOUT_WGET) -RUN_DEPENDS+= ${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget -CONFIGURE_ARGS+=--enable-wget -.endif +.include .if !defined(WITHOUT_NLS) USE_GETTEXT= yes @@ -40,14 +48,40 @@ PLIST_SUB+= NLS="@comment " .endif -post-extract: - @${REINPLACE_CMD} -e 's/wget/fetch/' ${WRKSRC}/po/zh_CN.po \ - ${WRKSRC}/po/zh_TW.po ${WRKSRC}/src/generalprefpage.cpp \ - ${WRKSRC}/src/view/telnetview.cpp - @${REINPLACE_CMD} -e 's/wget -O/fetch -o/' ${WRKSRC}/src/mainframe.cpp - @${REINPLACE_CMD} -e 's/Antiidlestr/AntiIdleStr/' \ - ${WRKSRC}/src/appconfig.cpp - @${REINPLACE_CMD} -e '136 s/, \(.*\)/,1\);/' \ - ${WRKSRC}/src/view/telnetview.cpp +.if defined(WITH_DEBUG) +CONFIGURE_ARGS+=--enable-debug +.endif + +.if defined(WITHOUT_DOCKLET) +CONFIGURE_ARGS+=--disable-docklet +.endif + +.if defined(WITHOUT_NOTIFIER) +CONFIGURE_ARGS+=--disable-notifier +.endif + +.if defined(WITH_LIBNOTIFY) +CONFIGURE_ARGS+=--enable-libnotify +.endif + +.if defined(WITHOUT_NANCY) +CONFIGURE_ARGS+=--disable-nancy +.endif + +.if defined(WITHOUT_MOUSE) +CONFIGURE_ARGS+=--disable-mouse +.endif + +.if defined(WITHOUT_EXTERNAL) +CONFIGURE_ARGS+=--disable-external +.endif + +.if defined(WITH_IPLOOKUP) +CONFIGURE_ARGS+=--enable-iplookup +.endif + +.if defined(WITH_PROXY) +CONFIGURE_ARGS+=--enable-proxy +.endif .include diff -ruN --exclude=CVS ../pcmanx.orig/distinfo ./distinfo --- ../pcmanx.orig/distinfo 2012-05-01 15:15:56.000000000 +0800 +++ ./distinfo 2012-05-01 16:57:46.000000000 +0800 @@ -1,2 +1,2 @@ -SHA256 (pcmanx-gtk2-0.3.9.tar.bz2) = 774fb06b48ac773243ce57b87eba4429f4cb05ef1febb87ee489ea6d7c3937b3 -SIZE (pcmanx-gtk2-0.3.9.tar.bz2) = 485014 +SHA256 (pcmanx-gtk2-1.1.tar.xz) = 377cccdd9e71ffbe434016f7ed93d8b82771f33398ce6804a0bf5926d2a4acd0 +SIZE (pcmanx-gtk2-1.1.tar.xz) = 527164 diff -ruN --exclude=CVS ../pcmanx.orig/files/patch-src-core-pcmanx_utils.h ./files/patch-src-core-pcmanx_utils.h --- ../pcmanx.orig/files/patch-src-core-pcmanx_utils.h 2012-05-01 15:15:56.000000000 +0800 +++ ./files/patch-src-core-pcmanx_utils.h 1970-01-01 08:00:00.000000000 +0800 @@ -1,10 +0,0 @@ ---- src/core/pcmanx_utils.h.orig 2010-10-12 21:10:55.000000000 +0800 -+++ src/core/pcmanx_utils.h 2010-10-12 21:11:00.000000000 +0800 -@@ -5,7 +5,6 @@ - #include - #endif - --#include - #if __WORDSIZE == 64 - typedef unsigned long int word_t; - #else diff -ruN --exclude=CVS ../pcmanx.orig/files/patch-src-core-proxy.c ./files/patch-src-core-proxy.c --- ../pcmanx.orig/files/patch-src-core-proxy.c 1970-01-01 08:00:00.000000000 +0800 +++ ./files/patch-src-core-proxy.c 2012-05-01 16:57:46.000000000 +0800 @@ -0,0 +1,11 @@ +--- src/core/proxy.c.orig 2011-12-28 19:59:03.000000000 +0800 ++++ src/core/proxy.c 2012-05-01 10:42:46.000000000 +0800 +@@ -23,6 +23,8 @@ + #include + #include + ++#include ++ + #include "proxy.h" + + #define SOCKS_CMD_CONNECT 0x01 diff -ruN --exclude=CVS ../pcmanx.orig/files/patch-src-mainframe.cpp ./files/patch-src-mainframe.cpp --- ../pcmanx.orig/files/patch-src-mainframe.cpp 1970-01-01 08:00:00.000000000 +0800 +++ ./files/patch-src-mainframe.cpp 2012-05-01 16:57:46.000000000 +0800 @@ -0,0 +1,12 @@ +--- src/mainframe.cpp.orig 2012-01-26 22:31:52.000000000 +0800 ++++ src/mainframe.cpp 2012-05-01 11:03:06.000000000 +0800 +@@ -171,7 +171,9 @@ + m_FavoritesMenu = NULL; + m_IsFlashing = false; + m_Mode = NORMAL_MODE; ++#ifdef USE_DOCKLET + m_TrayIcon = NULL; ++#endif + + if (desktop != NULL && strcmp("Unity", desktop) == 0) { + m_Unity = true; diff -ruN --exclude=CVS ../pcmanx.orig/files/patch-src-pcmanx_gtk2.cpp ./files/patch-src-pcmanx_gtk2.cpp --- ../pcmanx.orig/files/patch-src-pcmanx_gtk2.cpp 1970-01-01 08:00:00.000000000 +0800 +++ ./files/patch-src-pcmanx_gtk2.cpp 2012-05-01 16:57:46.000000000 +0800 @@ -0,0 +1,11 @@ +--- src/pcmanx_gtk2.cpp.orig 2012-01-26 22:31:52.000000000 +0800 ++++ src/pcmanx_gtk2.cpp 2012-05-01 00:36:00.000000000 +0800 +@@ -35,6 +35,8 @@ + #include + #include + ++#include ++ + #include "mainframe.h" + #include "appconfig.h" + #include "telnetcon.h" diff -ruN --exclude=CVS ../pcmanx.orig/pkg-plist ./pkg-plist --- ../pcmanx.orig/pkg-plist 2012-05-01 15:15:56.000000000 +0800 +++ ./pkg-plist 2012-05-01 16:57:46.000000000 +0800 @@ -1,9 +1,6 @@ bin/pcmanx -lib/libpcmanx_core.la -lib/libpcmanx_core.so -lib/libpcmanx_core.so.3 share/applications/pcmanx.desktop -share/pixmaps/pcmanx.png +share/pixmaps/pcmanx.svg %%NLS%%share/locale/zh_CN/LC_MESSAGES/pcmanx.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/pcmanx.mo %%DATADIR%%/emoticons @@ -17,4 +14,8 @@ @dirrmtry %%DATADIR%%/script @dirrmtry %%DATADIR%%/nancy_bot @dirrmtry %%DATADIR%% -@dirrmtry share/applications +@dirrmtry share/misc +@dirrmtry %%JAVAJARDIR%% +@exec mkdir -p %D/%%DATADIR%%/script +@exec mkdir -p %D/share/misc +@exec mkdir -p %D/%%JAVAJARDIR%% --- pcmanx-1.1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: