aboutsummaryrefslogtreecommitdiff
path: root/graphics/dia
diff options
context:
space:
mode:
authorAdam Weinberger <adamw@FreeBSD.org>2003-09-25 05:21:03 +0000
committerAdam Weinberger <adamw@FreeBSD.org>2003-09-25 05:21:03 +0000
commit72032131a07ec52dff385189a417808899e84f6e (patch)
tree61b2b33cbe1ab8d8b94c6a80dbf881b9f78da3f6 /graphics/dia
parentefa81cc7545b5622e70020f85d46da35e523494b (diff)
downloadports-72032131a07ec52dff385189a417808899e84f6e.tar.gz
ports-72032131a07ec52dff385189a417808899e84f6e.zip
Notes
Diffstat (limited to 'graphics/dia')
-rw-r--r--graphics/dia/Makefile6
-rw-r--r--graphics/dia/distinfo2
-rw-r--r--graphics/dia/files/patch-plug-ins_python_pydia-geometry.c11
-rw-r--r--graphics/dia/files/patch-plug-ins_xslt_xslt.c11
-rw-r--r--graphics/dia/files/patch-shapes_Cisco_Makefile.in116
-rw-r--r--graphics/dia/pkg-plist25
6 files changed, 71 insertions, 100 deletions
diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index 9856ce8e4457..d42cddf53295 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -6,12 +6,12 @@
#
PORTNAME= dia
-PORTVERSION= 0.91
-PORTREVISION= 2
+PORTVERSION= 0.92p3
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.91
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.92
DIST_SUBDIR= gnome2
+DISTNAME= ${PORTNAME}-${PORTVERSION:S/p/-pre/}
MAINTAINER?= gnome@FreeBSD.org
COMMENT= Diagram creation program, similar to Visio
diff --git a/graphics/dia/distinfo b/graphics/dia/distinfo
index d78cd8292f00..6fdfcf890062 100644
--- a/graphics/dia/distinfo
+++ b/graphics/dia/distinfo
@@ -1 +1 @@
-MD5 (gnome2/dia-0.91.tar.bz2) = 283517483601e81749db81a849a3bc91
+MD5 (gnome2/dia-0.92-pre3.tar.bz2) = 5e8f8dac712c531d99aef50b992fdc80
diff --git a/graphics/dia/files/patch-plug-ins_python_pydia-geometry.c b/graphics/dia/files/patch-plug-ins_python_pydia-geometry.c
deleted file mode 100644
index be48c3cf7ac9..000000000000
--- a/graphics/dia/files/patch-plug-ins_python_pydia-geometry.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- plug-ins/python/pydia-geometry.c.orig Sat Jul 19 00:22:20 2003
-+++ plug-ins/python/pydia-geometry.c Sat Jul 19 00:22:34 2003
-@@ -211,7 +211,7 @@
- {
- #define I_OR_F(v) \
- (self->is_int ? \
-- PyInt_FromLong(self->r.ri.##v) : PyFloat_FromDouble(self->r.rf.##v))
-+ PyInt_FromLong(self->r.ri./**/v) : PyFloat_FromDouble(self->r.rf./**/v))
-
- if (!strcmp(attr, "__members__"))
- return Py_BuildValue("[ssss]", "top", "left", "right", "bottom" );
diff --git a/graphics/dia/files/patch-plug-ins_xslt_xslt.c b/graphics/dia/files/patch-plug-ins_xslt_xslt.c
deleted file mode 100644
index 5c8b7567ffbf..000000000000
--- a/graphics/dia/files/patch-plug-ins_xslt_xslt.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- plug-ins/xslt/xslt.c.orig Mon Mar 17 15:10:23 2003
-+++ plug-ins/xslt/xslt.c Mon Mar 17 15:10:59 2003
-@@ -291,7 +291,7 @@
- path = g_module_build_path("\Windows", "xslt");
- #else
- /* FIXME: We should have a --with-xslt-prefix and use this */
-- path = g_module_build_path("/usr/lib", "xslt");
-+ path = g_module_build_path("/usr/local/lib", "xslt");
- #endif
- xslt_module = g_module_open(path, 0);
- if(xslt_module == NULL) {
diff --git a/graphics/dia/files/patch-shapes_Cisco_Makefile.in b/graphics/dia/files/patch-shapes_Cisco_Makefile.in
index fc557fd1239a..ab537ec6bf14 100644
--- a/graphics/dia/files/patch-shapes_Cisco_Makefile.in
+++ b/graphics/dia/files/patch-shapes_Cisco_Makefile.in
@@ -1,16 +1,6 @@
---- shapes/Cisco/Makefile.in.orig Mon Mar 17 15:19:18 2003
-+++ shapes/Cisco/Makefile.in Mon Mar 17 15:20:24 2003
-@@ -1,6 +1,7 @@
--# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
-
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-+# Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -10,6 +11,7 @@
+--- shapes/Cisco/Makefile.in.orig Thu Sep 11 23:57:59 2003
++++ shapes/Cisco/Makefile.in Fri Sep 12 00:06:34 2003
+@@ -10,6 +10,7 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
@@ -18,7 +8,7 @@
SHELL = @SHELL@
-@@ -31,13 +33,9 @@
+@@ -31,9 +32,6 @@
mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
@@ -28,11 +18,7 @@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
--
- top_builddir = ../..
-
- ACLOCAL = @ACLOCAL@
-@@ -46,11 +44,11 @@
+@@ -46,9 +44,10 @@
AUTOHEADER = @AUTOHEADER@
INSTALL = @INSTALL@
@@ -40,29 +26,27 @@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_HEADER = $(INSTALL_DATA)
++INSTALL_HEADER = ${INSTALL_DATA}
transform = @program_transform_name@
--
+
NORMAL_INSTALL = :
- PRE_INSTALL = :
- POST_INSTALL = :
-@@ -69,7 +67,6 @@
- DEBUG_FLAGS = @DEBUG_FLAGS@
+@@ -73,7 +72,6 @@
DLLTOOL = @DLLTOOL@
ECHO = @ECHO@
+ EGREP = @EGREP@
-EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
FREETYPE_LIBS = @FREETYPE_LIBS@
- FT2_CFLAGS = @FT2_CFLAGS@
- FT2_CONFIG = @FT2_CONFIG@
-@@ -108,7 +105,6 @@
- LIBTOOL = @LIBTOOL@
+@@ -120,7 +118,6 @@
LN_S = @LN_S@
+ LTLIB = @LTLIB@
MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
MKINSTALLDIRS = @MKINSTALLDIRS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
-@@ -142,110 +138,11 @@
+@@ -157,110 +154,11 @@
pkgpythondir = @pkgpythondir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
@@ -70,9 +54,8 @@
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES =
-DIST_COMMON = Makefile.am Makefile.in
-
-+shapedir = $(pkgdatadir)/shapes
-
+-
+-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
@@ -85,13 +68,14 @@
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
--
+
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
--
++shapedir = ${pkgdatadir}/shapes
+
-subdir = shapes/Cisco
-
-distdir: $(DISTFILES)
@@ -176,13 +160,11 @@
1000.shape\
1000.png\
100baset_hub.shape\
-@@ -689,9 +586,155 @@
+@@ -704,10 +602,155 @@
www_server.shape\
www_server.png
- EXTRA_DIST = $(SHAPES)
-
-- cisco_DATA = $(SHAPES)
+EXTRA_DIST = $(SHAPES)
+
+cisco_DATA = $(SHAPES)
@@ -208,28 +190,28 @@
+ -rm -f libtool
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu shapes/Cisco/Makefile
++ $(AUTOMAKE) --gnu shapes/Cisco/Makefile
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) && \
-+ CONFIG_HEADERS= CONFIG_LINKS= \
-+ CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
++ CONFIG_HEADERS= CONFIG_LINKS= \
++ CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
+uninstall-info-am:
+install-ciscoDATA: $(cisco_DATA)
+ @$(NORMAL_INSTALL)
+ $(mkinstalldirs) $(DESTDIR)$(ciscodir)
+ @list='$(cisco_DATA)'; for p in $$list; do \
-+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
-+ echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(ciscodir)/$$f"; \
-+ $(INSTALL_DATA) $$d$$p $(DESTDIR)$(ciscodir)/$$f; \
++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(ciscodir)/$$f"; \
++ $(INSTALL_DATA) $$d$$p $(DESTDIR)$(ciscodir)/$$f; \
+ done
+
+uninstall-ciscoDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(cisco_DATA)'; for p in $$list; do \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
-+ echo " rm -f $(DESTDIR)$(ciscodir)/$$f"; \
-+ rm -f $(DESTDIR)$(ciscodir)/$$f; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " rm -f $(DESTDIR)$(ciscodir)/$$f"; \
++ rm -f $(DESTDIR)$(ciscodir)/$$f; \
+ done
+tags: TAGS
+TAGS:
@@ -242,19 +224,19 @@
+
+distdir: $(DISTFILES)
+ @for file in $(DISTFILES); do \
-+ if test -f $$file; then d=.; else d=$(srcdir); fi; \
-+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+ $(mkinstalldirs) "$(distdir)/$$dir"; \
-+ fi; \
-+ if test -d $$d/$$file; then \
-+ cp -pR $$d/$$file $(distdir) \
-+ || exit 1; \
-+ else \
-+ test -f $(distdir)/$$file \
-+ || cp -p $$d/$$file $(distdir)/$$file \
-+ || exit 1; \
-+ fi; \
++ if test -f $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ $(mkinstalldirs) "$(distdir)/$$dir"; \
++ fi; \
++ if test -d $$d/$$file; then \
++ cp -pR $$d/$$file $(distdir) \
++ || exit 1; \
++ else \
++ test -f $(distdir)/$$file \
++ || cp -p $$d/$$file $(distdir)/$$file \
++ || exit 1; \
++ fi; \
+ done
+check-am: all-am
+check: check-am
@@ -274,8 +256,8 @@
+installcheck: installcheck-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+ `test -z '$(STRIP)' || \
-+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ `test -z '$(STRIP)' || \
++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
@@ -319,9 +301,10 @@
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-+
+
+- cisco_DATA = $(SHAPES)
+uninstall-am: uninstall-ciscoDATA uninstall-info-am
-+
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am info info-am install install-am install-ciscoDATA \
@@ -331,6 +314,7 @@
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool uninstall uninstall-am uninstall-ciscoDATA \
+ uninstall-info-am
-
++
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/graphics/dia/pkg-plist b/graphics/dia/pkg-plist
index 3db66d8a3423..9787066e7a41 100644
--- a/graphics/dia/pkg-plist
+++ b/graphics/dia/pkg-plist
@@ -24,13 +24,8 @@ lib/dia/libuml_objects.so
lib/dia/libwpg_filter.so
lib/dia/libxfig_filter.so
lib/dia/libxslt_filter.so
-share/gnome/apps/Applications/dia.desktop
+share/gnome/applications/dia.desktop
share/gnome/dia/dia_logo.png
-share/gnome/dia/plugins/xslt/dia-uml.xsl
-share/gnome/dia/plugins/xslt/dia-uml2c++.xsl
-share/gnome/dia/plugins/xslt/dia-uml2idl.xsl
-share/gnome/dia/plugins/xslt/dia-uml2java.xsl
-share/gnome/dia/plugins/xslt/stylesheets.xml
%%PYTHON:%%share/gnome/dia/python-startup.py
%%PYTHON:%%share/gnome/dia/python/diasvg.py
%%PYTHON:%%share/gnome/dia/python/group_props.py
@@ -1005,6 +1000,9 @@ share/gnome/dia/sheets/SADT.sheet
share/gnome/dia/sheets/SDL.sheet
share/gnome/dia/sheets/UML.sheet
share/gnome/dia/sheets/UML/aggregation.xpm
+share/gnome/dia/sheets/UML/eventsink.xpm
+share/gnome/dia/sheets/UML/eventsource.xpm
+share/gnome/dia/sheets/UML/receptacle.xpm
share/gnome/dia/sheets/UML/umlclass_template.xpm
share/gnome/dia/sheets/chronogram.sheet
share/gnome/dia/sheets/ciscocomputer.sheet
@@ -1016,6 +1014,12 @@ share/gnome/dia/sheets/civil.sheet
share/gnome/dia/sheets/jigsaw.sheet
share/gnome/dia/sheets/network.sheet
share/gnome/dia/sheets/sybase.sheet
+share/gnome/dia/xslt/dia-uml.xsl
+share/gnome/dia/xslt/dia-uml2c++.xsl
+share/gnome/dia/xslt/dia-uml2componentlist.xsl
+share/gnome/dia/xslt/dia-uml2idl.xsl
+share/gnome/dia/xslt/dia-uml2java.xsl
+share/gnome/dia/xslt/stylesheets.xml
%%GNOME:%%share/gnome/help/dia/C
%%GNOME:%%share/gnome/help/dia/en/topic.dat
%%GNOME:%%share/gnome/help/dia/pl/topic.dat
@@ -1028,6 +1032,7 @@ share/gnome/pixmaps/dia-diagram.png
share/gnome/pixmaps/dia_gnome_icon.png
share/locale/am/LC_MESSAGES/dia.mo
share/locale/az/LC_MESSAGES/dia.mo
+share/locale/be/LC_MESSAGES/dia.mo
share/locale/ca/LC_MESSAGES/dia.mo
share/locale/cs/LC_MESSAGES/dia.mo
share/locale/da/LC_MESSAGES/dia.mo
@@ -1042,6 +1047,9 @@ share/locale/hu/LC_MESSAGES/dia.mo
share/locale/it/LC_MESSAGES/dia.mo
share/locale/ja/LC_MESSAGES/dia.mo
share/locale/ko/LC_MESSAGES/dia.mo
+share/locale/mk/LC_MESSAGES/dia.mo
+share/locale/ml/LC_MESSAGES/dia.mo
+share/locale/ms/LC_MESSAGES/dia.mo
share/locale/nl/LC_MESSAGES/dia.mo
share/locale/nn/LC_MESSAGES/dia.mo
share/locale/no/LC_MESSAGES/dia.mo
@@ -1052,6 +1060,8 @@ share/locale/ro/LC_MESSAGES/dia.mo
share/locale/ru/LC_MESSAGES/dia.mo
share/locale/sk/LC_MESSAGES/dia.mo
share/locale/sl/LC_MESSAGES/dia.mo
+share/locale/sr/LC_MESSAGES/dia.mo
+share/locale/sr@Latn/LC_MESSAGES/dia.mo
share/locale/sv/LC_MESSAGES/dia.mo
share/locale/tr/LC_MESSAGES/dia.mo
share/locale/uk/LC_MESSAGES/dia.mo
@@ -1064,6 +1074,7 @@ share/locale/zh_TW/LC_MESSAGES/dia.mo
%%NOGNOME:%%@dirrm share/gnome/dia/help/pl
%%NOGNOME:%%@dirrm share/gnome/dia/help/en
%%NOGNOME:%%@dirrm share/gnome/dia/help
+@dirrm share/gnome/dia/xslt
@dirrm share/gnome/dia/sheets/UML
@dirrm share/gnome/dia/sheets/GRAFCET
@dirrm share/gnome/dia/sheets/ER
@@ -1085,7 +1096,5 @@ share/locale/zh_TW/LC_MESSAGES/dia.mo
@dirrm share/gnome/dia/shapes/Assorted
@dirrm share/gnome/dia/shapes
%%PYTHON:%%@dirrm share/gnome/dia/python
-@dirrm share/gnome/dia/plugins/xslt
-@dirrm share/gnome/dia/plugins
@dirrm share/gnome/dia
@dirrm lib/dia