Attachment 36468 Details for Bug 58446 – file.diff

[patch] file.diff

file.diff (text/plain), 7.78 KB, created by tkato on 2003-10-23 17:40:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2003-10-23 17:40:22 UTC

Size: 7.78 KB

patch

obsolete

>diff -urN /usr/ports/deskutils/rubrica/Makefile deskutils/rubrica/Makefile
>--- /usr/ports/deskutils/rubrica/Makefile	Sun Aug 17 16:34:20 2003
>+++ deskutils/rubrica/Makefile	Fri Oct 24 01:09:50 2003
>@@ -6,32 +6,37 @@
> #
> 
> PORTNAME=	rubrica
>-PORTVERSION=	1.0.1
>+PORTVERSION=	1.0.5
> CATEGORIES=	deskutils gnome
> MASTER_SITES=	http://digilander.libero.it/nfragale/download/rubrica/
>-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.c1$/cr1/}
> 
>-MAINTAINER=	ports@freebsd.org
>+MAINTAINER=	ports@FreeBSD.org
> COMMENT=	An addressbook for the gnome2 desktop
> 
>-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.c1$/cr1/}
> USE_BZIP2=	yes
>-USE_GNOME=	gnomehack gnomeprefix libgnomeui
> USE_X_PREFIX=	yes
>+USE_GNOME=	gnomehack gnomeprefix gnometarget libgnomeui
> USE_GMAKE=	yes
> GNU_CONFIGURE=	yes
>-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
>-		LIBS="-L${LOCALBASE}/lib"
>+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
>+		LDFLAGS="-L${LOCALBASE}/lib"
> 
>-DOC_FILES=	AUTHORS COPYING CREDITS ChangeLog INSTALL NEWS README TODO
>+
>+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:
>-.ifndef(NOPORTDOCS)
>+.if !defined(NOPORTDOCS)
> 	@${MKDIR} ${DOCSDIR}
>-.for file in ${DOC_FILES}
>-	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
>+.for file in AUTHORS ChangeLog INSTALL NEWS README TODO
>+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
>+.endfor
>+.for file in CREDITS examples.rub
>+	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
> .endfor
>-	@${INSTALL_DATA} ${WRKSRC}/doc/examples.rub ${DOCSDIR}
> .endif
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/deskutils/rubrica/distinfo deskutils/rubrica/distinfo
>--- /usr/ports/deskutils/rubrica/distinfo	Sat May 17 06:09:00 2003
>+++ deskutils/rubrica/distinfo	Thu Oct 23 23:42:07 2003
>@@ -1 +1 @@
>-MD5 (rubrica-1.0.1.tar.bz2) = 72c5d78e7f69465bb481ad09fa9093f0
>+MD5 (rubrica-1.0.5.tar.bz2) = 3ca96ecef897abe4db3ec0cf8a78039b
>diff -urN /usr/ports/deskutils/rubrica/files/patch-Makefile.in deskutils/rubrica/files/patch-Makefile.in
>--- /usr/ports/deskutils/rubrica/files/patch-Makefile.in	Sat Mar  1 16:07:58 2003
>+++ deskutils/rubrica/files/patch-Makefile.in	Thu Jan  1 09:00:00 1970
>@@ -1,30 +0,0 @@
>---- Makefile.in.orig	Sat Mar  1 01:46:41 2003
>-+++ Makefile.in	Sat Mar  1 01:50:40 2003
>-@@ -119,16 +119,8 @@
>- kdedesktop_in_files = rubrica.desktop.in
>- kdedesktop_DATA = $(kdedesktop_in_files:.desktop.in=.desktop)
>- 
>--rubricadocdir = $(datadir)/doc/rubrica
>--rubricadoc_DATA = \
>--	README \
>--	COPYING \
>--	AUTHORS \
>--	CREDITS \
>--	ChangeLog \
>--	INSTALL \
>--	NEWS \
>--	TODO
>-+rubricadocdir = $(prefix)/share/doc/rubrica
>-+rubricadoc_DATA =
>- 
>- 
>- schemas_dir = $(sysconfdir)/gconf/schemas
>-@@ -146,7 +138,7 @@
>- CONFIG_HEADER = config.h
>- CONFIG_CLEAN_FILES = rubrica.desktop rubrica.spec
>- DIST_SOURCES =
>--DATA = $(desktop_DATA) $(kdedesktop_DATA) $(rubricadoc_DATA) \
>-+DATA = $(desktop_DATA) $(kdedesktop_DATA) \
>- 	$(schemas__DATA)
>- 
>- 
>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	Sat Mar  1 16:07:58 2003
>+++ deskutils/rubrica/files/patch-doc_Makefile.in	Thu Jan  1 09:00:00 1970
>@@ -1,24 +0,0 @@
>---- doc/Makefile.in.orig	Sat Mar  1 01:54:32 2003
>-+++ doc/Makefile.in	Sat Mar  1 01:57:37 2003
>-@@ -109,10 +109,9 @@
>- am__quote = @am__quote@
>- install_sh = @install_sh@
>- 
>--rubricadocdir = $(datadir)/doc/rubrica
>-+rubricadocdir = $(prefix)/share/doc/rubrica
>- 
>--rubricadoc_DATA = \
>--	 examples.rub
>-+rubricadoc_DATA = 
>- 
>- 
>- EXTRA_DIST = $(rubricadoc_DATA) 
>-@@ -121,7 +120,7 @@
>- CONFIG_HEADER = $(top_builddir)/config.h
>- CONFIG_CLEAN_FILES =
>- DIST_SOURCES =
>--DATA = $(rubricadoc_DATA)
>-+DATA =
>- 
>- DIST_COMMON = Makefile.am Makefile.in
>- all: all-am
>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	Thu Jan  1 09:00:00 1970
>+++ deskutils/rubrica/files/patch-src::vcard.c	Fri Oct 24 00:59:48 2003
>@@ -0,0 +1,22 @@
>+--- 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;
>+   
>diff -urN /usr/ports/deskutils/rubrica/pkg-plist deskutils/rubrica/pkg-plist
>--- /usr/ports/deskutils/rubrica/pkg-plist	Sat Mar  1 16:07:58 2003
>+++ deskutils/rubrica/pkg-plist	Fri Oct 24 01:09:35 2003
>@@ -1,15 +1,14 @@
> bin/rubrica
> etc/gconf/schemas/rubrica.schemas
>+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
>+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
>+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
>+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
>+%%PORTDOCS%%%%DOCSDIR%%/NEWS
>+%%PORTDOCS%%%%DOCSDIR%%/README
>+%%PORTDOCS%%%%DOCSDIR%%/TODO
>+%%PORTDOCS%%%%DOCSDIR%%/examples.rub
> share/gnome/applications/rubrica.desktop
>-%%PORTDOCS%%share/doc/rubrica/AUTHORS
>-%%PORTDOCS%%share/doc/rubrica/COPYING
>-%%PORTDOCS%%share/doc/rubrica/CREDITS
>-%%PORTDOCS%%share/doc/rubrica/ChangeLog
>-%%PORTDOCS%%share/doc/rubrica/INSTALL
>-%%PORTDOCS%%share/doc/rubrica/NEWS
>-%%PORTDOCS%%share/doc/rubrica/README
>-%%PORTDOCS%%share/doc/rubrica/TODO
>-%%PORTDOCS%%share/doc/rubrica/examples.rub
> share/gnome/pixmaps/rubrica/about.png
> share/gnome/pixmaps/rubrica/accounts.png
> share/gnome/pixmaps/rubrica/add-menu.png
>@@ -37,6 +36,7 @@
> share/gnome/pixmaps/rubrica/export.png
> share/gnome/pixmaps/rubrica/favorites.png
> share/gnome/pixmaps/rubrica/fax.png
>+share/gnome/pixmaps/rubrica/few.png
> share/gnome/pixmaps/rubrica/file-info.png
> share/gnome/pixmaps/rubrica/file.png
> share/gnome/pixmaps/rubrica/filesett.png
>@@ -49,6 +49,7 @@
> share/gnome/pixmaps/rubrica/genius.png
> share/gnome/pixmaps/rubrica/heart.png
> share/gnome/pixmaps/rubrica/help.png
>+share/gnome/pixmaps/rubrica/hi.png
> share/gnome/pixmaps/rubrica/hobby.png
> share/gnome/pixmaps/rubrica/holiday-cards.png
> share/gnome/pixmaps/rubrica/holiday.png
>@@ -68,6 +69,8 @@
> share/gnome/pixmaps/rubrica/mod.png
> share/gnome/pixmaps/rubrica/money.png
> share/gnome/pixmaps/rubrica/multimedia.png
>+share/gnome/pixmaps/rubrica/none.png
>+share/gnome/pixmaps/rubrica/normal.png
> share/gnome/pixmaps/rubrica/notes.png
> share/gnome/pixmaps/rubrica/other.png
> share/gnome/pixmaps/rubrica/penguin.png
>@@ -95,6 +98,7 @@
> share/gnome/pixmaps/rubrica/time.png
> share/gnome/pixmaps/rubrica/translation-info.png
> share/gnome/pixmaps/rubrica/translation.png
>+share/gnome/pixmaps/rubrica/very-hi.png
> share/gnome/pixmaps/rubrica/view-column.png
> share/gnome/pixmaps/rubrica/view-info.png
> share/gnome/pixmaps/rubrica/view.png
>@@ -109,18 +113,18 @@
> share/gnome/rubrica/stylesheet/rub2rub.xsl
> share/gnome/rubrica/stylesheet/rub2txt.xsl
> share/gnome/rubrica/stylesheet/rub2vcard.xsl
>-share/gnome/services/rubrica.desktop
>-share/locale/br/LC_MESSAGES/rubrica.mo
>+share/locale/bg/LC_MESSAGES/rubrica.mo
> share/locale/de/LC_MESSAGES/rubrica.mo
> share/locale/es/LC_MESSAGES/rubrica.mo
> share/locale/fr/LC_MESSAGES/rubrica.mo
> share/locale/it/LC_MESSAGES/rubrica.mo
> share/locale/ja/LC_MESSAGES/rubrica.mo
>+share/locale/pt_BR/LC_MESSAGES/rubrica.mo
> share/locale/ru/LC_MESSAGES/rubrica.mo
>-@dirrm share/gnome/services
>+share/locale/sk/LC_MESSAGES/rubrica.mo
> @dirrm share/gnome/rubrica/stylesheet
> @dirrm share/gnome/rubrica/script
> @dirrm share/gnome/rubrica/nautilus-script
> @dirrm share/gnome/rubrica
> @dirrm share/gnome/pixmaps/rubrica
>-%%PORTDOCS%%@dirrm share/doc/rubrica
>+%%PORTDOCS%%@dirrm %%DOCSDIR%%

Actions: View | Diff

Attachments on bug 58446: 36468