4 files changed, 69 insertions, 52 deletions

diff --git a/graphics/EZWGL/Makefile b/graphics/EZWGL/Makefile
index 7349d144206f..2f399be799f1 100644
--- a/graphics/EZWGL/Makefile
+++ b/graphics/EZWGL/Makefile
@@ -3,13 +3,13 @@
 # Date created:				4 May 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.13 1998/11/21 07:27:35 steve Exp $
+# $Id: Makefile,v 1.14 1999/01/02 19:51:36 steve Exp $
 #
 
-DISTNAME=	EZWGL-1.40
+DISTNAME=	EZWGL-1.40c
 CATEGORIES=	graphics devel
 MASTER_SITES=	ftp://ftp.ma.utexas.edu/pub/mzou/
-DISTFILES=	${DISTNAME}-demo.tgz ${DISTNAME}-doc.tgz ${DISTNAME}-src.tgz
+DISTFILES=	EZWGL-1.40-doc.tgz ${DISTNAME}-src.tgz
 
 MAINTAINER=	andy@icc.surw.chel.su
 
@@ -30,11 +30,23 @@ VERSION=	1.4
 .endif
 
 pre-install:
-	-@ ${RM} ${WRKSRC}/demos/Makefile.orig
-	-@ ${RM} ${WRKSRC}/demos/DnD/Makefile.orig
-	-@ ${RM} ${WRKSRC}/demos/GL/Makefile.orig
-	-@ ${RM} ${WRKSRC}/demos/Message/Makefile.orig
-	-@ ${MV} ${WRKSRC}/doc/man3/EZ_RegisterCompositeWidget,3 ${WRKSRC}/doc/man3/EZ_RegisterCompositeWidget.3
+.for file in Makefile.orig animate btnbox clock counter hanoi locator meter puzzle
+	-@ ${RM} ${WRKSRC}/demos/${file}
+.endfor
+.for file in Makefile.orig src1 src2 target1 target2
+	-@ ${RM} ${WRKSRC}/demos/DnD/${file}
+.endfor
+.for file in setroot transparent
+	-@ ${RM} ${WRKSRC}/demos/Glass/${file}
+.endfor
+.for file in Makefile.orig gears image julia pendulum
+	-@ ${RM} ${WRKSRC}/demos/GL/${file}
+.endfor
+.for file in Makefile.orig client server
+	-@ ${RM} ${WRKSRC}/demos/Message/${file}
+.endfor
+	-@ ${RMDIR} ${WRKDIR}/EZWGL-1.40/doc/html/misc
+	-@ ${MV} ${WRKDIR}/EZWGL-1.40/doc/man3/EZ_RegisterCompositeWidget,3 ${WRKDIR}/EZWGL-1.40/doc/man3/EZ_RegisterCompositeWidget.3
 	-@ ${RM} ${WRKSRC}/examples/Makefile.orig
 
 do-install:
@@ -43,7 +55,7 @@ do-install:
 	@ ${INSTALL_DATA} ${WRKSRC}/lib/libEZ.so.${VERSION} ${PREFIX}/lib
 	@ ${LN} -sf libEZ.so.${VERSION} ${PREFIX}/lib/libEZ.so
 .for file in ${MAN3}
-	@ ${INSTALL_MAN} ${WRKSRC}/doc/man3/${file} ${PREFIX}/man/man3
+	@ ${INSTALL_MAN} ${WRKDIR}/EZWGL-1.40/doc/man3/${file} ${PREFIX}/man/man3
 .endfor
 	@ ${MKDIR} ${PREFIX}/share/examples/EZ
 	@ cd ${WRKSRC}/examples; tar cf - * | \
@@ -55,7 +67,7 @@ do-install:
 post-install:
 .if !defined(NOPORTDOCS)
 	@ ${MKDIR} ${PREFIX}/share/doc/EZ
-	@ cd ${WRKSRC}/doc; tar cf - html ps | \
+	@ cd ${WRKDIR}/EZWGL-1.40/doc; tar cf - html ps | \
 		(cd ${PREFIX}/share/doc/EZ; tar --unlink -xf - )
 .endif
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
diff --git a/graphics/EZWGL/distinfo b/graphics/EZWGL/distinfo
index de1342d5886d..e236f54ed02c 100644
--- a/graphics/EZWGL/distinfo
+++ b/graphics/EZWGL/distinfo
@@ -1,3 +1,2 @@
-MD5 (EZWGL-1.40-src.tgz) = 817f7aee5f0fd67410b857f329fe7a18
 MD5 (EZWGL-1.40-doc.tgz) = ee99a79a3efddf01952313fcee8c5610
-MD5 (EZWGL-1.40-demo.tgz) = d6ba842e5814988a182a7feac4135ccb
+MD5 (EZWGL-1.40c-src.tgz) = 6e2c205d19c875951015f0e3085933aa
diff --git a/graphics/EZWGL/files/manpages b/graphics/EZWGL/files/manpages
index b543e3be9f00..56f416940aab 100644
--- a/graphics/EZWGL/files/manpages
+++ b/graphics/EZWGL/files/manpages
@@ -91,6 +91,7 @@ MAN3+=	EZ_Get3DCanvasSize.3
 MAN3+=	EZ_GetAndUseWidgetResources.3
 MAN3+=	EZ_GetApplicationResource.3
 MAN3+=	EZ_GetAtom.3
+MAN3+=	EZ_GetBackgroundGC.3
 MAN3+=	EZ_GetBubbleHelp.3
 MAN3+=	EZ_GetCheckButtonState.3
 MAN3+=	EZ_GetCommunicationWindow.3
@@ -175,6 +176,7 @@ MAN3+=	EZ_GlobFileName.3
 MAN3+=	EZ_GlobFiles.3
 MAN3+=	EZ_GlobHiddenFiles.3
 MAN3+=	EZ_GrabPointer.3
+MAN3+=	EZ_HandleDnDEvents.3
 MAN3+=	EZ_HideWidget.3
 MAN3+=	EZ_HighlightWidget.3
 MAN3+=	EZ_IdentityMatrix.3
diff --git a/graphics/EZWGL/pkg-plist b/graphics/EZWGL/pkg-plist
index 382b6b902fc9..6cc3945290ac 100644
--- a/graphics/EZWGL/pkg-plist
+++ b/graphics/EZWGL/pkg-plist
@@ -959,45 +959,6 @@ share/examples/EZ/cbutton.c
 share/examples/EZ/cloth.gif
 share/examples/EZ/cursor.c
 share/examples/EZ/demo.c
-share/examples/EZ/demos/DnD/src2.c
-share/examples/EZ/demos/DnD/target2.c
-share/examples/EZ/demos/DnD/Makefile
-share/examples/EZ/demos/DnD/src1.c
-share/examples/EZ/demos/DnD/target1.c
-share/examples/EZ/demos/DnD/README
-share/examples/EZ/demos/GL/pendulum.c
-share/examples/EZ/demos/GL/gears.c
-share/examples/EZ/demos/GL/image.c
-share/examples/EZ/demos/GL/julia.c
-share/examples/EZ/demos/GL/flowers.xpm
-share/examples/EZ/demos/GL/guilin.gif
-share/examples/EZ/demos/GL/Makefile
-share/examples/EZ/demos/GL/README
-share/examples/EZ/demos/Makefile
-share/examples/EZ/demos/Message/client.c
-share/examples/EZ/demos/Message/server.c
-share/examples/EZ/demos/Message/Makefile
-share/examples/EZ/demos/Message/README
-share/examples/EZ/demos/README
-share/examples/EZ/demos/animate.c
-share/examples/EZ/demos/btnbox.c
-share/examples/EZ/demos/burning/borrar-0.xpm
-share/examples/EZ/demos/burning/borrar-1.xpm
-share/examples/EZ/demos/burning/borrar-2.xpm
-share/examples/EZ/demos/burning/borrar-3.xpm
-share/examples/EZ/demos/burning/borrar-4.xpm
-share/examples/EZ/demos/burning/borrar-5.xpm
-share/examples/EZ/demos/burning/borrar-6.xpm
-share/examples/EZ/demos/burning/borrar-7.xpm
-share/examples/EZ/demos/burning/borrar-8.xpm
-share/examples/EZ/demos/burning/README
-share/examples/EZ/demos/burning/README.~1~
-share/examples/EZ/demos/clock.c
-share/examples/EZ/demos/counter.c
-share/examples/EZ/demos/hanoi.c
-share/examples/EZ/demos/locator.c
-share/examples/EZ/demos/meter.c
-share/examples/EZ/demos/puzzle.c
 share/examples/EZ/entry.c
 share/examples/EZ/fileselector.c
 share/examples/EZ/flistbox.c
@@ -1022,17 +983,60 @@ share/examples/EZ/tree.c
 share/examples/EZ/twotails.xpm
 share/examples/EZ/workarea.c
 share/examples/EZ/xevent.c
+share/examples/EZ/demos/Makefile
+share/examples/EZ/demos/README
+share/examples/EZ/demos/animate.c
+share/examples/EZ/demos/btnbox.c
+share/examples/EZ/demos/clock.c
+share/examples/EZ/demos/counter.c
+share/examples/EZ/demos/guilin.gif
+share/examples/EZ/demos/hanoi.c
+share/examples/EZ/demos/locator.c
+share/examples/EZ/demos/meter.c
+share/examples/EZ/demos/puzzle.c
+share/examples/EZ/demos/DnD/src2.c
+share/examples/EZ/demos/DnD/target2.c
+share/examples/EZ/demos/DnD/Makefile
+share/examples/EZ/demos/DnD/src1.c
+share/examples/EZ/demos/DnD/target1.c
+share/examples/EZ/demos/DnD/README
+share/examples/EZ/demos/GL/Makefile
+share/examples/EZ/demos/GL/README
+share/examples/EZ/demos/GL/flowers.xpm
+share/examples/EZ/demos/GL/gears.c
+share/examples/EZ/demos/GL/guilin.gif
+share/examples/EZ/demos/GL/image.c
+share/examples/EZ/demos/GL/julia.c
+share/examples/EZ/demos/GL/pendulum.c
+share/examples/EZ/demos/Glass/Makefile
+share/examples/EZ/demos/Glass/README
+share/examples/EZ/demos/Glass/setroot.c
+share/examples/EZ/demos/Glass/transparent.c
+share/examples/EZ/demos/Glass/widget.c
+share/examples/EZ/demos/Message/client.c
+share/examples/EZ/demos/Message/server.c
+share/examples/EZ/demos/Message/Makefile
+share/examples/EZ/demos/Message/README
+share/examples/EZ/demos/burning/borrar-0.xpm
+share/examples/EZ/demos/burning/borrar-1.xpm
+share/examples/EZ/demos/burning/borrar-2.xpm
+share/examples/EZ/demos/burning/borrar-3.xpm
+share/examples/EZ/demos/burning/borrar-4.xpm
+share/examples/EZ/demos/burning/borrar-5.xpm
+share/examples/EZ/demos/burning/borrar-6.xpm
+share/examples/EZ/demos/burning/borrar-7.xpm
+share/examples/EZ/demos/burning/borrar-8.xpm
 @dirrm share/doc/EZ/html/images
 @dirrm share/doc/EZ/html/manp
 @dirrm share/doc/EZ/html/manual/images
 @dirrm share/doc/EZ/html/manual
-@dirrm share/doc/EZ/html/misc
 @dirrm share/doc/EZ/html/screenshots
 @dirrm share/doc/EZ/html
 @dirrm share/doc/EZ/ps
 @dirrm share/doc/EZ
 @dirrm share/examples/EZ/demos/DnD
 @dirrm share/examples/EZ/demos/GL
+@dirrm share/examples/EZ/demos/Glass
 @dirrm share/examples/EZ/demos/Message
 @dirrm share/examples/EZ/demos/burning
 @dirrm share/examples/EZ/demos