From samm@os2.kiev.ua  Tue Sep 12 20:43:01 2006
Return-Path: <samm@os2.kiev.ua>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id EFC8916A4D4
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 12 Sep 2006 20:43:00 +0000 (UTC)
	(envelope-from samm@os2.kiev.ua)
Received: from em.volia.net (em.volia.net [82.144.192.38])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 367E543D8D
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 12 Sep 2006 20:39:45 +0000 (GMT)
	(envelope-from samm@os2.kiev.ua)
Received: from ip.85.202.201.160.dyn.sub-4.broadband.voliacable.com ([85.202.201.160] helo=samm.local)
	by em.volia.net with esmtp (Exim 4.63 (FreeBSD))
	(envelope-from <samm@os2.kiev.ua>)
	id 1GNF2m-000P4m-4t
	for FreeBSD-gnats-submit@freebsd.org; Tue, 12 Sep 2006 23:39:44 +0300
Message-Id: <1158093584.52238@samm.local>
Date: Tue, 12 Sep 2006 23:39:44 +0300
From: "Alex Samorukov" <samm@os2.kiev.ua>
To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@freebsd.org>
Subject: port update palm/jpilot to 0.99.9 version 
X-Send-Pr-Version: gtk-send-pr 0.4.7 
X-GNATS-Notify:

>Number:         103203
>Category:       ports
>Synopsis:       port update palm/jpilot to 0.99.9 version
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 12 20:50:23 GMT 2006
>Closed-Date:    Fri Sep 22 08:10:17 GMT 2006
>Last-Modified:  Fri Sep 22 08:20:20 GMT 2006
>Originator:     Alex Samorukov
>Release:        FreeBSD 6.1-RELEASE i386
>Organization:
Shevchenko Didkovskiy and Partners 
>Environment:


System: FreeBSD 6.1-RELEASE #2: Wed May 17 22:22:18 EEST 2006
    root@samm.local:/usr/obj/usr/src/sys/SAMMKRNL



>Description:


* update to 0.99.9 and reset portrevision
* fix package list
* removed old patches
* added patch to fix error  "`_NL_TIME_FIRST_WEEKDAY' undeclared" (bug id 1722)
* GTK2 is now default in jpilot, so changing --enable-gtk2 to --disable-gtk2 in case of GTK1.


>How-To-Repeat:





>Fix:


diff --new-file -u -r jpilot.old/Makefile jpilot/Makefile
--- jpilot.old/Makefile	Tue Sep 12 13:09:57 2006
+++ jpilot/Makefile	Tue Sep 12 18:37:01 2006
@@ -7,8 +7,7 @@
 # "?=" and "+=" are for including this Makefile from japanese/jpilot
 
 PORTNAME=	jpilot
-PORTVERSION=	0.99.8
-PORTREVISION=	4
+PORTVERSION=	0.99.9
 CATEGORIES+=	palm comms
 MASTER_SITES=	http://jpilot.org/
 
@@ -38,9 +37,9 @@
 
 .if defined(WITH_GTK1)
 USE_GNOME+=	gtk12
+CONFIGURE_ARGS+=	--disable-gtk2=yes
 .else
 USE_GNOME+=	gtk20
-CONFIGURE_ARGS+=	--enable-gtk2=yes
 .endif
 
 MAN1=		jpilot-dial.1 jpilot-dump.1 jpilot-sync.1 jpilot.1
@@ -71,7 +70,7 @@
 .for ext in html png jpg
 	${INSTALL_DATA} ${WRKSRC}/docs/*.${ext} ${DOCSDIR}
 .endfor
-.for i in AUTHORS BUGS COPYING ChangeLog INSTALL README TODO UPGRADING
+.for i in AUTHORS BUGS COPYING ChangeLog INSTALL README TODO
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/icons/README ${DOCSDIR}/README.icons
diff --new-file -u -r jpilot.old/distinfo jpilot/distinfo
--- jpilot.old/distinfo	Tue Sep 12 13:09:57 2006
+++ jpilot/distinfo	Tue Sep 12 18:08:31 2006
@@ -1,3 +1,3 @@
-MD5 (jpilot-0.99.8.tar.gz) = 4bdb200367e691e64d02bd6dfcdec604
-SHA256 (jpilot-0.99.8.tar.gz) = a89ca99df142efa6046509df7522794c34da84158893bfbce836c9f5fd943d78
-SIZE (jpilot-0.99.8.tar.gz) = 1589217
+MD5 (jpilot-0.99.9.tar.gz) = c39df29aeed57b84a674524856ebc290
+SHA256 (jpilot-0.99.9.tar.gz) = 341491ad727e234b58c7d5f057bcff363d15d2f223c1beab05fc49820dfe6432
+SIZE (jpilot-0.99.9.tar.gz) = 1671351
diff --new-file -u -r jpilot.old/files/patch-0.99.8-memory jpilot/files/patch-0.99.8-memory
--- jpilot.old/files/patch-0.99.8-memory	Tue Sep 12 13:09:57 2006
+++ jpilot/files/patch-0.99.8-memory	Thu Jan  1 03:00:00 1970
@@ -1,12 +0,0 @@
---- utils.c.orig	2005-12-11 13:04:24.000000000 -0500
-+++ utils.c	2005-12-11 13:04:38.000000000 -0500
-@@ -2042,9 +2042,6 @@
-       fwrite(RecordBuffer->data, header.rec_len, 1, pc_in);
- #endif /* PILOT_LINK_0_12 */
-       jp_logf(JP_LOG_DEBUG, "record deleted\n");
--#ifdef PILOT_LINK_0_12
--      pi_buffer_free(RecordBuffer);
--#endif /* PILOT_LINK_0_12 */
-       fclose(pc_in);
- #ifdef PILOT_LINK_0_12
-       pi_buffer_free(RecordBuffer);
diff --new-file -u -r jpilot.old/files/patch-jpilot jpilot/files/patch-jpilot
--- jpilot.old/files/patch-jpilot	Tue Sep 12 13:09:57 2006
+++ jpilot/files/patch-jpilot	Thu Jan  1 03:00:00 1970
@@ -1,18 +0,0 @@
-diff -u -r1.127 -r1.128
---- jpilot.c	28 Nov 2005 07:22:22 -0000	1.127
-+++ jpilot.c	16 Dec 2005 13:33:27 -0000	1.128
-@@ -1,4 +1,4 @@
--/* $Id: jpilot.c,v 1.127 2005/11/28 07:22:22 rikster5 Exp $ */
-+/* $Id: jpilot.c,v 1.128 2005/12/16 13:33:27 rousseau Exp $ */
- 
- /*******************************************************************************
-  * jpilot.c
-@@ -1367,7 +1367,7 @@
-    gdk_pixdata_from_pixbuf(pixdata, pixbuf, FALSE);
-    data = gdk_pixdata_serialize(pixdata, &len);
- 
--   g_free(pixbuf);
-+   g_object_unref(pixbuf);
-    g_free(pixdata);
- 
-    return data;
diff --new-file -u -r jpilot.old/files/patch-jpilot-langinfo jpilot/files/patch-jpilot-langinfo
--- jpilot.old/files/patch-jpilot-langinfo	Thu Jan  1 03:00:00 1970
+++ jpilot/files/patch-jpilot-langinfo	Tue Sep 12 18:54:26 2006
@@ -0,0 +1,11 @@
+--- jpilot.c.orig	Fri Jun  9 23:42:57 2006
++++ jpilot.c	Tue Sep 12 18:51:49 2006
+@@ -2180,7 +2180,7 @@
+ 
+    /* Extract first day of week preference from locale in GTK2 */
+ #  ifdef ENABLE_GTK2
+-#     ifdef HAVE_LANGINFO_H
++#     if defined(HAVE_LANGINFO_H) && defined(_NL_TIME_FIRST_WEEKDAY)
+ 	 /* GTK 2.8 libraries */
+ 	 week_start = nl_langinfo (_NL_TIME_FIRST_WEEKDAY);
+ 	 pref_fdow = *((unsigned char *) week_start) - 1;
diff --new-file -u -r jpilot.old/files/patch-jpilot-sync jpilot/files/patch-jpilot-sync
--- jpilot.old/files/patch-jpilot-sync	Tue Sep 12 13:09:57 2006
+++ jpilot/files/patch-jpilot-sync	Thu Jan  1 03:00:00 1970
@@ -1,15 +0,0 @@
-Index: jpilot-sync.c
-===================================================================
-RCS file: /cvs/jpilot/jpilot_src/jpilot-sync.c,v
-retrieving revision 1.23
-diff -u -r1.23 jpilot-sync.c
---- jpilot-sync.c	28 Jan 2005 16:54:13 -0000	1.23
-+++ jpilot-sync.c	5 Nov 2005 15:07:57 -0000
-@@ -44,6 +44,7 @@
- pid_t glob_child_pid;
- GtkWidget *glob_dialog;
- pid_t glob_child_pid;
-+GtkTooltips *glob_tooltips;
- 
- unsigned char skip_plugins;
- 


>Release-Note:
>Audit-Trail:
Class-Changed-From-To: sw-bug->maintainer-update 
Class-Changed-By: edwin 
Class-Changed-When: Tue Sep 12 20:50:37 UTC 2006 
Class-Changed-Why:  
Fix category (submitter is maintainer) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=103203 
State-Changed-From-To: open->closed 
State-Changed-By: ijliao 
State-Changed-When: Fri Sep 22 08:06:46 UTC 2006 
State-Changed-Why:  
committed, thanks 

http://www.freebsd.org/cgi/query-pr.cgi?pr=103203 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/103203: commit references a PR
Date: Fri, 22 Sep 2006 08:10:28 +0000 (UTC)

 ijliao      2006-09-22 08:10:09 UTC
 
   FreeBSD ports repository
 
   Modified files:
     palm/jpilot          Makefile distinfo 
   Added files:
     palm/jpilot/files    patch-jpilot-langinfo 
   Removed files:
     palm/jpilot/files    patch-0.99.8-memory patch-jpilot 
                          patch-jpilot-sync 
   Log:
   upgrade to 0.99.9
   
   PR:             103203
   Submitted by:   maintainer
   
   Revision  Changes    Path
   1.55      +7 -7      ports/palm/jpilot/Makefile
   1.18      +3 -3      ports/palm/jpilot/distinfo
   1.2       +0 -12     ports/palm/jpilot/files/patch-0.99.8-memory (dead)
   1.2       +0 -18     ports/palm/jpilot/files/patch-jpilot (dead)
   1.1       +11 -0     ports/palm/jpilot/files/patch-jpilot-langinfo (new)
   1.2       +0 -15     ports/palm/jpilot/files/patch-jpilot-sync (dead)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: Alex Samorukov <samm@os2.kiev.ua>
To: bug-followup@FreeBSD.org,  samm@os2.kiev.ua
Cc:  
Subject: Re: ports/103203: port update palm/jpilot to 0.99.9 version
Date: Fri, 22 Sep 2006 11:13:46 +0300

 This is a multi-part message in MIME format.
 --------------090304050502020805060905
 Content-Type: text/plain; charset=KOI8-R; format=flowed
 Content-Transfer-Encoding: 7bit
 
 pilot-link version was updated, here is a corrected patch
 
 -- 
 Best regards,
 Alex Samorukov, SAMM1-RIPE
 Zend Certified PHP Engineer
 
 
 --------------090304050502020805060905
 Content-Type: text/plain;
  name="jpilot.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="jpilot.diff"
 
 diff -ruN --exclude=CVS /usr/ports/palm/jpilot/Makefile /usr/home/samm/tmp/jpilot/Makefile
 --- /usr/ports/palm/jpilot/Makefile	Sat Jun 17 18:50:47 2006
 +++ /usr/home/samm/tmp/jpilot/Makefile	Thu Sep 14 08:42:49 2006
 @@ -7,20 +7,19 @@
  # "?=" and "+=" are for including this Makefile from japanese/jpilot
  
  PORTNAME=	jpilot
 -PORTVERSION=	0.99.8
 -PORTREVISION=	4
 +PORTVERSION=	0.99.9
  CATEGORIES+=	palm comms
  MASTER_SITES=	http://jpilot.org/
  
  MAINTAINER?=	samm@os2.kiev.ua
  COMMENT=	Desktop Organizer Software for the Palm Pilot
  
 -LIB_DEPENDS=	pisock.8:${PORTSDIR}/palm/pilot-link
 +LIB_DEPENDS=	pisock.9:${PORTSDIR}/palm/pilot-link
  
  USE_X_PREFIX=	yes
  USE_GNOME=	gnomehier
  GNU_CONFIGURE=	yes
 -INSTALLS_SHLIB=	yes
 +USE_LDCONFIG=	yes
  LDCONFIG_DIRS=	%%PREFIX%%/lib/jpilot/plugins
  CFLAGS+=	-I${LOCALBASE}/include
  CONFIGURE_ENV+=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
 @@ -38,9 +37,9 @@
  
  .if defined(WITH_GTK1)
  USE_GNOME+=	gtk12
 +CONFIGURE_ARGS+=	--disable-gtk2=yes
  .else
  USE_GNOME+=	gtk20
 -CONFIGURE_ARGS+=	--enable-gtk2=yes
  .endif
  
  MAN1=		jpilot-dial.1 jpilot-dump.1 jpilot-sync.1 jpilot.1
 @@ -71,7 +70,7 @@
  .for ext in html png jpg
  	${INSTALL_DATA} ${WRKSRC}/docs/*.${ext} ${DOCSDIR}
  .endfor
 -.for i in AUTHORS BUGS COPYING ChangeLog INSTALL README TODO UPGRADING
 +.for i in AUTHORS BUGS COPYING ChangeLog INSTALL README TODO
  	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
  .endfor
  	${INSTALL_DATA} ${WRKSRC}/icons/README ${DOCSDIR}/README.icons
 diff -ruN --exclude=CVS /usr/ports/palm/jpilot/distinfo /usr/home/samm/tmp/jpilot/distinfo
 --- /usr/ports/palm/jpilot/distinfo	Tue Jan 24 01:49:20 2006
 +++ /usr/home/samm/tmp/jpilot/distinfo	Wed Sep 13 19:29:25 2006
 @@ -1,3 +1,3 @@
 -MD5 (jpilot-0.99.8.tar.gz) = 4bdb200367e691e64d02bd6dfcdec604
 -SHA256 (jpilot-0.99.8.tar.gz) = a89ca99df142efa6046509df7522794c34da84158893bfbce836c9f5fd943d78
 -SIZE (jpilot-0.99.8.tar.gz) = 1589217
 +MD5 (jpilot-0.99.9.tar.gz) = c39df29aeed57b84a674524856ebc290
 +SHA256 (jpilot-0.99.9.tar.gz) = 341491ad727e234b58c7d5f057bcff363d15d2f223c1beab05fc49820dfe6432
 +SIZE (jpilot-0.99.9.tar.gz) = 1671351
 diff -ruN --exclude=CVS /usr/ports/palm/jpilot/files/patch-0.99.8-memory /usr/home/samm/tmp/jpilot/files/patch-0.99.8-memory
 --- /usr/ports/palm/jpilot/files/patch-0.99.8-memory	Thu Jun 15 21:12:56 2006
 +++ /usr/home/samm/tmp/jpilot/files/patch-0.99.8-memory	Thu Jan  1 03:00:00 1970
 @@ -1,12 +0,0 @@
 ---- utils.c.orig	2005-12-11 13:04:24.000000000 -0500
 -+++ utils.c	2005-12-11 13:04:38.000000000 -0500
 -@@ -2042,9 +2042,6 @@
 -       fwrite(RecordBuffer->data, header.rec_len, 1, pc_in);
 - #endif /* PILOT_LINK_0_12 */
 -       jp_logf(JP_LOG_DEBUG, "record deleted\n");
 --#ifdef PILOT_LINK_0_12
 --      pi_buffer_free(RecordBuffer);
 --#endif /* PILOT_LINK_0_12 */
 -       fclose(pc_in);
 - #ifdef PILOT_LINK_0_12
 -       pi_buffer_free(RecordBuffer);
 diff -ruN --exclude=CVS /usr/ports/palm/jpilot/files/patch-Makefile.in /usr/home/samm/tmp/jpilot/files/patch-Makefile.in
 --- /usr/ports/palm/jpilot/files/patch-Makefile.in	Thu Nov  3 22:23:58 2005
 +++ /usr/home/samm/tmp/jpilot/files/patch-Makefile.in	Thu Jan  1 03:00:00 1970
 @@ -1,11 +0,0 @@
 ---- Makefile.in.orig	Sun Oct 30 18:00:53 2005
 -+++ Makefile.in	Tue Nov  1 17:17:43 2005
 -@@ -302,7 +302,7 @@
 - sharedstatedir = @sharedstatedir@
 - sysconfdir = @sysconfdir@
 - target_alias = @target_alias@
 --SUBDIRS = Expense SyncTime KeyRing docs dialer po m4 empty icons
 -+SUBDIRS = Expense SyncTime KeyRing dialer po m4 empty
 - 
 - # install the manual docs
 - colordir = $(prefix)/share/$(PACKAGE)
 diff -ruN --exclude=CVS /usr/ports/palm/jpilot/files/patch-jpilot /usr/home/samm/tmp/jpilot/files/patch-jpilot
 --- /usr/ports/palm/jpilot/files/patch-jpilot	Sat Jun 17 18:50:47 2006
 +++ /usr/home/samm/tmp/jpilot/files/patch-jpilot	Thu Jan  1 03:00:00 1970
 @@ -1,18 +0,0 @@
 -diff -u -r1.127 -r1.128
 ---- jpilot.c	28 Nov 2005 07:22:22 -0000	1.127
 -+++ jpilot.c	16 Dec 2005 13:33:27 -0000	1.128
 -@@ -1,4 +1,4 @@
 --/* $Id: jpilot.c,v 1.127 2005/11/28 07:22:22 rikster5 Exp $ */
 -+/* $Id: jpilot.c,v 1.128 2005/12/16 13:33:27 rousseau Exp $ */
 - 
 - /*******************************************************************************
 -  * jpilot.c
 -@@ -1367,7 +1367,7 @@
 -    gdk_pixdata_from_pixbuf(pixdata, pixbuf, FALSE);
 -    data = gdk_pixdata_serialize(pixdata, &len);
 - 
 --   g_free(pixbuf);
 -+   g_object_unref(pixbuf);
 -    g_free(pixdata);
 - 
 -    return data;
 diff -ruN --exclude=CVS /usr/ports/palm/jpilot/files/patch-jpilot-langinfo /usr/home/samm/tmp/jpilot/files/patch-jpilot-langinfo
 --- /usr/ports/palm/jpilot/files/patch-jpilot-langinfo	Thu Jan  1 03:00:00 1970
 +++ /usr/home/samm/tmp/jpilot/files/patch-jpilot-langinfo	Thu Sep 14 08:46:42 2006
 @@ -0,0 +1,11 @@
 +--- jpilot.c.orig	Thu Sep 14 08:45:18 2006
 ++++ jpilot.c	Thu Sep 14 08:46:04 2006
 +@@ -2180,7 +2180,7 @@
 + 
 +    /* Extract first day of week preference from locale in GTK2 */
 + #  ifdef ENABLE_GTK2
 +-#     ifdef HAVE_LANGINFO_H
 ++#     if defined(HAVE_LANGINFO_H) && defined(_NL_TIME_FIRST_WEEKDAY)
 + 	 /* GTK 2.8 libraries */
 + 	 week_start = nl_langinfo (_NL_TIME_FIRST_WEEKDAY);
 + 	 pref_fdow = *((unsigned char *) week_start) - 1;
 diff -ruN --exclude=CVS /usr/ports/palm/jpilot/files/patch-jpilot-sync /usr/home/samm/tmp/jpilot/files/patch-jpilot-sync
 --- /usr/ports/palm/jpilot/files/patch-jpilot-sync	Thu Jun 15 21:12:56 2006
 +++ /usr/home/samm/tmp/jpilot/files/patch-jpilot-sync	Thu Jan  1 03:00:00 1970
 @@ -1,15 +0,0 @@
 -Index: jpilot-sync.c
 -===================================================================
 -RCS file: /cvs/jpilot/jpilot_src/jpilot-sync.c,v
 -retrieving revision 1.23
 -diff -u -r1.23 jpilot-sync.c
 ---- jpilot-sync.c	28 Jan 2005 16:54:13 -0000	1.23
 -+++ jpilot-sync.c	5 Nov 2005 15:07:57 -0000
 -@@ -44,6 +44,7 @@
 - pid_t glob_child_pid;
 - GtkWidget *glob_dialog;
 - pid_t glob_child_pid;
 -+GtkTooltips *glob_tooltips;
 - 
 - unsigned char skip_plugins;
 - 
 --------------090304050502020805060905--
>Unformatted:
