[Midnightbsd-cvs] mports [21591] trunk/x11-wm/fvwm2: update fvwm to 2.6.6

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Aug 13 11:57:59 EDT 2016 

Revision: 21591
          http://svnweb.midnightbsd.org/mports/?rev=21591
Author:   laffer1
Date:     2016-08-13 11:57:58 -0400 (Sat, 13 Aug 2016)
Log Message:
-----------
update fvwm to 2.6.6

Modified Paths:
--------------
    trunk/x11-wm/fvwm2/Makefile
    trunk/x11-wm/fvwm2/distinfo
    trunk/x11-wm/fvwm2/pkg-plist

Added Paths:
-----------
    trunk/x11-wm/fvwm2/files/patch-configure

Removed Paths:
-------------
    trunk/x11-wm/fvwm2/files/patch-bin::Makefile.in
    trunk/x11-wm/fvwm2/files/patch-configure.ac

Modified: trunk/x11-wm/fvwm2/Makefile
===================================================================
--- trunk/x11-wm/fvwm2/Makefile	2016-08-13 15:54:17 UTC (rev 21590)
+++ trunk/x11-wm/fvwm2/Makefile	2016-08-13 15:57:58 UTC (rev 21591)
@@ -1,10 +1,9 @@
 # $MidnightBSD$
 
 PORTNAME=	fvwm
-PORTVERSION=	2.6.5
-PORTREVISION=	1
+PORTVERSION=	2.6.6
 CATEGORIES=	x11-wm
-MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
+MASTER_SITES=	https://github.com/fvwmorg/fvwm/releases/download/version-2_6_6/ \
 		http://www.fvwm.org/generated/icon_download/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
@@ -15,16 +14,19 @@
 LICENSE=	gpl2 mit
 LICENSE_COMB=	multi
 
-RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
+RUN_DEPENDS=	gm4:devel/m4 \
+		p5-XML-Parser>=0:textproc/p5-XML-Parser
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2
 
 # Other ports this port cannot coexist with
 CONFLICTS?=	fvwm-1.* fvwm-2.[457].*
-NO_LATEST_LINK=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-mandoc --without-gnome --disable-gtk
-USES=		gmake perl5 pkgconfig tar:bzip2
-USE_XORG=	xcursor xft xinerama xpm xrender
+USES=		gmake perl5 pkgconfig gettext readline
+USE_XORG=	xcursor xft xinerama xpm xrender x11 ice xext
+USE_GNOME=	cairo
 
 OPTIONS_DEFINE=	ICONS ICONV STROKE RPLAY SESSION_MGMT PNG SVG BIDI NLS
 OPTIONS_DEFAULT=ICONS ICONV SESSION_MGMT PNG
@@ -95,7 +97,6 @@
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
 CONFIGURE_ARGS+=	--with-intl-library=${LOCALBASE}/lib \
 			--with-intl-includes=${LOCALBASE}/include
 .else

Modified: trunk/x11-wm/fvwm2/distinfo
===================================================================
--- trunk/x11-wm/fvwm2/distinfo	2016-08-13 15:54:17 UTC (rev 21590)
+++ trunk/x11-wm/fvwm2/distinfo	2016-08-13 15:57:58 UTC (rev 21591)
@@ -1,4 +1,5 @@
-SHA256 (fvwm-2.6.5.tar.bz2) = 21549995c53906be5533746a1cf61b1ecf8dd8ef6816a0b20615d45ff78b48cf
-SIZE (fvwm-2.6.5.tar.bz2) = 2582655
+TIMESTAMP = 1467607673
+SHA256 (fvwm-2.6.6.tar.gz) = c5de085ff25b2128a401a80225481e63335f815f84eea139f80a5f66e606dc2c
+SIZE (fvwm-2.6.6.tar.gz) = 3455632
 SHA256 (fvwm_icons-20070101.tar.bz2) = 86b0164430a3087f5cb8d55eb43a8676bbce495814b30c6844eb127f952642ab
 SIZE (fvwm_icons-20070101.tar.bz2) = 330862

Deleted: trunk/x11-wm/fvwm2/files/patch-bin::Makefile.in
===================================================================
--- trunk/x11-wm/fvwm2/files/patch-bin::Makefile.in	2016-08-13 15:54:17 UTC (rev 21590)
+++ trunk/x11-wm/fvwm2/files/patch-bin::Makefile.in	2016-08-13 15:57:58 UTC (rev 21591)
@@ -1,12 +0,0 @@
---- bin/Makefile.in.orig	2008-05-06 22:22:48.000000000 -0700
-+++ bin/Makefile.in	2008-12-12 19:35:30.533121271 -0800
-@@ -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:

Added: trunk/x11-wm/fvwm2/files/patch-configure
===================================================================
--- trunk/x11-wm/fvwm2/files/patch-configure	                        (rev 0)
+++ trunk/x11-wm/fvwm2/files/patch-configure	2016-08-13 15:57:58 UTC (rev 21591)
@@ -0,0 +1,10 @@
+--- configure.orig	2012-04-20 13:03:57.000000000 +0200
++++ configure	2014-03-28 17:42:24.000000000 +0100
+@@ -6492,7 +6492,6 @@
+   switch (*p = p = *c) { case 0: printf("%Q", c, p); }
+   *c = &i; c = p;
+   while (1 || (unsigned int)3 >= 0 || ((int)-1) == ((unsigned int)1));
+-  return;
+   ;
+   return 0;
+ }


Property changes on: trunk/x11-wm/fvwm2/files/patch-configure
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/x11-wm/fvwm2/files/patch-configure.ac
===================================================================
--- trunk/x11-wm/fvwm2/files/patch-configure.ac	2016-08-13 15:54:17 UTC (rev 21590)
+++ trunk/x11-wm/fvwm2/files/patch-configure.ac	2016-08-13 15:57:58 UTC (rev 21591)
@@ -1,11 +0,0 @@
---- configure.ac.bak	2013-02-01 10:35:04.191557713 +0100
-+++ configure.ac	2013-02-01 10:35:12.513558507 +0100
-@@ -225,7 +225,7 @@
-   switch (*p = p = *c) { case 0: printf("%Q", c, p); }
-   *c = &i; c = p;
-   while (1 || (unsigned int)3 >= 0 || ((int)-1) == ((unsigned int)1));
--  return;], , AC_MSG_ERROR("
-+  return 0;], , AC_MSG_ERROR("
- configure is not able to compile programs with warnings.  Please
- remove all offending options like -Werror from the CFLAGS and
- CPPFLAGS variables and run configure again."))

Modified: trunk/x11-wm/fvwm2/pkg-plist
===================================================================
--- trunk/x11-wm/fvwm2/pkg-plist	2016-08-13 15:54:17 UTC (rev 21590)
+++ trunk/x11-wm/fvwm2/pkg-plist	2016-08-13 15:57:58 UTC (rev 21591)
@@ -12,9 +12,7 @@
 bin/fvwm
 bin/fvwm2
 bin/xpmroot
- at unexec if cmp -s %D/etc/system.fvwm2rc %D/etc/system.fvwm2rc.dist; then rm -f %D/etc/system.fvwm2rc; fi
-etc/system.fvwm2rc.dist
- at exec [ -f %B/system.fvwm2rc ] || cp %B/%f %B/system.fvwm2rc
+ at sample etc/system.fvwm2rc.dist etc/system.fvwm2rc
 libexec/fvwm/%%FVWM_VERSION%%/FvwmAnimate
 libexec/fvwm/%%FVWM_VERSION%%/FvwmAudio
 libexec/fvwm/%%FVWM_VERSION%%/FvwmAuto
@@ -98,6 +96,7 @@
 man/man1/fvwm-root.1.gz
 man/man1/fvwm.1.gz
 man/man1/fvwm2.1.gz
+man/man1/xpmroot.1.gz
 %%ICONS%%%%DATADIR%%/pixmaps/Jlock.xpm
 %%ICONS%%%%DATADIR%%/pixmaps/Jnews.xpm
 %%ICONS%%%%DATADIR%%/pixmaps/Jrecycle.xpm
@@ -430,10 +429,13 @@
 %%DATADIR%%/FvwmForm-Capture
 %%DATADIR%%/FvwmForm-Desktop
 %%DATADIR%%/FvwmForm-Form
+%%DATADIR%%/FvwmForm-GenOptionHelp
+%%DATADIR%%/FvwmForm-MultiMenuHelp
 %%DATADIR%%/FvwmForm-QuitVerify
 %%DATADIR%%/FvwmForm-Rlogin
 %%DATADIR%%/FvwmForm-RootCursor
 %%DATADIR%%/FvwmForm-Setup
+%%DATADIR%%/FvwmForm-SingleMenuHelp
 %%DATADIR%%/FvwmForm-Talk
 %%DATADIR%%/FvwmForm-TalkHelp
 %%DATADIR%%/FvwmScript-BaseConfig
@@ -452,6 +454,7 @@
 %%DATADIR%%/FvwmScript-Setup95
 %%DATADIR%%/FvwmScript-WidgetDemo
 %%DATADIR%%/FvwmTabs-DefaultSetup
+%%DATADIR%%/fvwm-menu-desktop-config.fpl
 %%DATADIR%%/fvwm-script-ComExample.pl
 %%DATADIR%%/fvwm-script-setup95.pl
 %%DATADIR%%/system.fvwm2rc-sample-95
@@ -489,7 +492,3 @@
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/FvwmScript.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/FvwmTaskBar.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/fvwm.mo
- at dir %%DOCSDIR%%/commands
- at dir %%DOCSDIR%%/fvwm
- at dir %%DOCSDIR%%/images/svg_rendering
- at dir %%DOCSDIR%%/modules/images/FvwmTabs

More information about the Midnightbsd-cvs mailing list