Hi,
This update package fvwm2 to the latest release 2.6.5.
Tested on amd64.
Comments ? OK ?
--
Alexandr Shadchin
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/fvwm2/Makefile,v
retrieving revision 1.54
diff -u -p -r1.54 Makefile
--- Makefile 29 Mar 2012 13:39:00 -0000 1.54
+++ Makefile 30 Apr 2012 18:16:05 -0000
@@ -4,7 +4,7 @@ COMMENT-main= multiple virtual desktop w
COMMENT-fvicons=multiple virtual desktop window manager icons
COMMENT-fvwm2= multiple virtual desktop window manager, without icons
-VERSION= 2.6.1
+VERSION= 2.6.5
DISTNAME= fvwm-${VERSION}
PKGNAME-main= fvwm2+fvicons-${VERSION}
FULLPKGNAME-fvicons=fvicons-${VERSION}
@@ -24,12 +24,10 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB += GL ICE SM X11 Xau Xcursor Xdamage Xdmcp Xext Xfixes
-WANTLIB += Xft Xinerama Xpm Xrender Xxf86vm c cairo drm expat
-WANTLIB += fontconfig freetype gdk_pixbuf-2.0 gio-2.0 glib-2.0
-WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 m pixman-1 png
-WANTLIB += pthread pthread-stubs readline rsvg-2 termcap xcb xcb-render
-WANTLIB += xcb-shm z
+WANTLIB += GL ICE SM X11 Xcursor Xext Xft Xinerama Xpm Xrender
+WANTLIB += c cairo expat fontconfig freetype gdk_pixbuf-2.0 gio-2.0
+WANTLIB += glib-2.0 gobject-2.0 m pixman-1 png pthread pthread-stubs
+WANTLIB += readline rsvg-2 termcap xcb xcb-render xcb-shm z
MODULES= devel/gettext
@@ -74,8 +72,8 @@ CONFIGURE_ARGS += --disable-bidi \
--without-gnome \
--without-stroke-library \
--with-png-includes="${LOCALBASE}/include/libpng"
-CONFIGURE_ENV += CFLAGS="${CFLAGS} -I${LOCALBASE}/include
-I${X11BASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV += CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
+ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps/fvwm
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/fvwm2/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo 26 Apr 2011 18:50:46 -0000 1.12
+++ distinfo 30 Apr 2012 18:16:05 -0000
@@ -1,10 +1,10 @@
-MD5 (fvwm-2.6.1.tar.gz) = yDwYXUJBc52LYWGTPoECYA==
+MD5 (fvwm-2.6.5.tar.gz) = NSj2YY+uANNz4u3UInNCkQ==
MD5 (fvwm_icons-20070101.tar.gz) = xtmISWgKHDBgZ6oIVRnkbA==
-RMD160 (fvwm-2.6.1.tar.gz) = iteLp+DoeH6YgAg/UXd4Q/I+M/w=
+RMD160 (fvwm-2.6.5.tar.gz) = OfMVS0rnHZNb+7hxXrK13HbMyyM=
RMD160 (fvwm_icons-20070101.tar.gz) = Iinvu8842B0TZuUtQ3AYwa7ceTQ=
-SHA1 (fvwm-2.6.1.tar.gz) = toxKFXvclYlscL8jd+UjXgbVZP4=
+SHA1 (fvwm-2.6.5.tar.gz) = wgDpZH0R0ai0k4xBmph/6krsZgY=
SHA1 (fvwm_icons-20070101.tar.gz) = URxxt3kjx7poza8L73mSfwu1KDI=
-SHA256 (fvwm-2.6.1.tar.gz) = jS01S0s7qj5C8nDl6XS/xfU5jbWPgs2PdSoK8tD6kJ8=
+SHA256 (fvwm-2.6.5.tar.gz) = 8B+dqAdoUvjbEU+Q8rB1jCHSZeKVj84EKJ5Be866EtE=
SHA256 (fvwm_icons-20070101.tar.gz) =
oL5qSSCzjVj/7+QwdYvB2QEtfHSrZWDL1udYpb3q6yw=
-SIZE (fvwm-2.6.1.tar.gz) = 3452832
+SIZE (fvwm-2.6.5.tar.gz) = 3449177
SIZE (fvwm_icons-20070101.tar.gz) = 363286
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/x11/fvwm2/patches/patch-configure,v
retrieving revision 1.1
diff -u -p -r1.1 patch-configure
--- patches/patch-configure 26 Apr 2011 18:50:46 -0000 1.1
+++ patches/patch-configure 30 Apr 2012 18:16:05 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.1 2011/04/26 18:50:46 shadchin Exp $
---- configure.orig Sun Apr 17 02:35:43 2011
-+++ configure Wed Apr 20 15:50:16 2011
-@@ -11025,7 +11025,7 @@ if test "${with_intl_library+set}" = set; then :
+--- configure.orig Fri Apr 20 17:03:57 2012
++++ configure Mon Apr 30 21:20:31 2012
+@@ -11026,7 +11026,7 @@ if test "${with_intl_library+set}" = set; then :
else
with_intl=maybe
Index: patches/patch-fvwm_Makefile_in
===================================================================
RCS file: /cvs/ports/x11/fvwm2/patches/patch-fvwm_Makefile_in,v
retrieving revision 1.6
diff -u -p -r1.6 patch-fvwm_Makefile_in
--- patches/patch-fvwm_Makefile_in 26 Apr 2011 18:50:46 -0000 1.6
+++ patches/patch-fvwm_Makefile_in 30 Apr 2012 18:16:05 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-fvwm_Makefile_in,v 1.6 2011/04/26 18:50:46 shadchin Exp $
---- fvwm/Makefile.in.orig Mon Aug 9 18:28:55 2010
-+++ fvwm/Makefile.in Fri Mar 4 08:25:05 2011
+--- fvwm/Makefile.in.orig Fri Apr 20 17:03:55 2012
++++ fvwm/Makefile.in Mon Apr 30 21:20:31 2012
@@ -35,7 +35,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
@@ -10,7 +10,7 @@ $OpenBSD: patch-fvwm_Makefile_in,v 1.6 2
subdir = fvwm
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -449,7 +449,7 @@ uninstall-binPROGRAMS:
+@@ -450,7 +450,7 @@ uninstall-binPROGRAMS:
clean-binPROGRAMS:
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
@@ -19,7 +19,7 @@ $OpenBSD: patch-fvwm_Makefile_in,v 1.6 2
@rm -f fvwm$(EXEEXT)
$(LINK) $(fvwm_OBJECTS) $(fvwm_LDADD) $(LIBS)
-@@ -687,7 +687,7 @@ install-dvi: install-dvi-am
+@@ -689,7 +689,7 @@ install-dvi: install-dvi-am
install-dvi-am:
