- Add missed @dirrm into PLIST;

- slightly rearrange things in Makefile to minimise diff with non-i18n version
  of the port.

2 files changed, 18 insertions, 19 deletions

diff --git a/x11-wm/windowmaker-i18n/Makefile b/x11-wm/windowmaker-i18n/Makefile
index 5e18795cf5e1..2db39b2eec53 100644
--- a/x11-wm/windowmaker-i18n/Makefile
+++ b/x11-wm/windowmaker-i18n/Makefile
@@ -15,13 +15,13 @@ DISTNAME=	WindowMaker-${PORTVERSION}
 
 MAINTAINER=	mac@jp.freebsd.org
 
+BUILD_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf
 LIB_DEPENDS=	ungif.5:${PORTSDIR}/graphics/libungif \
 		png.4:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
-		Hermes.1:${PORTSDIR}/graphics/Hermes \
 		PropList.2:${PORTSDIR}/devel/libPropList \
-		intl.1:${PORTSDIR}/devel/gettext
-BUILD_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf
+		intl.1:${PORTSDIR}/devel/gettext \
+		Hermes.1:${PORTSDIR}/graphics/Hermes
 RUN_DEPENDS=	${X11BASE}/share/WindowMaker/Themes/Checker.themed/style:${PORTSDIR}/graphics/wmicons
 
 USE_BZIP2=	yes
@@ -31,19 +31,21 @@ USE_XPM=	yes
 WANT_GNOME=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
-CONFIGURE_ENV=	X11BASE=${X11BASE}  LOCALBASE=${LOCALBASE} \
-		CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib" \
+CONFIGURE_ENV=	X11BASE=${X11BASE} \
+		LOCALBASE=${LOCALBASE} \
+		LIBS="-L${LOCALBASE}/lib" \
+		CPPFLAGS="-I${LOCALBASE}/include" \
 		LINGUAS="cs de es et fr gl it ja ko nl no pt ru sv tr fi hr el pl ro da zh_TW.Big5 zh_CN sk bg hu"
 CONFIGURE_ARGS=	--with-pixmapdir=${PREFIX}/include/X11/pixmaps \
-	--with-nlsdir=${PREFIX}/share/locale \
-	--with-libs-from="-L${LOCALBASE}/lib" \
-	--with-incs-from="-I${LOCALBASE}/include" \
-	--with-appspath="${PREFIX}/GNUstep/Apps" \
-	--enable-hermes \
-	--disable-debug
+		--with-nlsdir=${PREFIX}/share/locale \
+		--with-libs-from="-L${LOCALBASE}/lib" \
+		--with-incs-from="-I${LOCALBASE}/include" \
+		--with-appspath="${PREFIX}/GNUstep/Apps" \
+		--enable-hermes \
+		--disable-debug
 
-MAN1=	geticonset.1x getstyle.1x seticons.1x setstyle.1x \
-	wdwrite.1x wmaker.1x wmsetbg.1x wxcopy.1x wxpaste.1x wsetfont.1x
+MAN1=		geticonset.1x getstyle.1x seticons.1x setstyle.1x wdwrite.1x \
+		wmaker.1x wmsetbg.1x wsetfont.1x wxcopy.1x wxpaste.1x
 
 JA_CATALOGFILE=	
 
@@ -66,10 +68,6 @@ pre-extract:
 	@${ECHO} "You can add hooks for KDE by defining WITH_KDE"
 .endif
 
-# post-extract:
-# 	@cd ${WRKSRC} && \
-# 	${TAR} xfz libwmfun-0.0.3.tar.gz
-
 post-patch:
 	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/WPrefs.app/Paths.c
 	@${PERL} -pi -e "s|%%PERL%%|${PERL}|g" ${WRKSRC}/util/wm-oldmenu2new
@@ -84,6 +82,6 @@ pre-build:
 	@cd ${WRKSRC}/WindowMaker/Defaults && ${MAKE} clean
 
 post-install:
-	@${MKDIR} ${PREFIX}/share/WindowMaker/Sounds/
+	@${MKDIR} ${PREFIX}/share/WindowMaker/Sounds
 
 .include <bsd.port.post.mk>
diff --git a/x11-wm/windowmaker-i18n/pkg-plist b/x11-wm/windowmaker-i18n/pkg-plist
index 65be087eb454..5e9b063c773f 100644
--- a/x11-wm/windowmaker-i18n/pkg-plist
+++ b/x11-wm/windowmaker-i18n/pkg-plist
@@ -264,7 +264,6 @@ share/WindowMaker/plmenu.sk
 share/WindowMaker/plmenu.zh_CN
 share/WindowMaker/wmmacros
 share/WindowMaker/xtree.dat
-@exec mkdir -p %B/Sounds
 share/locale/bg/LC_MESSAGES/WPrefs.mo
 share/locale/bg/LC_MESSAGES/WindowMaker.mo
 share/locale/cs/LC_MESSAGES/WPrefs.mo
@@ -307,11 +306,13 @@ share/locale/zh_CN/LC_MESSAGES/WPrefs.mo
 share/locale/zh_CN/LC_MESSAGES/WindowMaker.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/WPrefs.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/WindowMaker.mo
+@exec mkdir -p %D/share/WindowMaker/Sounds
 @dirrm share/WindowMaker/Styles
 @dirrm share/WindowMaker/Sounds
 @dirrm share/WindowMaker/IconSets
 @dirrm share/WindowMaker/Backgrounds
 @dirrm share/WINGs
+@dirrm include/WINGs
 @dirrm etc/WindowMaker
 @dirrm GNUstep/Apps/WPrefs.app/xpm
 @dirrm GNUstep/Apps/WPrefs.app/tiff