3 files changed, 8 insertions, 23 deletions

diff --git a/x11-wm/fvwm2-devel/Makefile b/x11-wm/fvwm2-devel/Makefile
index bd511c3f6a61..dc4c0bd4ffbf 100644
--- a/x11-wm/fvwm2-devel/Makefile
+++ b/x11-wm/fvwm2-devel/Makefile
@@ -4,7 +4,7 @@
 # Whom:			Makoto Matsushita <matusita@jp.freebsd.org>,
 #			based on Hidekazu Kuroki's work of 2.0.43.
 #
-# $Id: Makefile,v 1.6 1997/03/03 11:33:07 asami Exp $
+# $Id: Makefile,v 1.7 1997/03/04 06:37:49 asami Exp $
 #
 
 DISTNAME=	fvwm-2.0.45
@@ -12,7 +12,8 @@ CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/sources/2.0.x/ \
 		ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/fvwm-users-jp/kits/ \
 		ftp://ftp.TokyoNet.AD.JP/pub/X/fvwm/sources/2.0.x/ \
-		ftp://ftp.TokyoNet.AD.JP/pub/X/fvwm/fvwm-users-jp/kits/
+		ftp://ftp.TokyoNet.AD.JP/pub/X/fvwm/fvwm-users-jp/kits/ \
+		ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} fvwm-users-jp-kits.97Jan24.tar.gz
 
 MAINTAINER=	matusita@jp.freebsd.org
@@ -23,32 +24,18 @@ USE_IMAKE=	yes
 
 # filenames.
 PATCH_FIXIT=	kits/patch/fix-2.0.45
-PATCH_I18N=	kits/patch/PATCH.i18n-jp
-PATCH_MAN=	kits/doc/diffs-fvwm.man
-TARBALL_SWDESK=	kits/tool/swdesk.tar.gz
+PATCH_I18N=	kits/patch/PATCH.I18N
 
-USE_PATCHFILES=	${PATCH_FIXES} ${PATCH_I18N} ${PATCH_MAN}
-SWDESKDIR=	${WRKDIR}/swdesk
-
-# targets for swdesk
-post-extract:
-	@(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${TARBALL_SWDESK} ${EXTRACT_AFTER_ARGS})
+USE_PATCHFILES=	${PATCH_FIXES} ${PATCH_I18N}
 
 pre-patch:
 	@for i in ${USE_PATCHFILES}; do \
 		${PATCH} ${PATCH_DIST_ARGS} < ${WRKDIR}/$$i; \
 	 done;
 
-post-configure:
-	@(cd ${SWDESKDIR} && ${XMKMF})
-
-post-build:
-	@(cd ${SWDESKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET})
-
 post-install:
-	@(cd ${SWDESKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
-	@${MKDIR} ${PREFIX}/lib/X11/${FVWMNAME}/pixmaps
+	@${MKDIR} ${PREFIX}/lib/X11/fvwm2/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/icons/*.xpm \
-		${PREFIX}/lib/X11/${FVWMNAME}/pixmaps
+		${PREFIX}/lib/X11/fvwm2/pixmaps
 
 .include <bsd.port.mk>
diff --git a/x11-wm/fvwm2-devel/pkg-descr b/x11-wm/fvwm2-devel/pkg-descr
index 4d0d6db8e743..3e859e68de61 100644
--- a/x11-wm/fvwm2-devel/pkg-descr
+++ b/x11-wm/fvwm2-devel/pkg-descr
@@ -5,8 +5,7 @@ button-bar can be used to provide convenient access to frequently used
 functions or programs.
 
 This package uses fvwm-users-jp-kits also, to add internationalized
-feature (based on X itself) to fvwm and its modules, and to
-enhance/modifies the behavior of fvwm.
+feature (based on X itself) to fvwm and its modules.
 
 With this package, you may use fonts of your own language, display
 characters in everywhere in fvwm, and have fun ;-)
diff --git a/x11-wm/fvwm2-devel/pkg-plist b/x11-wm/fvwm2-devel/pkg-plist
index 18f747f1707b..5e98a3d3ce48 100644
--- a/x11-wm/fvwm2-devel/pkg-plist
+++ b/x11-wm/fvwm2-devel/pkg-plist
@@ -1,6 +1,5 @@
 bin/fvwm2
 bin/xpmroot
-bin/swdesk
 lib/X11/fvwm2/FvwmAudio
 lib/X11/fvwm2/FvwmAuto
 lib/X11/fvwm2/FvwmBacker