4 files changed, 36 insertions, 38 deletions

diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile
index 9e336ae84ca6..a6ef052a9a20 100644
--- a/x11-wm/fvwm2/Makefile
+++ b/x11-wm/fvwm2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fvwm
-PORTVERSION=	2.4.19
+PORTVERSION=	2.4.20
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
 		http://www.fvwm.org/generated/icon_download/
@@ -27,8 +27,10 @@ CONFLICTS?=	fvwm-1.* fvwm-2.5.*
 # Other ports reference this port's Makefile
 .if defined(PKGNAMESUFFIX)
 LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
+PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-imlib
 .else
 LATEST_LINK=	${PORTNAME}2
+PKGNAMESUFFIX=	-imlib
 .endif
 USE_GMAKE=	yes
 USE_XPM=	yes
@@ -39,6 +41,7 @@ WANT_GNOME=	yes
 .include <bsd.port.pre.mk>
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--mandir=${PREFIX}/man
 
 .if defined(WITH_STROKE)
 CONFIGURE_ARGS+=	--with-stroke --with-stroke-library=${LOCALBASE}/lib \
@@ -59,16 +62,22 @@ CONFIGURE_ARGS+=	--enable-multibyte
 
 PLIST_SUB+=	FVWM_VERSION="${PORTVERSION}"
 
+MAN1=	FvwmAnimate.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 FvwmButtons.1 \
+	FvwmCommand.1 FvwmConsole.1 FvwmConsoleC.pl.1 FvwmCpp.1 FvwmDebug.1 \
+	FvwmDragWell.1 FvwmEvent.1 FvwmForm.1 FvwmIconBox.1 \
+	FvwmIconMan.1 FvwmIdent.1 FvwmM4.1 FvwmPager.1 FvwmRearrange.1 \
+	FvwmSave.1 FvwmSaveDesk.1 FvwmScript.1 FvwmScroll.1 FvwmTaskBar.1 \
+	FvwmTheme.1 FvwmWharf.1 FvwmWinList.1 fvwm-menu-desktop.1 \
+	fvwm-menu-directory.1 fvwm-menu-headlines.1 fvwm-menu-xlock.1 \
+	fvwm2.1 fvwm24_convert.1 fvwmbug.1 fvwmrc_convert.1 xpmroot.1 \
+	fvwm-config.1
+
 .if ${HAVE_GNOME:Mimlib}!=""
 USE_GNOME=	imlib
-.if defined(PKGNAMESUFFIX)
-PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-imlib
-.else
-PKGNAMESUFFIX=	-imlib
-.endif
 CONFIGURE_ARGS+=	--with-gnome --enable-gnome-hints \
 			--enable-gtktest --enable-imlibtest
 PLIST_SUB+=	GTK=""
+MAN1+=	FvwmGtk.1
 .else
 CONFIGURE_ARGS+=	--without-gnome --disable-gnome-hints \
 			--disable-gtktest --disable-imlibtest \
@@ -76,16 +85,6 @@ CONFIGURE_ARGS+=	--without-gnome --disable-gnome-hints \
 PLIST_SUB+=	GTK="@comment not installed: "
 .endif
 
-MAN1=	FvwmAnimate.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 FvwmButtons.1 \
-	FvwmCommand.1 FvwmConsole.1 FvwmConsoleC.pl.1 FvwmCpp.1 FvwmDebug.1 \
-	FvwmDragWell.1 FvwmEvent.1 FvwmForm.1 FvwmIconBox.1 \
-	FvwmIconMan.1 FvwmIdent.1 FvwmM4.1 FvwmPager.1 FvwmRearrange.1 \
-	FvwmSave.1 FvwmSaveDesk.1 FvwmScript.1 FvwmScroll.1 FvwmTaskBar.1 \
-	FvwmTheme.1 FvwmWharf.1 FvwmWinList.1 fvwm-menu-desktop.1 \
-	fvwm-menu-directory.1 fvwm-menu-headlines.1 fvwm-menu-xlock.1 \
-	fvwm2.1 fvwm24_convert.1 fvwmbug.1 fvwmrc_convert.1 xpmroot.1 \
-	fvwm-config.1
-
 post-extract:
 	@${MKDIR} ${WRKDIR}/icons
 	@${TAR} -xzf ${DISTDIR}/fvwm_icons.tgz -C ${WRKDIR}/icons
diff --git a/x11-wm/fvwm2/distinfo b/x11-wm/fvwm2/distinfo
index 64fcf66c4377..556c1c250fee 100644
--- a/x11-wm/fvwm2/distinfo
+++ b/x11-wm/fvwm2/distinfo
@@ -1,6 +1,6 @@
-MD5 (fvwm-2.4.19.tar.bz2) = 57264300ab70af7f0f46d3db9e92b532
-SHA256 (fvwm-2.4.19.tar.bz2) = 03e0fc18e2ea39d2d8c874609a9b121eafc0c319a3f5d6c9b97ef8267086f837
-SIZE (fvwm-2.4.19.tar.bz2) = 1390705
+MD5 (fvwm-2.4.20.tar.bz2) = 70832c51fac1a150009374fc3b0069b6
+SHA256 (fvwm-2.4.20.tar.bz2) = 2831acc4a5a8bb50022657fa1b9d63eb76b26b076783da0b555d493f99591bd0
+SIZE (fvwm-2.4.20.tar.bz2) = 1426470
 MD5 (fvwm_icons.tgz) = de6c2822f1f6d43a0e1daddd0c7a8665
 SHA256 (fvwm_icons.tgz) = 728eb0c837c58439b86a33e8dd4b3edb385372bc83972a2568e6f9d7ef3442a1
 SIZE (fvwm_icons.tgz) = 363406
diff --git a/x11-wm/fvwm24/Makefile b/x11-wm/fvwm24/Makefile
index 9e336ae84ca6..a6ef052a9a20 100644
--- a/x11-wm/fvwm24/Makefile
+++ b/x11-wm/fvwm24/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fvwm
-PORTVERSION=	2.4.19
+PORTVERSION=	2.4.20
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
 		http://www.fvwm.org/generated/icon_download/
@@ -27,8 +27,10 @@ CONFLICTS?=	fvwm-1.* fvwm-2.5.*
 # Other ports reference this port's Makefile
 .if defined(PKGNAMESUFFIX)
 LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
+PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-imlib
 .else
 LATEST_LINK=	${PORTNAME}2
+PKGNAMESUFFIX=	-imlib
 .endif
 USE_GMAKE=	yes
 USE_XPM=	yes
@@ -39,6 +41,7 @@ WANT_GNOME=	yes
 .include <bsd.port.pre.mk>
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--mandir=${PREFIX}/man
 
 .if defined(WITH_STROKE)
 CONFIGURE_ARGS+=	--with-stroke --with-stroke-library=${LOCALBASE}/lib \
@@ -59,16 +62,22 @@ CONFIGURE_ARGS+=	--enable-multibyte
 
 PLIST_SUB+=	FVWM_VERSION="${PORTVERSION}"
 
+MAN1=	FvwmAnimate.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 FvwmButtons.1 \
+	FvwmCommand.1 FvwmConsole.1 FvwmConsoleC.pl.1 FvwmCpp.1 FvwmDebug.1 \
+	FvwmDragWell.1 FvwmEvent.1 FvwmForm.1 FvwmIconBox.1 \
+	FvwmIconMan.1 FvwmIdent.1 FvwmM4.1 FvwmPager.1 FvwmRearrange.1 \
+	FvwmSave.1 FvwmSaveDesk.1 FvwmScript.1 FvwmScroll.1 FvwmTaskBar.1 \
+	FvwmTheme.1 FvwmWharf.1 FvwmWinList.1 fvwm-menu-desktop.1 \
+	fvwm-menu-directory.1 fvwm-menu-headlines.1 fvwm-menu-xlock.1 \
+	fvwm2.1 fvwm24_convert.1 fvwmbug.1 fvwmrc_convert.1 xpmroot.1 \
+	fvwm-config.1
+
 .if ${HAVE_GNOME:Mimlib}!=""
 USE_GNOME=	imlib
-.if defined(PKGNAMESUFFIX)
-PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-imlib
-.else
-PKGNAMESUFFIX=	-imlib
-.endif
 CONFIGURE_ARGS+=	--with-gnome --enable-gnome-hints \
 			--enable-gtktest --enable-imlibtest
 PLIST_SUB+=	GTK=""
+MAN1+=	FvwmGtk.1
 .else
 CONFIGURE_ARGS+=	--without-gnome --disable-gnome-hints \
 			--disable-gtktest --disable-imlibtest \
@@ -76,16 +85,6 @@ CONFIGURE_ARGS+=	--without-gnome --disable-gnome-hints \
 PLIST_SUB+=	GTK="@comment not installed: "
 .endif
 
-MAN1=	FvwmAnimate.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 FvwmButtons.1 \
-	FvwmCommand.1 FvwmConsole.1 FvwmConsoleC.pl.1 FvwmCpp.1 FvwmDebug.1 \
-	FvwmDragWell.1 FvwmEvent.1 FvwmForm.1 FvwmIconBox.1 \
-	FvwmIconMan.1 FvwmIdent.1 FvwmM4.1 FvwmPager.1 FvwmRearrange.1 \
-	FvwmSave.1 FvwmSaveDesk.1 FvwmScript.1 FvwmScroll.1 FvwmTaskBar.1 \
-	FvwmTheme.1 FvwmWharf.1 FvwmWinList.1 fvwm-menu-desktop.1 \
-	fvwm-menu-directory.1 fvwm-menu-headlines.1 fvwm-menu-xlock.1 \
-	fvwm2.1 fvwm24_convert.1 fvwmbug.1 fvwmrc_convert.1 xpmroot.1 \
-	fvwm-config.1
-
 post-extract:
 	@${MKDIR} ${WRKDIR}/icons
 	@${TAR} -xzf ${DISTDIR}/fvwm_icons.tgz -C ${WRKDIR}/icons
diff --git a/x11-wm/fvwm24/distinfo b/x11-wm/fvwm24/distinfo
index 64fcf66c4377..556c1c250fee 100644
--- a/x11-wm/fvwm24/distinfo
+++ b/x11-wm/fvwm24/distinfo
@@ -1,6 +1,6 @@
-MD5 (fvwm-2.4.19.tar.bz2) = 57264300ab70af7f0f46d3db9e92b532
-SHA256 (fvwm-2.4.19.tar.bz2) = 03e0fc18e2ea39d2d8c874609a9b121eafc0c319a3f5d6c9b97ef8267086f837
-SIZE (fvwm-2.4.19.tar.bz2) = 1390705
+MD5 (fvwm-2.4.20.tar.bz2) = 70832c51fac1a150009374fc3b0069b6
+SHA256 (fvwm-2.4.20.tar.bz2) = 2831acc4a5a8bb50022657fa1b9d63eb76b26b076783da0b555d493f99591bd0
+SIZE (fvwm-2.4.20.tar.bz2) = 1426470
 MD5 (fvwm_icons.tgz) = de6c2822f1f6d43a0e1daddd0c7a8665
 SHA256 (fvwm_icons.tgz) = 728eb0c837c58439b86a33e8dd4b3edb385372bc83972a2568e6f9d7ef3442a1
 SIZE (fvwm_icons.tgz) = 363406