Index: head/x11-wm/afterstep-i18n/Makefile
===================================================================
--- head/x11-wm/afterstep-i18n/Makefile	(revision 60966)
+++ head/x11-wm/afterstep-i18n/Makefile	(revision 60967)
@@ -1,82 +1,84 @@
 # New ports collection makefile for:	afterstep-i18n
 # Date created:		23 October 1998
 # Whom:			issei@jp.FreeBSD.org
 #
 # $FreeBSD$
 #
 
 PORTNAME=	afterstep-i18n
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	x11-wm afterstep
 MASTER_SITES=	${MASTER_SITE_AFTERSTEP} \
 		${MASTER_SITE_LOCAL} \
 		http://www.itlb.te.noda.tus.ac.jp/~manome/afterstep/archive/ \
-		http://www.itlb.te.noda.tus.ac.jp/~manome/afterstep/archive/icons/
+		http://www.itlb.te.noda.tus.ac.jp/~manome/afterstep/archive/icons/:icon
 # former for ${MASTER_SITE_AFTERSTEP}, latter for ${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	archives/1.0 kuriyama
 DISTNAME=	AfterStep-1.0
 DISTFILES=	${DISTNAME}.tar.gz \
 		unofficial-I18N.98Feb27.tar.gz \
-		kterm.xpm kterm2.xpm KTerm-AS.xpm netscape4.xpm
+		kterm.xpm:icon kterm2.xpm:icon KTerm-AS.xpm:icon \
+		netscape4.xpm:icon
 EXTRACT_ONLY=	${DISTNAME}.tar.gz \
 		unofficial-I18N.98Feb27.tar.gz
 
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	ports@FreeBSD.org
 
 DIST_SUBDIR=	afterstep
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_IMAKE=	yes
 INSTALL_TARGET=	install install.man
 MANCOMPRESSED=	yes
 MAN1=		afterstep.1 asclock.1 Animate.1 Audio.1 Auto.1 Banner.1 \
 		Pager.1 Wharf.1
 AFTERSTEPDIR=	${PREFIX}/lib/X11/afterstep
 ICONDIR=	${PREFIX}/include/X11/pixmaps
 
 SRCDIRS=	afterstep \
 		modules/Animate modules/Audio modules/Auto \
 		modules/Banner modules/Pager modules/Wharf \
 		modules/Wharf/ASSound
 
 pre-patch:
 	@ ${PATCH} ${PATCH_DIST_ARGS} < ${WRKDIR}/as10+I18N.98Feb27.diff
 
 post-patch:
 	@ ${CP} ${WRKSRC}/sample.steprc ${WRKSRC}/sample.steprc.ja_JP.EUC
 	@ ${PATCH} ${PATCH_DIST_ARGS} < ${FILESDIR}/steprc.ja.diff
 	@ for i in ${SRCDIRS}; do \
 		cd ${WRKSRC}/$$i; \
 		${MV} Imakefile Imakefile.orig; \
 		${SED} -e 's/#ifdef AlphaArchitecture/#if defined(AlphaArchitecture) \&\& !defined(FreeBSDArchitecture)/' < Imakefile.orig  >  Imakefile; \
 	done
 
 pre-build:
 	@ cd ${WRKSRC}; ${SH} MakeMakefiles
 
 post-install:
 	@ ${MKDIR} ${AFTERSTEPDIR}/backgrounds
 	${INSTALL_DATA} ${WRKSRC}/backgrounds/* ${AFTERSTEPDIR}/backgrounds
 	@ ${MKDIR} ${AFTERSTEPDIR}/sounds
 	${INSTALL_DATA} ${WRKSRC}/sounds/* ${AFTERSTEPDIR}/sounds
 	@ ${MKDIR} ${PREFIX}/include/X11/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/icons/*.xpm ${ICONDIR}
 	${INSTALL_DATA} ${_DISTDIR}/kterm.xpm ${ICONDIR}
 	${INSTALL_DATA} ${_DISTDIR}/kterm2.xpm ${ICONDIR}
 	${INSTALL_DATA} ${_DISTDIR}/KTerm-AS.xpm ${ICONDIR}
 	${INSTALL_DATA} ${_DISTDIR}/netscape4.xpm ${ICONDIR}/ja-netscape4.xpm
 	${INSTALL_DATA} ${WRKSRC}/sample.steprc.ja_JP.EUC ${AFTERSTEPDIR}/system.steprc.ja_JP.EUC
 
 .if !defined(NOPORTDOCS)
 	@ ${MKDIR} ${PREFIX}/share/doc/afterstep
 .for i in CHANGES CREDITS README README.8bit INSTALL FAQ module-interface.txt
 	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/doc/afterstep
 .endfor
 .for i in CHANGES.I18N README.I18N README.I18N.jis
 	${INSTALL_DATA} ${WRKDIR}/$i ${PREFIX}/share/doc/afterstep
 .endfor
 .endif
 
 .include <bsd.port.mk>

Property changes on: head/x11-wm/afterstep-i18n/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.21
\ No newline at end of property
+1.22
\ No newline at end of property
Index: head/x11-wm/afterstep-i18n/files/patch-afterstep::icons.c
===================================================================
--- head/x11-wm/afterstep-i18n/files/patch-afterstep::icons.c	(nonexistent)
+++ head/x11-wm/afterstep-i18n/files/patch-afterstep::icons.c	(revision 60967)
@@ -0,0 +1,21 @@
+$FreeBSD$
+
+--- afterstep/icons.c.orig	Thu Mar 20 19:09:21 1997
++++ afterstep/icons.c	Sun May 26 18:15:10 2002
+@@ -779,10 +779,12 @@
+ 	}
+     } 
+ 
+-    if(tmp_win->flags & ICON_MOVED)
+-      CreateIconWindow(tmp_win,tmp_win->icon_x_loc,tmp_win->icon_y_loc);
+-    else
+-      CreateIconWindow(tmp_win, def_x, def_y);
++    if(tmp_win->icon_pixmap_w == None) {
++      if(tmp_win->flags & ICON_MOVED)
++        CreateIconWindow(tmp_win,tmp_win->icon_x_loc,tmp_win->icon_y_loc);
++      else
++        CreateIconWindow(tmp_win, def_x, def_y);
++    }
+ 
+   AutoPlace(tmp_win);
+   tmp_win->flags |= ICONIFIED;

Property changes on: head/x11-wm/afterstep-i18n/files/patch-afterstep::icons.c
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property