diff options
| -rw-r--r-- | wm/fvwm2/Makefile | 4 | ||||
| -rw-r--r-- | wm/fvwm2/distinfo | 10 | ||||
| -rw-r--r-- | wm/fvwm2/patches/patch-aa | 21 | ||||
| -rw-r--r-- | wm/fvwm2/patches/patch-ab | 14 |
4 files changed, 18 insertions, 31 deletions
diff --git a/wm/fvwm2/Makefile b/wm/fvwm2/Makefile index 14965f695ce..87d7ecd3981 100644 --- a/wm/fvwm2/Makefile +++ b/wm/fvwm2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2004/04/25 00:24:30 wiz Exp $ +# $NetBSD: Makefile,v 1.39 2004/10/01 09:15:34 martti Exp $ # FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp # @@ -18,7 +18,7 @@ DEPENDS+= xpmroot-2.*:../../x11/xpmroot CONFLICTS= fvwm1-* fvwm>=1 EXTRACT_ONLY= ${DISTNAME}.tar.gz -FVWM_VER= 2.4.18 +FVWM_VER= 2.4.19 USE_X11BASE= YES USE_BUILDLINK3= YES diff --git a/wm/fvwm2/distinfo b/wm/fvwm2/distinfo index b798e0d5612..82cf858cdd1 100644 --- a/wm/fvwm2/distinfo +++ b/wm/fvwm2/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.23 2004/07/31 01:25:33 kristerw Exp $ +$NetBSD: distinfo,v 1.24 2004/10/01 09:15:34 martti Exp $ -SHA1 (fvwm-2.4.18.tar.gz) = 03360e859dfc8c4def08adec6f57408ad02dc7a7 -Size (fvwm-2.4.18.tar.gz) = 1792978 bytes +SHA1 (fvwm-2.4.19.tar.gz) = 6d881473560d6ded360fc47a7cfb1b3d5d30824f +Size (fvwm-2.4.19.tar.gz) = 1826833 bytes SHA1 (fvwm_icons.tgz) = d6ee1e52f1a84c4edd722ccee0f7e9cc79cc2a4b Size (fvwm_icons.tgz) = 363406 bytes -SHA1 (patch-aa) = 6721d48d720a242ec80dd7b50aa934f13ff26ddf -SHA1 (patch-ab) = 7c1111f4d6d405edb0ffc91ea25704a13e2ab0d3 +SHA1 (patch-aa) = 1fbb00d0ef3fb3042537a7cdc0da0b1f506235ae +SHA1 (patch-ab) = 9005c7e38002a44a62d2289a72f4b9ab5b4f5386 SHA1 (patch-ac) = b9009cad82a5f286e54964fc770c8281cefc35d8 diff --git a/wm/fvwm2/patches/patch-aa b/wm/fvwm2/patches/patch-aa index 0cb9aea8e15..3eabce6441b 100644 --- a/wm/fvwm2/patches/patch-aa +++ b/wm/fvwm2/patches/patch-aa @@ -1,16 +1,13 @@ -$NetBSD: patch-aa,v 1.10 2003/10/13 15:21:19 martti Exp $ +$NetBSD: patch-aa,v 1.11 2004/10/01 09:15:34 martti Exp $ ---- utils/Makefile.in.orig Fri Oct 10 23:12:36 2003 -+++ utils/Makefile.in Mon Oct 13 18:09:55 2003 -@@ -133,14 +133,14 @@ - xpm_CFLAGS = @xpm_CFLAGS@ - xpm_LIBS = @xpm_LIBS@ +--- utils/Makefile.in.orig 2004-09-30 19:56:39.000000000 +0300 ++++ utils/Makefile.in 2004-10-01 12:03:56.000000000 +0300 +@@ -168,3 +168,3 @@ -bin_PROGRAMS = @XPMROOT@ +bin_PROGRAMS = bin_SCRIPTS = fvwm-config fvwmbug fvwm-menu-xlock fvwm-menu-directory \ - fvwm-menu-desktop fvwm-menu-headlines fvwm24_convert - +@@ -173,5 +173,5 @@ -EXTRA_PROGRAMS = xpmroot xselection +EXTRA_PROGRAMS = xselection @@ -18,16 +15,10 @@ $NetBSD: patch-aa,v 1.10 2003/10/13 15:21:19 martti Exp $ -man_MANS = xpmroot.1 fvwm-config.1 fvwmbug.1 fvwmrc_convert.1 fvwm24_convert.1 \ +man_MANS = fvwm-config.1 fvwmbug.1 fvwmrc_convert.1 fvwm24_convert.1 \ fvwm-menu-xlock.1 fvwm-menu-directory.1 \ - fvwm-menu-desktop.1 fvwm-menu-headlines.1 - -@@ -159,8 +159,8 @@ - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = fvwm-config fvwm-menu-xlock fvwm-menu-directory \ +@@ -194,4 +194,4 @@ fvwm-menu-desktop fvwm-menu-headlines fvwm24_convert fvwmbug.sh -EXTRA_PROGRAMS = xpmroot$(EXEEXT) xselection$(EXEEXT) -bin_PROGRAMS = @XPMROOT@ +EXTRA_PROGRAMS = xselection$(EXEEXT) +bin_PROGRAMS = PROGRAMS = $(bin_PROGRAMS) - - xpmroot_SOURCES = xpmroot.c diff --git a/wm/fvwm2/patches/patch-ab b/wm/fvwm2/patches/patch-ab index e3cf1e05a3e..6b1e21cc1c2 100644 --- a/wm/fvwm2/patches/patch-ab +++ b/wm/fvwm2/patches/patch-ab @@ -1,13 +1,9 @@ -$NetBSD: patch-ab,v 1.20 2004/03/22 08:26:44 martti Exp $ +$NetBSD: patch-ab,v 1.21 2004/10/01 09:15:34 martti Exp $ ---- configure.orig 2004-03-19 16:18:12.000000000 +0000 -+++ configure 2004-03-22 10:23:35.000000000 +0000 -@@ -1487,7 +1487,7 @@ - fi - +--- configure.orig 2004-09-30 19:56:42.000000000 +0300 ++++ configure 2004-10-01 12:04:46.000000000 +0300 +@@ -1541,3 +1541,3 @@ # Define the identity of the package. - PACKAGE=fvwm + PACKAGE=fvwm2 - VERSION=2.4.18 - - + VERSION=2.4.19 |