Attachment #36468 for bug #58446

View | Details | Raw Unified | Return to bug 58446
Collapse All | Expand All




#

PORTNAME=	rubrica
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
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" \
		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
	${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>

Line 1 Link Here

(-)deskutils/rubrica/distinfo (-1 / +1 lines)
1	MD5 (rubrica-1.0.1.tar.bz2) = 72c5d78e7f69465bb481ad09fa9093f0	1	MD5 (rubrica-1.0.5.tar.bz2) = 3ca96ecef897abe4db3ec0cf8a78039b




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




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




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




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

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

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

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

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

share/gnome/rubrica/stylesheet/rub2rub.xsl
share/gnome/rubrica/stylesheet/rub2txt.xsl
share/gnome/rubrica/stylesheet/rub2vcard.xsl
share/locale/bg/LC_MESSAGES/rubrica.mo
share/locale/br/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
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 %%DOCSDIR%%

Return to bug 58446

Lines 6-37 Link Here

(-)deskutils/rubrica/Makefile (-12 / +17 lines)
6	#	6	#
7		7
8	PORTNAME= rubrica	8	PORTNAME= rubrica
9	PORTVERSION= 1.0.1	9	PORTVERSION= 1.0.5
10	CATEGORIES= deskutils gnome	10	CATEGORIES= deskutils gnome
11	MASTER_SITES= http://digilander.libero.it/nfragale/download/rubrica/	11	MASTER_SITES= http://digilander.libero.it/nfragale/download/rubrica/
12	DISTNAME= ${PORTNAME}-${PORTVERSION:S/.c1$/cr1/}
13		12
14	MAINTAINER= ports@freebsd.org	13	MAINTAINER= ports@FreeBSD.org
15	COMMENT= An addressbook for the gnome2 desktop	14	COMMENT= An addressbook for the gnome2 desktop
16		15
17	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.c1$/cr1/}
18	USE_BZIP2= yes	16	USE_BZIP2= yes
19	USE_GNOME= gnomehack gnomeprefix libgnomeui
20	USE_X_PREFIX= yes	17	USE_X_PREFIX= yes
		18	USE_GNOME= gnomehack gnomeprefix gnometarget libgnomeui
21	USE_GMAKE= yes	19	USE_GMAKE= yes
22	GNU_CONFIGURE= yes	20	GNU_CONFIGURE= yes
23	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \	21	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
24	LIBS="-L${LOCALBASE}/lib"	22	LDFLAGS="-L${LOCALBASE}/lib"
25		23
26	DOC_FILES= AUTHORS COPYING CREDITS ChangeLog INSTALL NEWS README TODO	24
		25	post-patch:
		26	@${FIND} ${WRKSRC} -name "Makefile.in" \| ${XARGS} ${REINPLACE_CMD} -e \
		27	's\|^CFLAGS.*$$\|CFLAGS = @CFLAGS@\|g ; \
		28	s\|^rubricadocdir.*$$\|rubricadocdir =\|g ; \
		29	s\|$$(rubricadoc_DATA)\|\|g'
27		30
28	post-install:	31	post-install:
29	.ifndef(NOPORTDOCS)	32	.if !defined(NOPORTDOCS)
30	@${MKDIR} ${DOCSDIR}	33	@${MKDIR} ${DOCSDIR}
31	.for file in ${DOC_FILES}	34	.for file in AUTHORS ChangeLog INSTALL NEWS README TODO
32	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}	35	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
		36	.endfor
		37	.for file in CREDITS examples.rub
		38	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
33	.endfor	39	.endfor
34	@${INSTALL_DATA} ${WRKSRC}/doc/examples.rub ${DOCSDIR}
35	.endif	40	.endif
36		41
37	.include <bsd.port.mk>	42	.include <bsd.port.mk>

Lines 1-30 Link Here

(-)deskutils/rubrica/files/patch-Makefile.in (-30 lines)
1	--- Makefile.in.orig Sat Mar 1 01:46:41 2003
2	+++ Makefile.in Sat Mar 1 01:50:40 2003
3	@@ -119,16 +119,8 @@
4	kdedesktop_in_files = rubrica.desktop.in
5	kdedesktop_DATA = $(kdedesktop_in_files:.desktop.in=.desktop)
6
7	-rubricadocdir = $(datadir)/doc/rubrica
8	-rubricadoc_DATA = \
9	- README \
10	- COPYING \
11	- AUTHORS \
12	- CREDITS \
13	- ChangeLog \
14	- INSTALL \
15	- NEWS \
16	- TODO
17	+rubricadocdir = $(prefix)/share/doc/rubrica
18	+rubricadoc_DATA =
19
20
21	schemas_dir = $(sysconfdir)/gconf/schemas
22	@@ -146,7 +138,7 @@
23	CONFIG_HEADER = config.h
24	CONFIG_CLEAN_FILES = rubrica.desktop rubrica.spec
25	DIST_SOURCES =
26	-DATA = $(desktop_DATA) $(kdedesktop_DATA) $(rubricadoc_DATA) \
27	+DATA = $(desktop_DATA) $(kdedesktop_DATA) \
28	$(schemas__DATA)
29
30

Lines 1-24 Link Here

(-)deskutils/rubrica/files/patch-doc_Makefile.in (-24 lines)
1	--- doc/Makefile.in.orig Sat Mar 1 01:54:32 2003
2	+++ doc/Makefile.in Sat Mar 1 01:57:37 2003
3	@@ -109,10 +109,9 @@
4	am__quote = @am__quote@
5	install_sh = @install_sh@
6
7	-rubricadocdir = $(datadir)/doc/rubrica
8	+rubricadocdir = $(prefix)/share/doc/rubrica
9
10	-rubricadoc_DATA = \
11	- examples.rub
12	+rubricadoc_DATA =
13
14
15	EXTRA_DIST = $(rubricadoc_DATA)
16	@@ -121,7 +120,7 @@
17	CONFIG_HEADER = $(top_builddir)/config.h
18	CONFIG_CLEAN_FILES =
19	DIST_SOURCES =
20	-DATA = $(rubricadoc_DATA)
21	+DATA =
22
23	DIST_COMMON = Makefile.am Makefile.in
24	all: all-am

Line 0 Link Here

(-)deskutils/rubrica/files/patch-src::vcard.c (+22 lines)
	1	--- src/vcard.c.orig Fri Jun 6 23:57:31 2003
	2	+++ src/vcard.c Fri Oct 24 00:59:04 2003
	3	@@ -128,9 +128,6 @@
	4	RubricaVCardParamType param;
	5	RubricaVCardValueType value;
	6
	7	- parray[ARRAY_SIZE] = BAD_PARAM;
	8	- varray[ARRAY_SIZE] = BAD_VALUE;
	9	-
	10	gchar buffer_token[32], buffer_param[32], buffer_val[32];
	11	gchar data[1024];
	12	// gchar *binary_data;
	13	@@ -139,6 +136,9 @@
	14	gint ch;
	15	gint i = 0, j = 0, k = 0, l = 0, p = 0;
	16	gboolean new_card = TRUE;
	17	+
	18	+ parray[ARRAY_SIZE] = BAD_PARAM;
	19	+ varray[ARRAY_SIZE] = BAD_VALUE;
	20
	21	state = BUILD_TOKEN_STATE;
	22

Lines 1-15 Link Here

(-)deskutils/rubrica/pkg-plist (-13 / +17 lines)
1	bin/rubrica	1	bin/rubrica
2	etc/gconf/schemas/rubrica.schemas	2	etc/gconf/schemas/rubrica.schemas
		3	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
		4	%%PORTDOCS%%%%DOCSDIR%%/CREDITS
		5	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
		6	%%PORTDOCS%%%%DOCSDIR%%/INSTALL
		7	%%PORTDOCS%%%%DOCSDIR%%/NEWS
		8	%%PORTDOCS%%%%DOCSDIR%%/README
		9	%%PORTDOCS%%%%DOCSDIR%%/TODO
		10	%%PORTDOCS%%%%DOCSDIR%%/examples.rub
3	share/gnome/applications/rubrica.desktop	11	share/gnome/applications/rubrica.desktop
4	%%PORTDOCS%%share/doc/rubrica/AUTHORS
5	%%PORTDOCS%%share/doc/rubrica/COPYING
6	%%PORTDOCS%%share/doc/rubrica/CREDITS
7	%%PORTDOCS%%share/doc/rubrica/ChangeLog
8	%%PORTDOCS%%share/doc/rubrica/INSTALL
9	%%PORTDOCS%%share/doc/rubrica/NEWS
10	%%PORTDOCS%%share/doc/rubrica/README
11	%%PORTDOCS%%share/doc/rubrica/TODO
12	%%PORTDOCS%%share/doc/rubrica/examples.rub
13	share/gnome/pixmaps/rubrica/about.png	12	share/gnome/pixmaps/rubrica/about.png
14	share/gnome/pixmaps/rubrica/accounts.png	13	share/gnome/pixmaps/rubrica/accounts.png
15	share/gnome/pixmaps/rubrica/add-menu.png	14	share/gnome/pixmaps/rubrica/add-menu.png
Lines 37-42 Link Here
37	share/gnome/pixmaps/rubrica/export.png	36	share/gnome/pixmaps/rubrica/export.png
38	share/gnome/pixmaps/rubrica/favorites.png	37	share/gnome/pixmaps/rubrica/favorites.png
39	share/gnome/pixmaps/rubrica/fax.png	38	share/gnome/pixmaps/rubrica/fax.png
		39	share/gnome/pixmaps/rubrica/few.png
40	share/gnome/pixmaps/rubrica/file-info.png	40	share/gnome/pixmaps/rubrica/file-info.png
41	share/gnome/pixmaps/rubrica/file.png	41	share/gnome/pixmaps/rubrica/file.png
42	share/gnome/pixmaps/rubrica/filesett.png	42	share/gnome/pixmaps/rubrica/filesett.png
Lines 49-54 Link Here
49	share/gnome/pixmaps/rubrica/genius.png	49	share/gnome/pixmaps/rubrica/genius.png
50	share/gnome/pixmaps/rubrica/heart.png	50	share/gnome/pixmaps/rubrica/heart.png
51	share/gnome/pixmaps/rubrica/help.png	51	share/gnome/pixmaps/rubrica/help.png
		52	share/gnome/pixmaps/rubrica/hi.png
52	share/gnome/pixmaps/rubrica/hobby.png	53	share/gnome/pixmaps/rubrica/hobby.png
53	share/gnome/pixmaps/rubrica/holiday-cards.png	54	share/gnome/pixmaps/rubrica/holiday-cards.png
54	share/gnome/pixmaps/rubrica/holiday.png	55	share/gnome/pixmaps/rubrica/holiday.png
Lines 68-73 Link Here
68	share/gnome/pixmaps/rubrica/mod.png	69	share/gnome/pixmaps/rubrica/mod.png
69	share/gnome/pixmaps/rubrica/money.png	70	share/gnome/pixmaps/rubrica/money.png
70	share/gnome/pixmaps/rubrica/multimedia.png	71	share/gnome/pixmaps/rubrica/multimedia.png
		72	share/gnome/pixmaps/rubrica/none.png
		73	share/gnome/pixmaps/rubrica/normal.png
71	share/gnome/pixmaps/rubrica/notes.png	74	share/gnome/pixmaps/rubrica/notes.png
72	share/gnome/pixmaps/rubrica/other.png	75	share/gnome/pixmaps/rubrica/other.png
73	share/gnome/pixmaps/rubrica/penguin.png	76	share/gnome/pixmaps/rubrica/penguin.png
Lines 95-100 Link Here
95	share/gnome/pixmaps/rubrica/time.png	98	share/gnome/pixmaps/rubrica/time.png
96	share/gnome/pixmaps/rubrica/translation-info.png	99	share/gnome/pixmaps/rubrica/translation-info.png
97	share/gnome/pixmaps/rubrica/translation.png	100	share/gnome/pixmaps/rubrica/translation.png
		101	share/gnome/pixmaps/rubrica/very-hi.png
98	share/gnome/pixmaps/rubrica/view-column.png	102	share/gnome/pixmaps/rubrica/view-column.png
99	share/gnome/pixmaps/rubrica/view-info.png	103	share/gnome/pixmaps/rubrica/view-info.png
100	share/gnome/pixmaps/rubrica/view.png	104	share/gnome/pixmaps/rubrica/view.png
Lines 109-126 Link Here
109	share/gnome/rubrica/stylesheet/rub2rub.xsl	113	share/gnome/rubrica/stylesheet/rub2rub.xsl
110	share/gnome/rubrica/stylesheet/rub2txt.xsl	114	share/gnome/rubrica/stylesheet/rub2txt.xsl
111	share/gnome/rubrica/stylesheet/rub2vcard.xsl	115	share/gnome/rubrica/stylesheet/rub2vcard.xsl
112	share/gnome/services/rubrica.desktop	116	share/locale/bg/LC_MESSAGES/rubrica.mo
113	share/locale/br/LC_MESSAGES/rubrica.mo
114	share/locale/de/LC_MESSAGES/rubrica.mo	117	share/locale/de/LC_MESSAGES/rubrica.mo
115	share/locale/es/LC_MESSAGES/rubrica.mo	118	share/locale/es/LC_MESSAGES/rubrica.mo
116	share/locale/fr/LC_MESSAGES/rubrica.mo	119	share/locale/fr/LC_MESSAGES/rubrica.mo
117	share/locale/it/LC_MESSAGES/rubrica.mo	120	share/locale/it/LC_MESSAGES/rubrica.mo
118	share/locale/ja/LC_MESSAGES/rubrica.mo	121	share/locale/ja/LC_MESSAGES/rubrica.mo
		122	share/locale/pt_BR/LC_MESSAGES/rubrica.mo
119	share/locale/ru/LC_MESSAGES/rubrica.mo	123	share/locale/ru/LC_MESSAGES/rubrica.mo
120	@dirrm share/gnome/services	124	share/locale/sk/LC_MESSAGES/rubrica.mo
121	@dirrm share/gnome/rubrica/stylesheet	125	@dirrm share/gnome/rubrica/stylesheet
122	@dirrm share/gnome/rubrica/script	126	@dirrm share/gnome/rubrica/script
123	@dirrm share/gnome/rubrica/nautilus-script	127	@dirrm share/gnome/rubrica/nautilus-script
124	@dirrm share/gnome/rubrica	128	@dirrm share/gnome/rubrica
125	@dirrm share/gnome/pixmaps/rubrica	129	@dirrm share/gnome/pixmaps/rubrica
126	%%PORTDOCS%%@dirrm share/doc/rubrica	130	%%PORTDOCS%%@dirrm %%DOCSDIR%%