From d0097f548c0ebaea41f1c7dfc3d0a10767d5cf8c Mon Sep 17 00:00:00 2001 From: Thomas Gellekum Date: Tue, 28 Apr 1998 11:50:20 +0000 Subject: [PATCH] Upgrade to 2.70.7.0. PR: 6435 Submitted by: Donald Burr --- graphics/xanim/Makefile | 13 +-- graphics/xanim/distinfo | 2 +- graphics/xanim/files/patch-ab | 141 ++++++++++++++------------------ multimedia/xanim/Makefile | 13 +-- multimedia/xanim/distinfo | 2 +- multimedia/xanim/files/patch-ab | 141 ++++++++++++++------------------ 6 files changed, 138 insertions(+), 174 deletions(-) diff --git a/graphics/xanim/Makefile b/graphics/xanim/Makefile index d259fc9c03a2..dc0b0d3d9564 100644 --- a/graphics/xanim/Makefile +++ b/graphics/xanim/Makefile @@ -3,16 +3,18 @@ # Date created: Sat Nov 5 11:43:03 PST 1994 # Whom: piero # -# $Id: Makefile,v 1.11 1996/12/07 01:06:25 asami Exp $ +# $Id: Makefile,v 1.12 1997/06/09 22:27:11 max Exp $ # -DISTNAME= xanim27064 -PKGNAME= xanim-2.70.6.4 +DISTNAME= xanim27070 +PKGNAME= xanim-2.70.7.0 CATEGORIES= graphics x11 -MASTER_SITES= ftp://xanim.va.pubnix.com/\ +MASTER_SITES= ftp://xanim.va.pubnix.com/ \ ftp://xanim.va.pubnix.com/modules/ DISTFILES= ${EXTRACT_ONLY} ${EXTRA_FILES} +MAINTAINER= ports@FreeBSD.ORG + EXTRACT_ONLY= ${DISTNAME}.tar.gz EXTRA_FILES= xa2.0_cvid_netbsd386.o.Z xa2.0_iv32_netbsd386.o.Z \ xa1.0_cyuv_netbsd386.o.Z @@ -22,8 +24,9 @@ MANCOMPRESSED= yes post-extract: @for file in ${EXTRA_FILES}; do \ - cp ${DISTDIR}/$$file ${WRKSRC}; \ + ${CP} ${DISTDIR}/$$file ${WRKSRC}; \ uncompress ${WRKSRC}/$$file; \ done + ${CP} ${WRKSRC}/docs/xanim.man ${WRKSRC} .include diff --git a/graphics/xanim/distinfo b/graphics/xanim/distinfo index 826c7a5f3271..a8bc3a99d636 100644 --- a/graphics/xanim/distinfo +++ b/graphics/xanim/distinfo @@ -1,4 +1,4 @@ -MD5 (xanim27064.tar.gz) = ce521899a41477016f2e90caf02ecaad +MD5 (xanim27070.tar.gz) = 768253a86b059b4d100e34c602931af6 MD5 (xa2.0_cvid_netbsd386.o.Z) = 80a70d69ea532c7f32a074381fff8468 MD5 (xa2.0_iv32_netbsd386.o.Z) = 1968c29d77e02c53df14bc4f2a29a1c0 MD5 (xa1.0_cyuv_netbsd386.o.Z) = 9f2d2b1a14f4518ffd02c0f45ccbf9e6 diff --git a/graphics/xanim/files/patch-ab b/graphics/xanim/files/patch-ab index 6342f770f7c7..500452bc82b4 100644 --- a/graphics/xanim/files/patch-ab +++ b/graphics/xanim/files/patch-ab @@ -1,82 +1,61 @@ -*** Imakefile.orig Mon Jan 27 01:22:08 1997 ---- Imakefile Tue Jun 10 07:12:07 1997 -*************** -*** 91,103 **** - XCOMM -- Indeo 3.x IV32 indeo.readme - XCOMM -- Creative CYUV creative.readme - XCOMM -! XCOMM XA_IV32_DEF = -DXA_INDEO -! XCOMM XA_CVID_DEF = -DXA_CINEPAK -! XCOMM XA_CYUV_DEF = -DXA_CYUV -! XCOMM -! XA_IV32_LIB = -! XA_CVID_LIB = -! XA_CYUV_LIB = - XCOMM - XCOMM -- NOTE: SGI Machines only: if you see an error like - XCOMM -- "merge_ext returns nil during relocation" or similiar ---- 91,103 ---- - XCOMM -- Indeo 3.x IV32 indeo.readme - XCOMM -- Creative CYUV creative.readme - XCOMM -! XA_IV32_DEF = -DXA_INDEO -! XA_CVID_DEF = -DXA_CINEPAK -! XA_CYUV_DEF = -DXA_CYUV -! XCOMM -! XA_IV32_LIB = xa2.0_cvid_netbsd386.o -! XA_CVID_LIB = xa2.0_iv32_netbsd386.o -! XA_CYUV_LIB = xa1.0_cyuv_netbsd386.o - XCOMM - XCOMM -- NOTE: SGI Machines only: if you see an error like - XCOMM -- "merge_ext returns nil during relocation" or similiar -*************** -*** 154,160 **** - XCOMM XA_AUDIO_DEFS = - XCOMM - XCOMM -- Sun Sparcs ----------------------------------------------------------- -! XA_AUDIO_DEFS = -DXA_SPARC_AUDIO - XCOMM - XCOMM NOTE: Imakefile should add the -DSVR4 to Sun Solaris machines, if not - XCOMM use the following: ---- 154,160 ---- - XCOMM XA_AUDIO_DEFS = - XCOMM - XCOMM -- Sun Sparcs ----------------------------------------------------------- -! XCOMM XA_AUDIO_DEFS = -DXA_SPARC_AUDIO - XCOMM - XCOMM NOTE: Imakefile should add the -DSVR4 to Sun Solaris machines, if not - XCOMM use the following: -*************** -*** 199,205 **** - XCOMM XA_MACH_LIBS = -lc - XCOMM - XCOMM -- Also FreeBSD, and BSDI with SBlast-BSD-1.5 (development stages)------- -! XCOMM XA_AUDIO_DEFS = -DXA_LINUX_AUDIO -DXA_LINUX_NEWER_SND - XCOMM XA_AUDIO_LIBS = -lc - XCOMM - XCOMM -- SGI Indigo ----------------------------------------------------------- ---- 199,205 ---- - XCOMM XA_MACH_LIBS = -lc - XCOMM - XCOMM -- Also FreeBSD, and BSDI with SBlast-BSD-1.5 (development stages)------- -! XA_AUDIO_DEFS = -DXA_LINUX_AUDIO -DXA_LINUX_NEWER_SND - XCOMM XA_AUDIO_LIBS = -lc - XCOMM - XCOMM -- SGI Indigo ----------------------------------------------------------- -*************** -*** 334,340 **** +--- Imakefile.old Tue Apr 28 02:39:31 1998 ++++ Imakefile Tue Apr 28 02:45:12 1998 +@@ -91,13 +91,13 @@ + XCOMM -- Indeo 3.x IV32 indeo.readme + XCOMM -- Creative CYUV creative.readme + XCOMM +-XCOMM XA_IV32_DEF = -DXA_INDEO +-XCOMM XA_CVID_DEF = -DXA_CINEPAK +-XCOMM XA_CYUV_DEF = -DXA_CYUV +-XCOMM +-XA_IV32_LIB = +-XA_CVID_LIB = +-XA_CYUV_LIB = ++XA_IV32_DEF = -DXA_INDEO ++XA_CVID_DEF = -DXA_CINEPAK ++XA_CYUV_DEF = -DXA_CYUV ++XCOMM ++XA_IV32_LIB = xa2.0_cvid_netbsd386.o ++XA_CVID_LIB = xa2.0_iv32_netbsd386.o ++XA_CYUV_LIB = xa1.0_cyuv_netbsd386.o + XCOMM + XCOMM NOTE: SGI Machines Only: + XCOMM if your linker core dumps then you'll need to uncomment the following +@@ -165,7 +165,7 @@ + XCOMM XA_AUDIO_DEFS = + XCOMM + XCOMM -- Sun Sparcs ----------------------------------------------------------- +-XA_AUDIO_DEFS = -DXA_SPARC_AUDIO ++XCOMM XA_AUDIO_DEFS = -DXA_SPARC_AUDIO + XCOMM + XCOMM NOTE: Imakefile should add the -DSVR4 to Sun Solaris machines, if not + XCOMM use the following: +@@ -210,8 +210,8 @@ + XCOMM XA_MACH_LIBS = -lc + XCOMM + XCOMM -- Also FreeBSD, and BSDI with SBlast-BSD-1.5 (development stages)------- +-XCOMM XA_AUDIO_DEFS = -DXA_LINUX_AUDIO -DXA_LINUX_NEWER_SND +-XCOMM XA_AUDIO_LIBS = -lc ++XA_AUDIO_DEFS = -DXA_LINUX_AUDIO -DXA_LINUX_NEWER_SND ++XA_AUDIO_LIBS = -lc + XCOMM + XCOMM -- SGI Indigo ----------------------------------------------------------- + XCOMM XA_AUDIO_DEFS = -DXA_SGI_AUDIO +@@ -325,7 +325,7 @@ + XCOMM -- following symbols(XmbufDisplayBuffers, XmbufQueryExtension, + XCOMM -- XmbufCreateBuffers). + XCOMM -- NOTE_7: HP-UX machines need to comment this out. +-XCOMM XA_MULTIBUF = -DXMBUF ++XA_MULTIBUF = -DXMBUF + XCOMM + XCOMM ******************** - PROGRAMS = xanim - -! INCLUDES = -I$(INCDIR) $(XA_INCS) - - - LIBS1 = $(XA_LIBS) $(EXTENSIONLIB) $(XTOOLLIB) $(XLIB) -lm ---- 334,340 ---- - - PROGRAMS = xanim - -! INCLUDES = -I$(INCDIR)/X11 $(XA_INCS) - - - LIBS1 = $(XA_LIBS) $(EXTENSIONLIB) $(XTOOLLIB) $(XLIB) -lm +@@ -345,7 +345,7 @@ + + PROGRAMS = xanim + +-INCLUDES = -I$(INCDIR) $(XA_INCS) ++INCLUDES = -I$(INCDIR)/X11 $(XA_INCS) + + + LIBS1 = $(XA_LIBS) $(EXTENSIONLIB) $(XTOOLLIB) $(XLIB) -lm diff --git a/multimedia/xanim/Makefile b/multimedia/xanim/Makefile index d259fc9c03a2..dc0b0d3d9564 100644 --- a/multimedia/xanim/Makefile +++ b/multimedia/xanim/Makefile @@ -3,16 +3,18 @@ # Date created: Sat Nov 5 11:43:03 PST 1994 # Whom: piero # -# $Id: Makefile,v 1.11 1996/12/07 01:06:25 asami Exp $ +# $Id: Makefile,v 1.12 1997/06/09 22:27:11 max Exp $ # -DISTNAME= xanim27064 -PKGNAME= xanim-2.70.6.4 +DISTNAME= xanim27070 +PKGNAME= xanim-2.70.7.0 CATEGORIES= graphics x11 -MASTER_SITES= ftp://xanim.va.pubnix.com/\ +MASTER_SITES= ftp://xanim.va.pubnix.com/ \ ftp://xanim.va.pubnix.com/modules/ DISTFILES= ${EXTRACT_ONLY} ${EXTRA_FILES} +MAINTAINER= ports@FreeBSD.ORG + EXTRACT_ONLY= ${DISTNAME}.tar.gz EXTRA_FILES= xa2.0_cvid_netbsd386.o.Z xa2.0_iv32_netbsd386.o.Z \ xa1.0_cyuv_netbsd386.o.Z @@ -22,8 +24,9 @@ MANCOMPRESSED= yes post-extract: @for file in ${EXTRA_FILES}; do \ - cp ${DISTDIR}/$$file ${WRKSRC}; \ + ${CP} ${DISTDIR}/$$file ${WRKSRC}; \ uncompress ${WRKSRC}/$$file; \ done + ${CP} ${WRKSRC}/docs/xanim.man ${WRKSRC} .include diff --git a/multimedia/xanim/distinfo b/multimedia/xanim/distinfo index 826c7a5f3271..a8bc3a99d636 100644 --- a/multimedia/xanim/distinfo +++ b/multimedia/xanim/distinfo @@ -1,4 +1,4 @@ -MD5 (xanim27064.tar.gz) = ce521899a41477016f2e90caf02ecaad +MD5 (xanim27070.tar.gz) = 768253a86b059b4d100e34c602931af6 MD5 (xa2.0_cvid_netbsd386.o.Z) = 80a70d69ea532c7f32a074381fff8468 MD5 (xa2.0_iv32_netbsd386.o.Z) = 1968c29d77e02c53df14bc4f2a29a1c0 MD5 (xa1.0_cyuv_netbsd386.o.Z) = 9f2d2b1a14f4518ffd02c0f45ccbf9e6 diff --git a/multimedia/xanim/files/patch-ab b/multimedia/xanim/files/patch-ab index 6342f770f7c7..500452bc82b4 100644 --- a/multimedia/xanim/files/patch-ab +++ b/multimedia/xanim/files/patch-ab @@ -1,82 +1,61 @@ -*** Imakefile.orig Mon Jan 27 01:22:08 1997 ---- Imakefile Tue Jun 10 07:12:07 1997 -*************** -*** 91,103 **** - XCOMM -- Indeo 3.x IV32 indeo.readme - XCOMM -- Creative CYUV creative.readme - XCOMM -! XCOMM XA_IV32_DEF = -DXA_INDEO -! XCOMM XA_CVID_DEF = -DXA_CINEPAK -! XCOMM XA_CYUV_DEF = -DXA_CYUV -! XCOMM -! XA_IV32_LIB = -! XA_CVID_LIB = -! XA_CYUV_LIB = - XCOMM - XCOMM -- NOTE: SGI Machines only: if you see an error like - XCOMM -- "merge_ext returns nil during relocation" or similiar ---- 91,103 ---- - XCOMM -- Indeo 3.x IV32 indeo.readme - XCOMM -- Creative CYUV creative.readme - XCOMM -! XA_IV32_DEF = -DXA_INDEO -! XA_CVID_DEF = -DXA_CINEPAK -! XA_CYUV_DEF = -DXA_CYUV -! XCOMM -! XA_IV32_LIB = xa2.0_cvid_netbsd386.o -! XA_CVID_LIB = xa2.0_iv32_netbsd386.o -! XA_CYUV_LIB = xa1.0_cyuv_netbsd386.o - XCOMM - XCOMM -- NOTE: SGI Machines only: if you see an error like - XCOMM -- "merge_ext returns nil during relocation" or similiar -*************** -*** 154,160 **** - XCOMM XA_AUDIO_DEFS = - XCOMM - XCOMM -- Sun Sparcs ----------------------------------------------------------- -! XA_AUDIO_DEFS = -DXA_SPARC_AUDIO - XCOMM - XCOMM NOTE: Imakefile should add the -DSVR4 to Sun Solaris machines, if not - XCOMM use the following: ---- 154,160 ---- - XCOMM XA_AUDIO_DEFS = - XCOMM - XCOMM -- Sun Sparcs ----------------------------------------------------------- -! XCOMM XA_AUDIO_DEFS = -DXA_SPARC_AUDIO - XCOMM - XCOMM NOTE: Imakefile should add the -DSVR4 to Sun Solaris machines, if not - XCOMM use the following: -*************** -*** 199,205 **** - XCOMM XA_MACH_LIBS = -lc - XCOMM - XCOMM -- Also FreeBSD, and BSDI with SBlast-BSD-1.5 (development stages)------- -! XCOMM XA_AUDIO_DEFS = -DXA_LINUX_AUDIO -DXA_LINUX_NEWER_SND - XCOMM XA_AUDIO_LIBS = -lc - XCOMM - XCOMM -- SGI Indigo ----------------------------------------------------------- ---- 199,205 ---- - XCOMM XA_MACH_LIBS = -lc - XCOMM - XCOMM -- Also FreeBSD, and BSDI with SBlast-BSD-1.5 (development stages)------- -! XA_AUDIO_DEFS = -DXA_LINUX_AUDIO -DXA_LINUX_NEWER_SND - XCOMM XA_AUDIO_LIBS = -lc - XCOMM - XCOMM -- SGI Indigo ----------------------------------------------------------- -*************** -*** 334,340 **** +--- Imakefile.old Tue Apr 28 02:39:31 1998 ++++ Imakefile Tue Apr 28 02:45:12 1998 +@@ -91,13 +91,13 @@ + XCOMM -- Indeo 3.x IV32 indeo.readme + XCOMM -- Creative CYUV creative.readme + XCOMM +-XCOMM XA_IV32_DEF = -DXA_INDEO +-XCOMM XA_CVID_DEF = -DXA_CINEPAK +-XCOMM XA_CYUV_DEF = -DXA_CYUV +-XCOMM +-XA_IV32_LIB = +-XA_CVID_LIB = +-XA_CYUV_LIB = ++XA_IV32_DEF = -DXA_INDEO ++XA_CVID_DEF = -DXA_CINEPAK ++XA_CYUV_DEF = -DXA_CYUV ++XCOMM ++XA_IV32_LIB = xa2.0_cvid_netbsd386.o ++XA_CVID_LIB = xa2.0_iv32_netbsd386.o ++XA_CYUV_LIB = xa1.0_cyuv_netbsd386.o + XCOMM + XCOMM NOTE: SGI Machines Only: + XCOMM if your linker core dumps then you'll need to uncomment the following +@@ -165,7 +165,7 @@ + XCOMM XA_AUDIO_DEFS = + XCOMM + XCOMM -- Sun Sparcs ----------------------------------------------------------- +-XA_AUDIO_DEFS = -DXA_SPARC_AUDIO ++XCOMM XA_AUDIO_DEFS = -DXA_SPARC_AUDIO + XCOMM + XCOMM NOTE: Imakefile should add the -DSVR4 to Sun Solaris machines, if not + XCOMM use the following: +@@ -210,8 +210,8 @@ + XCOMM XA_MACH_LIBS = -lc + XCOMM + XCOMM -- Also FreeBSD, and BSDI with SBlast-BSD-1.5 (development stages)------- +-XCOMM XA_AUDIO_DEFS = -DXA_LINUX_AUDIO -DXA_LINUX_NEWER_SND +-XCOMM XA_AUDIO_LIBS = -lc ++XA_AUDIO_DEFS = -DXA_LINUX_AUDIO -DXA_LINUX_NEWER_SND ++XA_AUDIO_LIBS = -lc + XCOMM + XCOMM -- SGI Indigo ----------------------------------------------------------- + XCOMM XA_AUDIO_DEFS = -DXA_SGI_AUDIO +@@ -325,7 +325,7 @@ + XCOMM -- following symbols(XmbufDisplayBuffers, XmbufQueryExtension, + XCOMM -- XmbufCreateBuffers). + XCOMM -- NOTE_7: HP-UX machines need to comment this out. +-XCOMM XA_MULTIBUF = -DXMBUF ++XA_MULTIBUF = -DXMBUF + XCOMM + XCOMM ******************** - PROGRAMS = xanim - -! INCLUDES = -I$(INCDIR) $(XA_INCS) - - - LIBS1 = $(XA_LIBS) $(EXTENSIONLIB) $(XTOOLLIB) $(XLIB) -lm ---- 334,340 ---- - - PROGRAMS = xanim - -! INCLUDES = -I$(INCDIR)/X11 $(XA_INCS) - - - LIBS1 = $(XA_LIBS) $(EXTENSIONLIB) $(XTOOLLIB) $(XLIB) -lm +@@ -345,7 +345,7 @@ + + PROGRAMS = xanim + +-INCLUDES = -I$(INCDIR) $(XA_INCS) ++INCLUDES = -I$(INCDIR)/X11 $(XA_INCS) + + + LIBS1 = $(XA_LIBS) $(EXTENSIONLIB) $(XTOOLLIB) $(XLIB) -lm