From owner-freebsd-ports Tue Dec 21 13:20:22 1999 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 774D0154AA for ; Tue, 21 Dec 1999 13:20:02 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id NAA57653; Tue, 21 Dec 1999 13:20:02 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from tricord.system.pl (tricord.system.pl [195.205.185.10]) by hub.freebsd.org (Postfix) with ESMTP id 7CAD5154AA for ; Tue, 21 Dec 1999 13:11:26 -0800 (PST) (envelope-from saper@saperski.system.pl) Received: from saperski.system.pl (saperski.system.pl [195.205.185.24]) by tricord.system.pl (SYSTEM Internet) with ESMTP id WAA13860; Tue, 21 Dec 1999 22:11:09 +0100 (MET) Received: (from saper@localhost) by saperski.system.pl (8.9.3/8.9.3) id WAA31481; Tue, 21 Dec 1999 22:12:02 +0100 (CET) (envelope-from saper) Message-Id: <199912212112.WAA31481@saperski.system.pl> Date: Tue, 21 Dec 1999 22:12:02 +0100 (CET) From: saper@system.pl Reply-To: saper@system.pl To: FreeBSD-gnats-submit@freebsd.org Cc: saper@system.pl X-Send-Pr-Version: 3.2 Subject: ports/15613: Update dia port to 0.82 [PATCH] Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 15613 >Category: ports >Synopsis: Update dia port to 0.82 >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Dec 21 13:20:01 PST 1999 >Closed-Date: >Last-Modified: >Originator: Marcin Cieślak >Release: FreeBSD 3.4-RC i386 >Organization: SYSTEM Internet Provider >Environment: FreeBSD saperski.system.pl 3.4-RC FreeBSD 3.4-RC #5: Thu Dec 16 19:52:18 CET 1999 root@saperski.system.pl:/usr/src/sys/compile/SAPERSKI i386 Current ports tree >Description: New version of dia released, maintainer of original source changed, distfile moved to GNOME master sites. >How-To-Repeat: >Fix: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/graphics/dia/Makefile,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 Makefile --- Makefile 1999/11/25 14:52:50 1.1.1.1 +++ Makefile 1999/12/21 18:23:58 @@ -1,14 +1,15 @@ # New ports collection makefile for: dia -# Version required: 0.81 -# Date created: 2 November 1999 +# Version required: 0.82 +# Date created: 21 December 1999 # Whom: saper@system.pl # # $FreeBSD: ports/graphics/dia/Makefile,v 1.1.1.1 1999/11/25 14:52:50 nakai Exp $ # -DISTNAME= dia-0.81 +DISTNAME= dia-0.82 CATEGORIES= graphics -MASTER_SITES= http://www.lysator.liu.se/~alla/dia/files/ +MASTER_SITES= ${MASTER_GNOME_SITES} +MASTER_SITES_SUBDIR= stable/sources/dia MAINTAINER= saper@system.pl Index: files/md5 =================================================================== RCS file: /home/ncvs/ports/graphics/dia/files/md5,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 md5 --- md5 1999/11/25 14:52:50 1.1.1.1 +++ md5 1999/12/21 18:24:12 @@ -1 +1 @@ -MD5 (dia-0.81.tar.gz) = 181d294cbe3a578476f40fd15498568d +MD5 (dia-0.82.tar.gz) = d14e32554f62041fe5a24b13695e8573 Index: patches/patch-aa =================================================================== RCS file: /home/ncvs/ports/graphics/dia/patches/patch-aa,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 patch-aa --- patch-aa 1999/11/25 14:52:50 1.1.1.1 +++ patch-aa 1999/12/21 20:13:00 @@ -1,11 +1,24 @@ ---- Makefile.am.orig Tue Nov 2 12:37:47 1999 -+++ Makefile.am Tue Nov 2 12:38:02 1999 -@@ -5,7 +5,7 @@ +--- Makefile.am.orig Tue Dec 21 21:11:05 1999 ++++ Makefile.am Tue Dec 21 21:12:45 1999 +@@ -5,17 +5,18 @@ pkgdata_DATA = dia_logo.png man_MANS = dia.1 -pixmapdir = $(datadir)/pixmaps -+pixmapdir = $(datadir)/gnome/pixmaps - pixmap_DATA = dia_gnome_icon.png ++gnomedatadir = $(datadir)/gnome ++pixmapdir = $(gnomedatadir)/pixmaps + pixmap_DATA = dia_gnome_icon.png dia-diagram.png - Applicationsdir = $(datadir)/gnome/apps/Applications +-Applicationsdir = $(datadir)/gnome/apps/Applications ++Applicationsdir = $(gnomedatadir)/apps/Applications + Applications_DATA = dia.desktop + + dia.keys: $(srcdir)/dia.keys.in Makefile + sed -e 's^\@icondir\@^$(pixmapdir)^g' $(srcdir)/dia.keys.in > dia.keys.tmp \ + && mv dia.keys.tmp dia.keys + +-mimedir = $(datadir)/mime-info ++mimedir = $(gnomedatadir)/mime-info + mime_DATA = dia.mime dia.keys + + EXTRA_DIST = dia.xpm dia_gnome_icon.png dia_gnome_menu_icon.png \ Index: patches/patch-ab =================================================================== RCS file: /home/ncvs/ports/graphics/dia/patches/patch-ab,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 patch-ab --- patch-ab 1999/11/25 14:52:50 1.1.1.1 +++ patch-ab 1999/12/21 20:13:15 @@ -1,11 +1,20 @@ ---- Makefile.in.orig Tue Nov 2 13:02:50 1999 -+++ Makefile.in Tue Nov 2 13:03:25 1999 -@@ -115,7 +115,7 @@ +--- Makefile.in.orig Tue Dec 21 21:11:10 1999 ++++ Makefile.in Tue Dec 21 21:12:32 1999 +@@ -114,13 +114,14 @@ pkgdata_DATA = dia_logo.png man_MANS = dia.1 -pixmapdir = $(datadir)/pixmaps -+pixmapdir = $(datadir)/gnome/pixmaps - pixmap_DATA = dia_gnome_icon.png ++gnomedatadir = $(datadir)/gnome ++pixmapdir = $(gnomedatadir)/pixmaps + pixmap_DATA = dia_gnome_icon.png dia-diagram.png - Applicationsdir = $(datadir)/gnome/apps/Applications +-Applicationsdir = $(datadir)/gnome/apps/Applications ++Applicationsdir = $(gnomedatadir)/apps/Applications + Applications_DATA = dia.desktop + +-mimedir = $(datadir)/mime-info ++mimedir = $(gnomedatadir)/mime-info + mime_DATA = dia.mime dia.keys + + EXTRA_DIST = dia.xpm dia_gnome_icon.png dia_gnome_menu_icon.png dia.desktop dia.spec KNOWN_BUGS $(pkgdata_DATA) $(man_MANS) dia-diagram.png dia.mime dia.keys.in diagram.dtd Index: patches/patch-ac =================================================================== RCS file: patch-ac diff -N patch-ac --- /dev/null Tue Dec 21 21:56:57 1999 +++ patch-ac Tue Dec 21 19:37:37 1999 @@ -0,0 +1,101 @@ +--- lib/dia_xml.c Mon Nov 22 01:32:02 1999 ++++ /tmp/dia_xml.c Tue Dec 21 19:35:02 1999 +@@ -31,7 +31,7 @@ + const char *attrname) + { + AttributeNode attr; +- const char *name; ++ char *name; + + attr = obj_node->childs; + while (attr != NULL) { +@@ -53,7 +53,7 @@ + const char *attrname) + { + AttributeNode attr; +- const char *name; ++ char *name; + + attr = composite_node->childs; + while (attr != NULL) { +@@ -132,7 +132,7 @@ + int + data_int(DataNode data) + { +- const char *val; ++ char *val; + int res; + + if (data_type(data)!=DATATYPE_INT) { +@@ -149,7 +149,7 @@ + + int data_enum(DataNode data) + { +- const char *val; ++ char *val; + int res; + + if (data_type(data)!=DATATYPE_ENUM) { +@@ -167,7 +167,7 @@ + real + data_real(DataNode data) + { +- const char *val; ++ char *val; + real res; + + if (data_type(data)!=DATATYPE_REAL) { +@@ -185,7 +185,7 @@ + int + data_boolean(DataNode data) + { +- const char *val; ++ char *val; + int res; + + if (data_type(data)!=DATATYPE_BOOLEAN) { +@@ -219,7 +219,7 @@ + void + data_color(DataNode data, Color *col) + { +- const char *val; ++ char *val; + int r,g,b; + + if (data_type(data)!=DATATYPE_COLOR) { +@@ -248,7 +248,7 @@ + void + data_point(DataNode data, Point *point) + { +- const char *val; ++ char *val; + char *str; + + if (data_type(data)!=DATATYPE_POINT) { +@@ -274,7 +274,7 @@ + void + data_rectangle(DataNode data, Rectangle *rect) + { +- const char *val; ++ char *val; + char *str; + + if (data_type(data)!=DATATYPE_RECTANGLE) { +@@ -325,7 +325,7 @@ + char * + data_string(DataNode data) + { +- const char *val; ++ char *val; + char *str, *p; + int len; + +@@ -394,7 +394,7 @@ + Font * + data_font(DataNode data) + { +- const char *name; ++ char *name; + Font *font; + + if (data_type(data)!=DATATYPE_FONT) { Index: pkg/DESCR =================================================================== RCS file: /home/ncvs/ports/graphics/dia/pkg/DESCR,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 DESCR --- DESCR 1999/11/25 14:52:50 1.1.1.1 +++ DESCR 1999/12/21 21:10:48 @@ -6,6 +6,7 @@ (class diagrams) and network diagrams. It can currently load and save diagrams to a custom fileformat and export to postscript. +Current maintainer: James Henstridge WWW: http://www.lysator.liu.se/~alla/dia/ -- Index: pkg/PLIST =================================================================== RCS file: /home/ncvs/ports/graphics/dia/pkg/PLIST,v retrieving revision 1.2 diff -u -r1.2 PLIST --- PLIST 1999/12/10 19:53:35 1.2 +++ PLIST 1999/12/21 20:40:40 @@ -14,32 +14,10 @@ lib/locale/ja/LC_MESSAGES/dia.mo lib/locale/no/LC_MESSAGES/dia.mo lib/locale/pl/LC_MESSAGES/dia.mo +lib/locale/pt/LC_MESSAGES/dia.mo +lib/locale/ru/LC_MESSAGES/dia.mo lib/locale/sv/LC_MESSAGES/dia.mo share/dia/dia_logo.png -share/dia/shape-internal/flowchart/collate.shape -share/dia/shape-internal/flowchart/delay.shape -share/dia/shape-internal/flowchart/display.shape -share/dia/shape-internal/flowchart/document.shape -share/dia/shape-internal/flowchart/extract.shape -share/dia/shape-internal/flowchart/intstorage.shape -share/dia/shape-internal/flowchart/magdisk.shape -share/dia/shape-internal/flowchart/magdrum.shape -share/dia/shape-internal/flowchart/magtape.shape -share/dia/shape-internal/flowchart/manualinput.shape -share/dia/shape-internal/flowchart/manualop.shape -share/dia/shape-internal/flowchart/merge.shape -share/dia/shape-internal/flowchart/offlinestore.shape -share/dia/shape-internal/flowchart/offpageconn.shape -share/dia/shape-internal/flowchart/or.shape -share/dia/shape-internal/flowchart/predefdproc.shape -share/dia/shape-internal/flowchart/preparation.shape -share/dia/shape-internal/flowchart/punchedcard.shape -share/dia/shape-internal/flowchart/punchedtape.shape -share/dia/shape-internal/flowchart/sort.shape -share/dia/shape-internal/flowchart/sumjunction.shape -share/dia/shape-internal/flowchart/terminal.shape -share/dia/shape-internal/flowchart/transaction.shape -share/dia/shape-internal/flowchart/transmittape.shape share/dia/shapes/Circuit/ground.shape share/dia/shapes/Circuit/ground.xpm share/dia/shapes/Circuit/hcapacitor.shape @@ -52,6 +30,8 @@ share/dia/shapes/Circuit/hinductor.xpm share/dia/shapes/Circuit/hinductor_de.shape share/dia/shapes/Circuit/hinductor_de.xpm +share/dia/shapes/Circuit/hled_de.shape +share/dia/shapes/Circuit/hled_de.xpm share/dia/shapes/Circuit/hpowersource_de.shape share/dia/shapes/Circuit/hpowersource_de.xpm share/dia/shapes/Circuit/hresistor.shape @@ -60,7 +40,6 @@ share/dia/shapes/Circuit/hresistor_de.xpm share/dia/shapes/Circuit/hzener.shape share/dia/shapes/Circuit/hzener.xpm -share/dia/shapes/Circuit/index.sheet share/dia/shapes/Circuit/lamp_de.shape share/dia/shapes/Circuit/lamp_de.xpm share/dia/shapes/Circuit/npn.shape @@ -81,6 +60,8 @@ share/dia/shapes/Circuit/vinductor.xpm share/dia/shapes/Circuit/vinductor_de.shape share/dia/shapes/Circuit/vinductor_de.xpm +share/dia/shapes/Circuit/vled_de.shape +share/dia/shapes/Circuit/vled_de.xpm share/dia/shapes/Circuit/vpowersource_de.shape share/dia/shapes/Circuit/vpowersource_de.xpm share/dia/shapes/Circuit/vresistor.shape @@ -89,11 +70,74 @@ share/dia/shapes/Circuit/vresistor_de.xpm share/dia/shapes/Circuit/vzener.shape share/dia/shapes/Circuit/vzener.xpm +share/dia/shapes/Flowchart/collate.shape +share/dia/shapes/Flowchart/collate.xpm +share/dia/shapes/Flowchart/delay.shape +share/dia/shapes/Flowchart/delay.xpm +share/dia/shapes/Flowchart/display.shape +share/dia/shapes/Flowchart/display.xpm +share/dia/shapes/Flowchart/document.shape +share/dia/shapes/Flowchart/document.xpm +share/dia/shapes/Flowchart/extract.shape +share/dia/shapes/Flowchart/extract.xpm +share/dia/shapes/Flowchart/intstorage.shape +share/dia/shapes/Flowchart/intstorage.xpm +share/dia/shapes/Flowchart/magdisk.shape +share/dia/shapes/Flowchart/magdisk.xpm +share/dia/shapes/Flowchart/magdrum.shape +share/dia/shapes/Flowchart/magdrum.xpm +share/dia/shapes/Flowchart/magtape.shape +share/dia/shapes/Flowchart/magtape.xpm +share/dia/shapes/Flowchart/manualinput.shape +share/dia/shapes/Flowchart/manualinput.xpm +share/dia/shapes/Flowchart/manualop.shape +share/dia/shapes/Flowchart/manualop.xpm +share/dia/shapes/Flowchart/merge.shape +share/dia/shapes/Flowchart/merge.xpm +share/dia/shapes/Flowchart/offlinestore.shape +share/dia/shapes/Flowchart/offlinestore.xpm +share/dia/shapes/Flowchart/offpageconn.shape +share/dia/shapes/Flowchart/offpageconn.xpm +share/dia/shapes/Flowchart/or.shape +share/dia/shapes/Flowchart/or.xpm +share/dia/shapes/Flowchart/predefdproc.shape +share/dia/shapes/Flowchart/predefdproc.xpm +share/dia/shapes/Flowchart/preparation.shape +share/dia/shapes/Flowchart/preparation.xpm +share/dia/shapes/Flowchart/punchedcard.shape +share/dia/shapes/Flowchart/punchedcard.xpm +share/dia/shapes/Flowchart/punchedtape.shape +share/dia/shapes/Flowchart/punchedtape.xpm +share/dia/shapes/Flowchart/sort.shape +share/dia/shapes/Flowchart/sort.xpm +share/dia/shapes/Flowchart/sumjunction.shape +share/dia/shapes/Flowchart/sumjunction.xpm +share/dia/shapes/Flowchart/terminal.shape +share/dia/shapes/Flowchart/terminal.xpm +share/dia/shapes/Flowchart/transaction.shape +share/dia/shapes/Flowchart/transaction.xpm +share/dia/shapes/Flowchart/transmittape.shape +share/dia/shapes/Flowchart/transmittape.xpm +share/dia/sheets/Circuit.sheet +share/dia/sheets/ER.sheet +share/dia/sheets/ER/weakentity.xpm +share/dia/sheets/FS.sheet +share/dia/sheets/Flowchart.sheet +share/dia/sheets/UML.sheet +share/dia/sheets/UML/aggregation.xpm +share/dia/sheets/UML/umlclass_template.xpm +share/dia/sheets/network.sheet +share/dia/sheets/sybase.sheet share/gnome/apps/Applications/dia.desktop +share/gnome/mime-info/dia.keys +share/gnome/mime-info/dia.mime +share/gnome/pixmaps/dia-diagram.png share/gnome/pixmaps/dia_gnome_icon.png @dirrm lib/dia -@dirrm share/dia/shape-internal/flowchart -@dirrm share/dia/shape-internal @dirrm share/dia/shapes/Circuit +@dirrm share/dia/shapes/Flowchart @dirrm share/dia/shapes +@dirrm share/dia/sheets/ER +@dirrm share/dia/sheets/UML +@dirrm share/dia/sheets @dirrm share/dia >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message