Update to 0.92pre6.

3 files changed, 2 insertions, 322 deletions

diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index 17c597a77ee1..7f2fd2d73595 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dia
-PORTVERSION=	0.92p5
+PORTVERSION=	0.92p6
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.92
diff --git a/graphics/dia/distinfo b/graphics/dia/distinfo
index 66e857c58511..75a190af949e 100644
--- a/graphics/dia/distinfo
+++ b/graphics/dia/distinfo
@@ -1 +1 @@
-MD5 (gnome2/dia-0.92-pre5.tar.bz2) = 360d5cdda826a260711c4e25266b30be
+MD5 (gnome2/dia-0.92-pre6.tar.bz2) = b7455e5a2326bb6ff91bb1a247a4de98
diff --git a/graphics/dia/files/patch-shapes_Cisco_Makefile.in b/graphics/dia/files/patch-shapes_Cisco_Makefile.in
deleted file mode 100644
index ab537ec6bf14..000000000000
--- a/graphics/dia/files/patch-shapes_Cisco_Makefile.in
+++ /dev/null
@@ -1,320 +0,0 @@
---- 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.
- 
-+@SET_MAKE@
- 
- SHELL = @SHELL@
- 
-@@ -31,9 +32,6 @@
- mandir = @mandir@
- includedir = @includedir@
- oldincludedir = /usr/include
--
--DESTDIR =
--
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-@@ -46,9 +44,10 @@
- AUTOHEADER = @AUTOHEADER@
- 
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_HEADER = ${INSTALL_DATA}
- transform = @program_transform_name@
- 
- NORMAL_INSTALL = :
-@@ -73,7 +72,6 @@
- DLLTOOL = @DLLTOOL@
- ECHO = @ECHO@
- EGREP = @EGREP@
--EXEEXT = @EXEEXT@
- F77 = @F77@
- FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
- FREETYPE_LIBS = @FREETYPE_LIBS@
-@@ -120,7 +118,6 @@
- LN_S = @LN_S@
- LTLIB = @LTLIB@
- MAINT = @MAINT@
--MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-@@ -157,110 +154,11 @@
- pkgpythondir = @pkgpythondir@
- pyexecdir = @pyexecdir@
- pythondir = @pythondir@
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--CONFIG_HEADER = ../../config.h
--CONFIG_CLEAN_FILES = 
--DIST_COMMON =  Makefile.am Makefile.in
--
--
--DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
--
--TAR = tar
--GZIP_ENV = --best
--all: all-redirect
--.SUFFIXES:
--$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps shapes/Cisco/Makefile
--
--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)
--	@for file in $(DISTFILES); do \
--	  d=$(srcdir); \
--	  if test -d $$d/$$file; then \
--	    cp -pr $$d/$$file $(distdir)/$$file; \
--	  else \
--	    test -f $(distdir)/$$file \
--	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
--	    || cp -p $$d/$$file $(distdir)/$$file || :; \
--	  fi; \
--	done
--info-am:
--info: info-am
--dvi-am:
--dvi: dvi-am
--check-am: all-am
--check: check-am
--installcheck-am:
--installcheck: installcheck-am
--install-exec-am:
--install-exec: install-exec-am
--
--install-data-am:
--install-data: install-data-am
--
--install-am: all-am
--	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
--install: install-am
--uninstall-am:
--uninstall: uninstall-am
--all-am: Makefile
--all-redirect: all-am
--install-strip:
--	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
--installdirs:
--
--
--mostlyclean-generic:
--
--clean-generic:
--
--distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
--	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
--
--maintainer-clean-generic:
--mostlyclean-am:  mostlyclean-generic
--
--mostlyclean: mostlyclean-am
--
--clean-am:  clean-generic mostlyclean-am
--
--clean: clean-am
--
--distclean-am:  distclean-generic clean-am
--	-rm -f libtool
--
--distclean: distclean-am
--
--maintainer-clean-am:  maintainer-clean-generic distclean-am
--	@echo "This command is intended for maintainers to use;"
--	@echo "it deletes files that may require special tools to rebuild."
--
--maintainer-clean: maintainer-clean-am
--
--.PHONY: tags distdir info-am info dvi-am dvi check check-am \
--installcheck-am installcheck install-exec-am install-exec \
--install-data-am install-data install-am install uninstall-am uninstall \
--all-redirect all-am all installdirs mostlyclean-generic \
--distclean-generic clean-generic maintainer-clean-generic clean \
--mostlyclean distclean maintainer-clean
--
--
--  shapedir = $(pkgdatadir)/shapes
--
--  ciscodir = $(shapedir)/Cisco
--  SHAPES = \
-+ciscodir = $(shapedir)/Cisco
-+SHAPES = \
-   1000.shape\
-   1000.png\
-   100baset_hub.shape\
-@@ -704,10 +602,155 @@
-   www_server.shape\
-   www_server.png
- 
--  EXTRA_DIST = $(SHAPES)
-+EXTRA_DIST = $(SHAPES)
-+
-+cisco_DATA = $(SHAPES)
-+subdir = shapes/Cisco
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+DIST_SOURCES =
-+DATA = $(cisco_DATA)
-+
-+DIST_COMMON = Makefile.am Makefile.in
-+all: all-am
-+
-+.SUFFIXES:
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-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
-+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-+	cd $(top_builddir) && \
-+	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; \
-+	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; \
-+	done
-+tags: TAGS
-+TAGS:
-+
-+
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+
-+top_distdir = ../..
-+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-+
-+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; \
-+	done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile $(DATA)
-+
-+installdirs:
-+	$(mkinstalldirs) $(DESTDIR)$(ciscodir)
-+
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+uninstall: uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	`test -z '$(STRIP)' || \
-+	echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
-+
-+clean-am: clean-generic clean-libtool mostlyclean-am
-+
-+distclean: distclean-am
-+
-+distclean-am: clean-am distclean-generic distclean-libtool
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+info: info-am
-+
-+info-am:
-+
-+install-data-am: install-ciscoDATA
-+
-+install-exec-am:
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+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 \
-+	install-data install-data-am install-exec install-exec-am \
-+	install-info install-info-am install-man install-strip \
-+	installcheck installcheck-am installdirs maintainer-clean \
-+	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: