Attachment 39619 Details for Bug 62425 – file.diff

[patch] file.diff

file.diff (text/plain), 4.71 KB, created by tkato on 2004-02-06 13:10:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2004-02-06 13:10:08 UTC

Size: 4.71 KB

patch

obsolete

>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;
>-

Actions: View | Diff

Attachments on bug 62425: 39619