Date: Sun, 14 Feb 1999 14:00:37 +0300 (MSK) From: Andrey Zakhvatov <andy@icc.surw.chel.su> To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: ports/10073: Update port: graphics/EZWGL Message-ID: <199902141100.OAA16695@icc.surw.chel.su>
next in thread | raw e-mail | index | archive | help
>Number: 10073 >Category: ports >Synopsis: Update port: graphics/EZWGL >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Feb 14 03:10:01 PST 1999 >Closed-Date: >Last-Modified: >Originator: Andrey Zakhvatov >Release: FreeBSD 2.2.8-RELEASE i386 >Organization: South Ural Railway ICC >Environment: >Description: This is a patch to update graphics/EZWGL port. diff -Nru EZWGL/Makefile EZWGL-1.40c/Makefile --- EZWGL/Makefile Sun Jan 3 02:22:19 1999 +++ EZWGL-1.40c/Makefile Sun Feb 14 13:29:53 1999 @@ -6,10 +6,10 @@ # $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 @@ .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 @@ @ ${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 @@ 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 -Nru EZWGL/files/manpages EZWGL-1.40c/files/manpages --- EZWGL/files/manpages Sun Jan 3 02:22:25 1999 +++ EZWGL-1.40c/files/manpages Sun Feb 14 11:39:06 1999 @@ -91,6 +91,7 @@ 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_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 -Nru EZWGL/files/md5 EZWGL-1.40c/files/md5 --- EZWGL/files/md5 Sun Jan 3 02:22:25 1999 +++ EZWGL-1.40c/files/md5 Sun Jan 31 20:05:43 1999 @@ -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 -Nru EZWGL/patches/patch-aa EZWGL-1.40c/patches/patch-aa --- EZWGL/patches/patch-aa Sun Jan 3 02:22:25 1999 +++ EZWGL-1.40c/patches/patch-aa Sat Feb 13 18:33:19 1999 @@ -1,6 +1,32 @@ ---- Makefile Wed Nov 11 17:52:43 1998 -+++ /home/andy/tmp/wrk/Makefile Tue Dec 22 12:37:23 1998 -@@ -22,14 +22,14 @@ +--- Makefile Wed Dec 9 23:58:24 1998 ++++ /home/andy/tmp/wrk/Makefile Sat Feb 13 18:29:55 1999 +@@ -4,16 +4,22 @@ + # + #---------------------------------------------------------------------------------- + ++# X11R6 directory ++X11BASE ?= /usr/X11R6 ++ ++# Local packages directory ++LOCALBASE ?= /usr/local ++ + # place to install the EZWGL library +-LIBDIR = /usr/local/lib ++LIBDIR = $(X11BASE)/lib + #LIBDIR = /usr/lib + + # place to install the header file EZ.h +-INCLDIR = /usr/local/include ++INCLDIR = $(X11BASE)/include + #INCLDIR = /usr/include + + # place to instal the man pages +-MANDIR=/usr/local/man/man3 ++MANDIR = $(X11BASE)/man/man3 + + #---------------------------------------------------------------------------------- + AR = ar +@@ -22,14 +28,14 @@ #---------------------------------------------------------------------------------- # Compiler, you need gcc. # @@ -17,7 +43,7 @@ # # If your X window environment does not support the MIT shared memory # extension, comment out the next line. -@@ -45,8 +45,8 @@ +@@ -45,8 +51,8 @@ # If you don't want the JPEG support, simply comment out # the next two lines. # @@ -28,7 +54,7 @@ # # A few high frequency gl routines have macro substitutes. The macro version # is about, on average, 5-10% faster. However, they generate about 25% larger -@@ -58,7 +58,7 @@ +@@ -58,7 +64,7 @@ GL_FLAG = -DUSE_GL_MACROS #-DLOW_PRECISION_SQRT # #------------------------------------------------------------------ @@ -37,8 +63,8 @@ FLAGS = $(DEBUG_FLAG) $(GL_FLAG) $(MISC_FLAG) $(JPEG_FLAG) COMPILER = $(CC) $(CFLAGS) -@@ -67,16 +67,16 @@ - all: shared +@@ -68,16 +74,16 @@ + shared: - cd jpeg; make all CC="$(CC) -fpic"; @@ -59,13 +85,4 @@ +# cd demos; make all CC="$(COMPILER)" LIBDIR="$(LIBDIR)" JPEG_LIB="$(JPEG_LIB)" install-shared: - cd lib; make install-shared CC="$(COMPILER) $(FLAGS) -fpic" LIBDIR="$(LIBDIR)" -@@ -85,7 +85,7 @@ - - install-static: - cd lib; make install-static CC="$(COMPILER) $(FLAGS)" AR=$(AR) LIBDIR="$(LIBDIR)" RANLIB="$(RANLIB)" -- cd include; make install CC="$(COMPILER)" INCLDIR="$(INCLDIR)" -+# cd include; make install CC="$(COMPILER)" INCLDIR="$(INCLDIR)" - - clean: - cd lib; make clean RM="$(RM)" + cd include; make install CC="$(COMPILER)" INCLDIR="$(INCLDIR)" diff -Nru EZWGL/patches/patch-ag EZWGL-1.40c/patches/patch-ag --- EZWGL/patches/patch-ag Mon Jan 11 02:44:22 1999 +++ EZWGL-1.40c/patches/patch-ag Sun Feb 14 10:18:01 1999 @@ -1,5 +1,5 @@ ---- lib/Makefile Wed Nov 11 17:46:38 1998 -+++ /home/andy/tmp/wrk/lib/Makefile Tue Dec 22 10:45:30 1998 +--- lib/Makefile Tue Nov 17 07:43:35 1998 ++++ /home/andy/tmp/wrk/lib/Makefile Sun Feb 14 10:13:05 1999 @@ -19,7 +19,13 @@ static: libEZ.a @@ -15,23 +15,19 @@ #---------------------------------------------------------------------------------- -@@ -94,21 +100,25 @@ +@@ -94,20 +100,19 @@ OBJ = $(SRC:.c=.o) libEZ.so.1.4: $(OBJ) - $(CC) -shared -o libEZ.so.1.4 $(OBJ) ../jpeg/*.o -+ $(CC) -shared -o libEZ.so.1.4 $(OBJ) -L${LOCALBASE}/lib -ljpeg ++ $(CC) -shared -o libEZ.so.1.4 $(OBJ) - /bin/rm -f libEZ.so libEZ.so.1 ln -s libEZ.so.1.4 libEZ.so ln -s libEZ.so.1.4 libEZ.so.1 -+libEZ.so.1: $(OBJ) -+ $(CC) -shared -Wl,-soname,$@ -o $@ $(OBJ) -+ - /bin/rm -f libEZ.so -+ ln -s $@ libEZ.so -+ libEZ.a: $(OBJ) - $(AR) r libEZ.a $(OBJ) +- $(AR) r libEZ.a $(OBJ) ../jpeg/*.o ++ $(AR) r libEZ.a $(OBJ) $(RANLIB) libEZ.a install-shared: shared @@ -39,15 +35,13 @@ - - /bin/rm -f $(LIBDIR)/libEZ.so $(LIBDIR)/libEZ.so.1 - ln -s $(LIBDIR)/libEZ.so.1.4 $(LIBDIR)/libEZ.so - ln -s $(LIBDIR)/libEZ.so.1.4 $(LIBDIR)/libEZ.so.1 -- - (lldconfig >/dev/null || /sbin/ldconfig) + cp $(SOLIB) $(LIBDIR) + - /bin/rm -f $(LIBDIR)/libEZ.so + ln -s $(LIBDIR)/$(SOLIB) $(LIBDIR)/libEZ.so -+ - (ldconfig >/dev/null || /sbin/ldconfig) + - (lldconfig >/dev/null || /sbin/ldconfig) install-static: shared - cp libEZ.a $(LIBDIR) -@@ -127,7 +137,7 @@ +@@ -127,7 +132,7 @@ $(CC) $(GLOB_OPTIONS) -c fnmatch.c EZ_Jpeg.o: EZ_Jpeg.c EZ_Widget.h diff -Nru EZWGL/pkg/PLIST EZWGL-1.40c/pkg/PLIST --- EZWGL/pkg/PLIST Sun Jan 3 02:22:27 1999 +++ EZWGL-1.40c/pkg/PLIST Sun Feb 14 13:36:34 1999 @@ -959,45 +959,6 @@ 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/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 >How-To-Repeat: >Fix: Please, check and apply this patch. >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199902141100.OAA16695>