Update 2.5.28 --> 2.5.30

4 files changed, 6 insertions, 27 deletions

diff --git a/x11-wm/fvwm2-devel/Makefile b/x11-wm/fvwm2-devel/Makefile
index 32523efc5355..d081c94929eb 100644
--- a/x11-wm/fvwm2-devel/Makefile
+++ b/x11-wm/fvwm2-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	fvwm
-PORTVERSION=	2.5.28
-PORTREVISION=	2
+PORTVERSION=	2.5.30
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
 		http://www.fvwm.org/generated/icon_download/
diff --git a/x11-wm/fvwm2-devel/distinfo b/x11-wm/fvwm2-devel/distinfo
index f2f154fc5ff9..436e84f69f2b 100644
--- a/x11-wm/fvwm2-devel/distinfo
+++ b/x11-wm/fvwm2-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (fvwm-2.5.28.tar.bz2) = 8e11fa4f752c568b392973d13af993df
-SHA256 (fvwm-2.5.28.tar.bz2) = 37a90e443b7f9388d6e696f7be37104ab9ba27194a1008d45ea489c0d906d9fb
-SIZE (fvwm-2.5.28.tar.bz2) = 2521994
+MD5 (fvwm-2.5.30.tar.bz2) = 9d1f787e5ad5a8f886a8e711ec2e5690
+SHA256 (fvwm-2.5.30.tar.bz2) = a8651d23d8eaf4ea40ba84698e5fc01fa2f66bec56b4db764fa1945daa3cd8c3
+SIZE (fvwm-2.5.30.tar.bz2) = 2568104
 MD5 (fvwm_icons-20070101.tar.bz2) = 2ab5ee60a96830af23a43855e33afc7d
 SHA256 (fvwm_icons-20070101.tar.bz2) = 86b0164430a3087f5cb8d55eb43a8676bbce495814b30c6844eb127f952642ab
 SIZE (fvwm_icons-20070101.tar.bz2) = 330862
diff --git a/x11-wm/fvwm2-devel/files/patch-Fpng.h b/x11-wm/fvwm2-devel/files/patch-Fpng.h
deleted file mode 100644
index 090de0e7bcc0..000000000000
--- a/x11-wm/fvwm2-devel/files/patch-Fpng.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- libs/Fpng.h.orig	2005-06-17 14:44:35.000000000 +0200
-+++ libs/Fpng.h	2010-03-29 19:25:39.000000000 +0200
-@@ -429,7 +429,7 @@
- #define FPNG_FILLER_AFTER PNG_FILLER_AFTER
- #define FPNG_INFO_tRNS PNG_INFO_tRNS
- 
--#define Fpng_check_sig(a,b) png_check_sig(a,b)
-+#define Fpng_check_sig(a,b) (!png_sig_cmp(a,0,b))
- #define Fpng_create_read_struct(a,b,c,d) png_create_read_struct(a,b,c,d)
- #define Fpng_create_info_struct(a) png_create_info_struct(a)
- #define Fpng_destroy_read_struct(a,b,c) png_destroy_read_struct(a,b,c)
-@@ -444,7 +444,7 @@
- #define Fpng_set_packing(a) png_set_packing(a)
- #define Fpng_set_gray_to_rgb(a) png_set_gray_to_rgb(a)
- #define Fpng_get_bit_depth(a,b) png_get_bit_depth(a,b)
--#define Fpng_set_gray_1_2_4_to_8(a) png_set_gray_1_2_4_to_8(a)
-+#define Fpng_set_gray_1_2_4_to_8(a) png_set_expand_gray_1_2_4_to_8(a)
- #define Fpng_get_valid(a,b,c) png_get_valid(a,b,c)
- #define Fpng_read_end(a,b) png_read_end(a,b)
- #define Fpng_set_interlace_handling(a) png_set_interlace_handling(a)
diff --git a/x11-wm/fvwm2-devel/files/patch-bin::Makefile.in b/x11-wm/fvwm2-devel/files/patch-bin::Makefile.in
index f39210279d9b..1a05697f3500 100644
--- a/x11-wm/fvwm2-devel/files/patch-bin::Makefile.in
+++ b/x11-wm/fvwm2-devel/files/patch-bin::Makefile.in
@@ -1,12 +1,12 @@
 --- bin/Makefile.in.orig	2008-05-06 22:22:48.000000000 -0700
 +++ bin/Makefile.in	2008-12-12 19:35:30.533121271 -0800
-@@ -734,8 +734,7 @@
+@@ -734,9 +734,7 @@
  
  install-data-local:
  	@rm -f $(DESTDIR)$(mandir)/man1/xpmroot.1
 -	@$(LN_S) fvwm-root.1 $(DESTDIR)$(mandir)/man1/xpmroot.1 || \
 -		echo "Minor warning: $(mandir)/man1/xpmroot.1 symlink was not created"
-+
+
  # 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: