- Update to version 1.3.4

- Add SHA256
- Remove dirs from pkg-plist which are already covered by misc/kdehier

6 files changed, 186 insertions, 15 deletions

diff --git a/graphics/potracegui/Makefile b/graphics/potracegui/Makefile
index aca62b67bf33..d9be30e2c357 100644
--- a/graphics/potracegui/Makefile
+++ b/graphics/potracegui/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	potracegui
-PORTVERSION=	1.3
-PORTREVISION=	3
+PORTVERSION=	1.3.4
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -37,6 +36,8 @@ RUN_DEPENDS+=	autotrace:${PORTSDIR}/graphics/autotrace
 .endif
 
 post-patch:
+	@${TOUCH} ${WRKSRC}/aclocal.m4 ${WRKSRC}/config.h.in
+	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${TOUCH}
 	@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
 
 .include <bsd.port.post.mk>
diff --git a/graphics/potracegui/distinfo b/graphics/potracegui/distinfo
index 068864b7290a..acf5a677745f 100644
--- a/graphics/potracegui/distinfo
+++ b/graphics/potracegui/distinfo
@@ -1,2 +1,3 @@
-MD5 (potracegui-1.3.tar.bz2) = cf5e47cb34f31c931aba331c88cf9fb4
-SIZE (potracegui-1.3.tar.bz2) = 602101
+MD5 (potracegui-1.3.4.tar.bz2) = fabd9f98cfb62048556d97d1b5d6402e
+SHA256 (potracegui-1.3.4.tar.bz2) = 69df7ffb9d2d8c21f2363328bfbddc8b9562fe137529548299003f02c2f76928
+SIZE (potracegui-1.3.4.tar.bz2) = 674019
diff --git a/graphics/potracegui/files/patch-pixelview.cpp b/graphics/potracegui/files/patch-pixelview.cpp
new file mode 100644
index 000000000000..98fcb373c44a
--- /dev/null
+++ b/graphics/potracegui/files/patch-pixelview.cpp
@@ -0,0 +1,16 @@
+--- src/pixelview.cpp.orig	Tue Jan 10 02:18:12 2006
++++ src/pixelview.cpp	Tue Jan 10 11:12:14 2006
+@@ -169,11 +169,11 @@
+    internThresholdPercent = m_thresholdPercent;
+    
+    //initialize variables
+-	unsigned int m_threshold = static_cast<unsigned int>(round(255*m_thresholdPercent/100));
++	unsigned int m_threshold = static_cast<unsigned int>(rint(255*m_thresholdPercent/100));
+    
+    //do the necessary recalculations
+    if (  //if new thresholding is nesecarry. This is the case when
+-        ( internThresholdingEnabled != m_thresholdingEnabled ) or //thresholding was enabled or disabled OR
++        ( internThresholdingEnabled != m_thresholdingEnabled ) || //thresholding was enabled or disabled OR
+         ( internThreshold != m_threshold )                        //another threshold is given.
+       )
+    {
diff --git a/graphics/potracegui/files/patch-pixelview.h b/graphics/potracegui/files/patch-pixelview.h
new file mode 100644
index 000000000000..edb13d7c6ae3
--- /dev/null
+++ b/graphics/potracegui/files/patch-pixelview.h
@@ -0,0 +1,11 @@
+--- src/pixelview.h.orig	Tue Jan 10 02:16:14 2006
++++ src/pixelview.h	Tue Jan 10 02:16:41 2006
+@@ -34,7 +34,7 @@
+ /**
+ @author Tim Fechtner
+ */
+-class PixelView : protected QScrollView
++class PixelView : public QScrollView
+ {
+ Q_OBJECT
+ public:
diff --git a/graphics/potracegui/files/patch-po-Makefile.in b/graphics/potracegui/files/patch-po-Makefile.in
new file mode 100644
index 000000000000..652825c98be4
--- /dev/null
+++ b/graphics/potracegui/files/patch-po-Makefile.in
@@ -0,0 +1,153 @@
+--- po/Makefile.in.orig	Tue Jan 10 01:24:24 2006
++++ po/Makefile.in	Tue Jan 10 01:24:51 2006
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.1.1.1 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  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.
+@@ -51,7 +51,9 @@
+ DIST_SOURCES =
+ #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ #>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++#>+ 1
++DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -207,6 +209,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -271,10 +275,13 @@
+ xdg_appsdir = @xdg_appsdir@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+-POFILES = AUTO
++#>- POFILES = AUTO
++#>+ 2
++POFILES = de.po
++GMOFILES = de.gmo
+ #>- all: all-am
+ #>+ 1
+-all: docs-am  all-am
++all: all-nls docs-am  all-am
+ 
+ .SUFFIXES:
+ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+@@ -336,7 +343,9 @@
+ CTAGS:
+ 
+ 
+-distdir: $(DISTFILES)
++#>- distdir: $(DISTFILES)
++#>+ 1
++distdir: distdir-nls  $(DISTFILES)
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -370,7 +379,9 @@
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+-uninstall: uninstall-am
++#>- uninstall: uninstall-am
++#>+ 1
++uninstall: uninstall-nls  uninstall-am
+ 
+ install-am: all-am
+ 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+@@ -386,7 +397,7 @@
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -413,7 +424,9 @@
+ 
+ info-am:
+ 
+-install-data-am:
++#>- install-data-am:
++#>+ 1
++install-data-am: install-nls 
+ 
+ install-exec-am:
+ 
+@@ -423,7 +436,9 @@
+ 
+ installcheck-am:
+ 
+-maintainer-clean: maintainer-clean-am
++#>- maintainer-clean: maintainer-clean-am
++#>+ 1
++maintainer-clean: clean-nls  maintainer-clean-am
+ 	-rm -f Makefile
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+ 
+@@ -456,7 +471,48 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=Makefile.in Makefile.am 
++KDE_DIST=Makefile.in potracegui.pot de.po Makefile.am 
++
++#>+ 4
++de.gmo: de.po
++	rm -f de.gmo; $(GMSGFMT) -o de.gmo $(srcdir)/de.po
++	test ! -f de.gmo || touch de.gmo
++
++#>+ 3
++clean-nls:
++	-rm -f  de.gmo
++
++#>+ 10
++install-nls:
++	@for base in de ; do \
++	  echo $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$$base/LC_MESSAGES/$(PACKAGE).mo ;\
++	  $(mkinstalldirs) $(DESTDIR)$(kde_locale)/$$base/LC_MESSAGES ; \
++	  if test -f $$base.gmo; then $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$$base/LC_MESSAGES/$(PACKAGE).mo ;\
++	  elif test -f $(srcdir)/$$base.gmo; then $(INSTALL_DATA) $(srcdir)/$$base.gmo $(DESTDIR)$(kde_locale)/$$base/LC_MESSAGES/$(PACKAGE).mo ;\
++	  fi ;\
++	done
++
++
++#>+ 3
++uninstall-nls:
++	rm -f $(DESTDIR)$(kde_locale)/de/LC_MESSAGES/$(PACKAGE).mo
++
++#>+ 2
++all-nls: $(GMOFILES)
++
++#>+ 8
++distdir-nls:$(GMOFILES)
++	for file in $(POFILES); do \
++	  cp $(srcdir)/$$file $(distdir); \
++	done
++	for file in $(GMOFILES); do \
++	  cp $(srcdir)/$$file $(distdir); \
++	done
++
++#>+ 4
++merge:
++	$(MAKE) -f $(top_srcdir)/admin/Makefile.common package-merge POFILES="${POFILES}" PACKAGE=${PACKAGE}
++
+ 
+ #>+ 2
+ docs-am:
diff --git a/graphics/potracegui/pkg-plist b/graphics/potracegui/pkg-plist
index 926e21fdd780..f8b9599f9a26 100644
--- a/graphics/potracegui/pkg-plist
+++ b/graphics/potracegui/pkg-plist
@@ -7,16 +7,5 @@ share/doc/HTML/en/potracegui/index.docbook
 share/icons/hicolor/16x16/apps/potracegui.png
 share/icons/hicolor/32x32/apps/potracegui.png
 share/locale/de/LC_MESSAGES/potracegui.mo
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
 @dirrm share/doc/HTML/en/potracegui
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
 @dirrm share/apps/potracegui
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true