summaryrefslogtreecommitdiff
path: root/x11-wm
diff options
context:
space:
mode:
authorCy Schubert <cy@FreeBSD.org>2016-07-04 05:14:52 +0000
committerCy Schubert <cy@FreeBSD.org>2016-07-04 05:14:52 +0000
commit9c65eb2598cc5c21c76b4b45382d99135313e30e (patch)
treea5cba30645f9b0cb153906e6dabc812edb02527c /x11-wm
parentAdd fixed entries for Python 2.7, 3.4, 3.5 for urllib vulnerability. (diff)
Update 2.6.5 --> 2.6.6.
PR: 210787
Notes
Notes: svn path=/head/; revision=418008
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/fvwm2/Makefile13
-rw-r--r--x11-wm/fvwm2/distinfo5
-rw-r--r--x11-wm/fvwm2/pkg-plist8
3 files changed, 14 insertions, 12 deletions
diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile
index 125a2471a835..7b094fb7be49 100644
--- a/x11-wm/fvwm2/Makefile
+++ b/x11-wm/fvwm2/Makefile
@@ -2,10 +2,9 @@
# $FreeBSD$
PORTNAME= fvwm
-PORTVERSION= 2.6.5
-PORTREVISION= 8
+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,14 +14,17 @@ COMMENT= Popular virtual window manager for X
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].*
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
@@ -93,7 +95,6 @@ CONFIGURE_ARGS+= --disable-bidi
.endif
.if ${PORT_OPTIONS:MNLS}
-USES+= gettext
CONFIGURE_ARGS+= --with-intl-library=${LOCALBASE}/lib \
--with-intl-includes=${LOCALBASE}/include
.else
diff --git a/x11-wm/fvwm2/distinfo b/x11-wm/fvwm2/distinfo
index 23d7557e0624..378a3fad4f5a 100644
--- a/x11-wm/fvwm2/distinfo
+++ b/x11-wm/fvwm2/distinfo
@@ -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
diff --git a/x11-wm/fvwm2/pkg-plist b/x11-wm/fvwm2/pkg-plist
index e3c5997a90f4..01a553a62b6c 100644
--- a/x11-wm/fvwm2/pkg-plist
+++ b/x11-wm/fvwm2/pkg-plist
@@ -429,10 +429,13 @@ man/man1/xpmroot.1.gz
%%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
@@ -451,6 +454,7 @@ man/man1/xpmroot.1.gz
%%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
@@ -488,7 +492,3 @@ man/man1/xpmroot.1.gz
%%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
-@dir %%DOCSDIR%%/commands
-@dir %%DOCSDIR%%/fvwm
-@dir %%DOCSDIR%%/images/svg_rendering
-@dir %%DOCSDIR%%/modules/images/FvwmTabs