From tkato@prontomail.com  Fri Feb  6 05:01:29 2004
Return-Path: <tkato@prontomail.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0405D16A4CE
	for <FreeBSD-gnats-submit@FreeBSD.org>; Fri,  6 Feb 2004 05:01:29 -0800 (PST)
Received: from hfep06.dion.ne.jp (hfep06.dion.ne.jp [203.181.105.72])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 11FDA43D1F
	for <FreeBSD-gnats-submit@FreeBSD.org>; Fri,  6 Feb 2004 05:01:26 -0800 (PST)
	(envelope-from tkato@prontomail.com)
Received: from localhost ([61.198.241.213]) by hfep06.dion.ne.jp with SMTP
          id <20040206130056072.UNZP@hfep06.dion.ne.jp>
          for <FreeBSD-gnats-submit@FreeBSD.org>;
          Fri, 6 Feb 2004 22:00:56 +0900
Message-Id: <20040206220007.7cdfbe87.tkato@prontomail.com>
Date: Fri, 6 Feb 2004 22:00:07 +0900
From: KATO Tsuguru <tkato@prontomail.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: Update port: deskutils/rubrica to 1.0.10

>Number:         62425
>Category:       ports
>Synopsis:       Update port: deskutils/rubrica to 1.0.10
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    krion
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Feb 06 05:10:08 PST 2004
>Closed-Date:    Fri Feb 06 05:27:58 PST 2004
>Last-Modified:  Fri Feb 06 05:27:58 PST 2004
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.9-RELEASE-p1 i386
>Organization:
>Environment:
>Description:
- Update to version 1.0.10

New file:
files/patch-Makefile.in
files/patch-doc::Makefile.in
files/patch-po::Makefile.in
files/patch-src::Makefile.in

Remove file:
files/patch-src::vcard.c

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/deskutils/rubrica/Makefile deskutils/rubrica/Makefile
--- /usr/ports/deskutils/rubrica/Makefile	Wed Feb  4 18:56:28 2004
+++ deskutils/rubrica/Makefile	Thu Feb  5 17:21:53 2004
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	rubrica
-PORTVERSION=	1.0.5
-PORTREVISION=	1
+PORTVERSION=	1.0.10
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://digilander.libero.it/nfragale/download/rubrica/
 
@@ -18,24 +17,17 @@
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix gnometarget libgnomeui
 USE_GMAKE=	yes
-USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-post-patch:
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|^CFLAGS.*$$|CFLAGS = @CFLAGS@|g ; \
-		 s|^rubricadocdir.*$$|rubricadocdir =|g ; \
-		 s|$$(rubricadoc_DATA)||g'
-
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for file in AUTHORS ChangeLog INSTALL NEWS README TODO
+.for file in AUTHORS CREDITS ChangeLog INSTALL NEWS README TODO
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
-.for file in CREDITS examples.rub
+.for file in examples.rub
 	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
 .endfor
 .endif
diff -urN /usr/ports/deskutils/rubrica/distinfo deskutils/rubrica/distinfo
--- /usr/ports/deskutils/rubrica/distinfo	Thu Jan 29 20:20:59 2004
+++ deskutils/rubrica/distinfo	Thu Feb  5 13:06:10 2004
@@ -1,2 +1,2 @@
-MD5 (rubrica-1.0.5.tar.bz2) = 3ca96ecef897abe4db3ec0cf8a78039b
-SIZE (rubrica-1.0.5.tar.bz2) = 682460
+MD5 (rubrica-1.0.10.tar.bz2) = 308b109af328b154e04ae79bb0f3e509
+SIZE (rubrica-1.0.10.tar.bz2) = 660133
diff -urN /usr/ports/deskutils/rubrica/files/patch-Makefile.in deskutils/rubrica/files/patch-Makefile.in
--- /usr/ports/deskutils/rubrica/files/patch-Makefile.in	Thu Jan  1 09:00:00 1970
+++ deskutils/rubrica/files/patch-Makefile.in	Thu Feb  5 17:23:17 2004
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Thu Feb  5 03:10:13 2004
++++ Makefile.in	Thu Feb  5 17:22:51 2004
+@@ -521,7 +521,7 @@
+ 
+ info-am:
+ 
+-install-data-am: install-desktopDATA install-rubricadocDATA \
++install-data-am: install-desktopDATA \
+ 	install-schemas_DATA
+ 
+ install-exec-am:
diff -urN /usr/ports/deskutils/rubrica/files/patch-doc::Makefile.in deskutils/rubrica/files/patch-doc::Makefile.in
--- /usr/ports/deskutils/rubrica/files/patch-doc::Makefile.in	Thu Jan  1 09:00:00 1970
+++ deskutils/rubrica/files/patch-doc::Makefile.in	Thu Feb  5 17:24:56 2004
@@ -0,0 +1,11 @@
+--- doc/Makefile.in.orig	Thu Feb  5 03:10:13 2004
++++ doc/Makefile.in	Thu Feb  5 17:24:42 2004
+@@ -245,7 +245,7 @@
+ 
+ info-am:
+ 
+-install-data-am: install-extradocDATA
++install-data-am:
+ 
+ install-exec-am:
+ 
diff -urN /usr/ports/deskutils/rubrica/files/patch-po::Makefile.in deskutils/rubrica/files/patch-po::Makefile.in
--- /usr/ports/deskutils/rubrica/files/patch-po::Makefile.in	Thu Jan  1 09:00:00 1970
+++ deskutils/rubrica/files/patch-po::Makefile.in	Thu Feb  5 17:26:39 2004
@@ -0,0 +1,11 @@
+--- po/Makefile.in.in.orig	Sat Jan 31 09:31:19 2004
++++ po/Makefile.in.in	Thu Feb  5 17:26:28 2004
+@@ -106,7 +106,7 @@
+ 	@catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+-	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
++	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
+ 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+ 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
+ 	  if test -r $$cat; then \
diff -urN /usr/ports/deskutils/rubrica/files/patch-src::Makefile.in deskutils/rubrica/files/patch-src::Makefile.in
--- /usr/ports/deskutils/rubrica/files/patch-src::Makefile.in	Thu Jan  1 09:00:00 1970
+++ deskutils/rubrica/files/patch-src::Makefile.in	Thu Feb  5 17:24:11 2004
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig	Thu Feb  5 03:10:14 2004
++++ src/Makefile.in	Thu Feb  5 17:23:59 2004
+@@ -126,7 +126,7 @@
+ 	-DFILE_FORMAT=@FILE_FORMAT@
+ 
+ 
+-CFLAGS = -DHAVE_CONFIG_H -Wall -O -g 
++CFLAGS = @CFLAGS@
+ 
+ bin_PROGRAMS = rubrica 
+ 
diff -urN /usr/ports/deskutils/rubrica/files/patch-src::vcard.c deskutils/rubrica/files/patch-src::vcard.c
--- /usr/ports/deskutils/rubrica/files/patch-src::vcard.c	Fri Oct 24 23:13:19 2003
+++ deskutils/rubrica/files/patch-src::vcard.c	Thu Jan  1 09:00:00 1970
@@ -1,22 +0,0 @@
---- src/vcard.c.orig	Fri Jun  6 23:57:31 2003
-+++ src/vcard.c	Fri Oct 24 00:59:04 2003
-@@ -128,9 +128,6 @@
-   RubricaVCardParamType param;
-   RubricaVCardValueType value;
- 
--  parray[ARRAY_SIZE] = BAD_PARAM;
--  varray[ARRAY_SIZE] = BAD_VALUE;
--
-   gchar buffer_token[32], buffer_param[32], buffer_val[32]; 
-   gchar data[1024];
- //  gchar *binary_data;
-@@ -139,6 +136,9 @@
-   gint ch;
-   gint i = 0, j = 0, k = 0, l = 0, p = 0;  
-   gboolean new_card = TRUE;
-+
-+  parray[ARRAY_SIZE] = BAD_PARAM;
-+  varray[ARRAY_SIZE] = BAD_VALUE;
- 
-   state = BUILD_TOKEN_STATE;
-   
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->krion 
Responsible-Changed-By: krion 
Responsible-Changed-When: Fri Feb 6 05:12:23 PST 2004 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=62425 
State-Changed-From-To: open->closed 
State-Changed-By: krion 
State-Changed-When: Fri Feb 6 05:27:51 PST 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=62425 
>Unformatted:
