[Midnightbsd-cvs] mports [17302] trunk/multimedia/xanim: update license
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon Sep 15 08:07:27 EDT 2014
Revision: 17302
http://svnweb.midnightbsd.org/mports/?rev=17302
Author: laffer1
Date: 2014-09-15 08:07:27 -0400 (Mon, 15 Sep 2014)
Log Message:
-----------
update license
Modified Paths:
--------------
trunk/multimedia/xanim/Makefile
trunk/multimedia/xanim/distinfo
Added Paths:
-----------
trunk/multimedia/xanim/files/patch-Imakefile
trunk/multimedia/xanim/files/patch-xa_input.c
Removed Paths:
-------------
trunk/multimedia/xanim/files/patch-ab
Modified: trunk/multimedia/xanim/Makefile
===================================================================
--- trunk/multimedia/xanim/Makefile 2014-09-15 12:01:00 UTC (rev 17301)
+++ trunk/multimedia/xanim/Makefile 2014-09-15 12:07:27 UTC (rev 17302)
@@ -2,11 +2,11 @@
PORTNAME= xanim
PORTVERSION= 2.92.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia graphics
-MASTER_SITES= ftp://ftp.informatik.uni-hamburg.de/pub/soft/graphics/xanim/:main \
+MASTER_SITES= ftp://ftp.nstu.ru/pub/mirrors/xanim.va.pubnix.com/ \
${MASTER_SITE_FREEBSD_LOCAL} \
- ftp://ftp.informatik.uni-hamburg.de/pub/soft/graphics/xanim/dlls/
+ ftp://ftp.nstu.ru/pub/mirrors/xanim.va.pubnix.com/dlls/
MASTER_SITE_SUBDIR= dinoex
DISTNAME= xanim2920
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:main ${EXTRA_FILES}
@@ -13,15 +13,22 @@
MAINTAINER= ports at MidnightBSD.org
COMMENT= Play most popular animation formats and show pictures
-LICENSE= restricted
-NO_CDROM= no distribution without fee on CD.
-USE_IMAKE= yes
+LICENSE= xanim
+LICENSE_NAME= xanim license
+LICENSE_FILE= ${WRKSRC}/docs/Copyright
+LICENSE_PERMS= dist-mirror pkg-mirror
+
+NO_CDROM= Must be redistributed without fee
+
+# clang's cpp destroys whitespace, particularly hard tabs in makefiles,
+# which is fatal for imake.
+USES= imake
+USE_GCC= any
USE_XORG= xext xt sm ice xext x11
-MAN1= xanim.1
MAKE_ARGS+= -j 2 # safe and helps even the single-CPU machines
DLLDIR= ${PREFIX}/lib/X11/xanim
-PLIST_FILES+= bin/xanim
+PLIST_FILES+= bin/xanim man/man1/xanim.1.gz
post-extract:
${CP} ${WRKSRC}/docs/xanim.man ${WRKSRC}
Modified: trunk/multimedia/xanim/distinfo
===================================================================
--- trunk/multimedia/xanim/distinfo 2014-09-15 12:01:00 UTC (rev 17301)
+++ trunk/multimedia/xanim/distinfo 2014-09-15 12:07:27 UTC (rev 17302)
@@ -1,32 +1,16 @@
-MD5 (xanim2920.tar.gz) = 3613e6256857f7270d39bba8efd3a5dc
SHA256 (xanim2920.tar.gz) = 60f6565cd8828a6c96bfc0e3cc5af69f13e3b116375c0aea3cfa511ec4842e67
-RMD160 (xanim2920.tar.gz) = dae33cdbd9f20388a067df8269b625f2594cdfb9
SIZE (xanim2920.tar.gz) = 431258
-MD5 (vid_cvid_2.1_freebsdELFx86.tgz) = 964ac87b45c85c97d4c86a5f98fbbf71
SHA256 (vid_cvid_2.1_freebsdELFx86.tgz) = 65fae22d0d0a3a7394c39cd04221e822722408230ded48729d91d071daba0b54
-RMD160 (vid_cvid_2.1_freebsdELFx86.tgz) = db164e8077783e2516e34b5454ab6480cdfdc583
SIZE (vid_cvid_2.1_freebsdELFx86.tgz) = 6066
-MD5 (vid_cyuv_1.0_freebsdELFx86.tgz) = ccdf14f08c9e989f18e25eb06a5053b7
SHA256 (vid_cyuv_1.0_freebsdELFx86.tgz) = f85b35d6ce84901c0e1a4ed767348ecdd84d8037d1ce254b8726997843c55085
-RMD160 (vid_cyuv_1.0_freebsdELFx86.tgz) = ce74a90ce0f0bd36da4bb8e8092622b7253b1aa5
SIZE (vid_cyuv_1.0_freebsdELFx86.tgz) = 3548
-MD5 (vid_h261_1.0_freebsdELFx86.tgz) = 7b5ee2ea93e365fd12efcb29321720bd
SHA256 (vid_h261_1.0_freebsdELFx86.tgz) = b5ba59db8ba0ab1e59e8338ec1e60747e2786988f4c30c0dbcf04d6421857cb6
-RMD160 (vid_h261_1.0_freebsdELFx86.tgz) = 1111ab5ea1f6398eacb2e85d92d12857eef254ae
SIZE (vid_h261_1.0_freebsdELFx86.tgz) = 29441
-MD5 (vid_h263_1.0_freebsdELFx86.tgz) = 8c9b389944ee853b7b3469bde714729b
SHA256 (vid_h263_1.0_freebsdELFx86.tgz) = da1cb6df55c09a31dc41500c648682078d84cdbfc72a2a310fe606571792c1ae
-RMD160 (vid_h263_1.0_freebsdELFx86.tgz) = aad316d632a8808112ef671099a7e85a0bbfb105
SIZE (vid_h263_1.0_freebsdELFx86.tgz) = 60100
-MD5 (vid_iv32_2.1_freebsdELFx86.tgz) = 04ae2a4e86f28927e9d4adc1bf143861
SHA256 (vid_iv32_2.1_freebsdELFx86.tgz) = b65bfa30a11d7dc463a6f9338847165afa20ab556629085b9cd7333100a63131
-RMD160 (vid_iv32_2.1_freebsdELFx86.tgz) = e26020ac0e8b4f4b70784303954d6d87cf8f00e8
SIZE (vid_iv32_2.1_freebsdELFx86.tgz) = 31204
-MD5 (vid_iv41_1.1_freebsdELFx86.tgz) = f2b3f2bc8e6763581a2c8aceba632930
SHA256 (vid_iv41_1.1_freebsdELFx86.tgz) = de4893a264caf0e4bed5f95938d8a3b4f7960f3f29ad4b17e349765ba582d434
-RMD160 (vid_iv41_1.1_freebsdELFx86.tgz) = d12dff179565fe0fdfd7a9853d2b1c34ac1496da
SIZE (vid_iv41_1.1_freebsdELFx86.tgz) = 60444
-MD5 (vid_iv50_1.0_freebsdELFx86.tgz) = 47b8ec7a998386807b564666c6b0ea34
SHA256 (vid_iv50_1.0_freebsdELFx86.tgz) = b32f85b434a4c2b07a6cffb3f9295e885f7527a5cfd610628e35efbeccac52cc
-RMD160 (vid_iv50_1.0_freebsdELFx86.tgz) = 9bcd355cdddba36d1b4f92cc53a5af1413211fe4
SIZE (vid_iv50_1.0_freebsdELFx86.tgz) = 37813
Copied: trunk/multimedia/xanim/files/patch-Imakefile (from rev 17107, trunk/multimedia/xanim/files/patch-ab)
===================================================================
--- trunk/multimedia/xanim/files/patch-Imakefile (rev 0)
+++ trunk/multimedia/xanim/files/patch-Imakefile 2014-09-15 12:07:27 UTC (rev 17302)
@@ -0,0 +1,80 @@
+--- Imakefile.orig Sun Apr 21 01:25:06 2002
++++ Imakefile Thu Jan 2 07:53:41 2003
+@@ -96,7 +96,7 @@
+ XCOMM to link against symbols inside xanim.
+ XCOMM
+ XCOMM ## Linux
+-XCOMM LD_FLAGS = -rdynamic
++LD_FLAGS = -rdynamic
+ XCOMM
+ XCOMM ## SunOS/Solaris use:
+ XCOMM LD_FLAGS =
+@@ -112,7 +112,7 @@
+ XCOMM NOTE: not all machines need the XA_DLL_LIB define.
+ XCOMM #########################################################################
+ XCOMM
+-XCOMM XA_DLL_DEF = -DXA_DLL -DXA_PRINT
++XA_DLL_DEF = -DXA_DLL -DXA_PRINT
+ XCOMM ### Use this only if the above doesn't work
+ XCOMM XA_DLL_DEF = -DXA_DLL
+ XCOMM
+@@ -120,14 +120,14 @@
+ XCOMM XA_DLL_LIB = -ldl
+ XCOMM
+ XCOMM HP/UX should use the following:
+-XA_DLL_DEF = -DXA_HPDLL
+-XA_DLL_LIB = -Wl,-E -ldld
++XCOMM XA_DLL_DEF = -DXA_HPDLL
++XCOMM XA_DLL_LIB = -Wl,-E -ldld
+ XCOMM
+ XCOMM
+ XCOMM If you'd like to change the default directory that XAnim searches while
+ XCOMM looking for dlls, then change the directory below.
+ XCOMM
+-XA_DLL_PATH = /usr/local/xanim/mods
++XA_DLL_PATH = $(LIBDIR)/xanim
+
+
+ XCOMM #########################################################################
+@@ -319,8 +319,8 @@
+ XCOMM XA_AUDIO_LIBS = -lc
+ XCOMM
+ XCOMM -- Also FreeBSD, and BSDI with SBlast-BSD-1.5 (development stages)------
+-XCOMM XA_AUDIO_DEFS = -DXA_LINUX_AUDIO
+-XCOMM XA_AUDIO_LIBS = -lc
++XA_AUDIO_DEFS = -DXA_LINUX_AUDIO
++XA_AUDIO_LIBS = -lc
+ XCOMM
+ XCOMM -- TOWNS Linux 16 bit PCM ----------------------------------------------
+ XCOMM XA_AUDIO_DEFS = -DXA_TOWNS_AUDIO
+@@ -351,9 +351,9 @@
+ XCOMM XA_AUDIO_LIBS = -lAlib
+ XCOMM --
+ XCOMM -- HP/UX 10.x AServer
+-XA_AUDIO_DEFS = -DXA_HP_AUDIO -DXA_HP10
+-XA_AUDIO_LIBS = -L/opt/audio/lib -lAlib
+-XA_AUDIO_INCS = -I/opt/audio/include
++XCOMM XA_AUDIO_DEFS = -DXA_HP_AUDIO -DXA_HP10
++XCOMM XA_AUDIO_LIBS = -L/opt/audio/lib -lAlib
++XCOMM XA_AUDIO_INCS = -I/opt/audio/include
+ XCOMM
+ XCOMM ------ AF (AudioFile) Support ------------------------------------------
+ XCOMM -- You need to indicate where the AF libraries libAFUtil.a and libAF.a
+@@ -447,7 +447,7 @@
+ XCOMM -- following symbols(XmbufDisplayBuffers, XmbufQueryExtension,
+ XCOMM -- XmbufCreateBuffers).
+ XCOMM -- NOTE_8: HP-UX machines need to comment this out.
+-XCOMM XA_MULTIBUF = -DXMBUF
++XA_MULTIBUF = -DXMBUF
+ XCOMM
+ XCOMM ###########
+ XCOMM
+@@ -470,7 +470,7 @@
+
+ PROGRAMS = $(XANIM)
+
+-INCLUDES = -I$(INCDIR) $(XA_INCS)
++INCLUDES = -I$(INCDIR)/X11 $(XA_INCS)
+
+ LIBS1 = $(XA_LIBS) $(EXTENSIONLIB) $(XTOOLLIB) $(XLIB) -lm
+ DEPLIBS1 = $(DEPEXTENSIONLIB) $(DEPXTOOLLIB) $(DEPXLIB)
Deleted: trunk/multimedia/xanim/files/patch-ab
===================================================================
--- trunk/multimedia/xanim/files/patch-ab 2014-09-15 12:01:00 UTC (rev 17301)
+++ trunk/multimedia/xanim/files/patch-ab 2014-09-15 12:07:27 UTC (rev 17302)
@@ -1,80 +0,0 @@
---- Imakefile.orig Sun Apr 21 01:25:06 2002
-+++ Imakefile Thu Jan 2 07:53:41 2003
-@@ -96,7 +96,7 @@
- XCOMM to link against symbols inside xanim.
- XCOMM
- XCOMM ## Linux
--XCOMM LD_FLAGS = -rdynamic
-+LD_FLAGS = -rdynamic
- XCOMM
- XCOMM ## SunOS/Solaris use:
- XCOMM LD_FLAGS =
-@@ -112,7 +112,7 @@
- XCOMM NOTE: not all machines need the XA_DLL_LIB define.
- XCOMM #########################################################################
- XCOMM
--XCOMM XA_DLL_DEF = -DXA_DLL -DXA_PRINT
-+XA_DLL_DEF = -DXA_DLL -DXA_PRINT
- XCOMM ### Use this only if the above doesn't work
- XCOMM XA_DLL_DEF = -DXA_DLL
- XCOMM
-@@ -120,14 +120,14 @@
- XCOMM XA_DLL_LIB = -ldl
- XCOMM
- XCOMM HP/UX should use the following:
--XA_DLL_DEF = -DXA_HPDLL
--XA_DLL_LIB = -Wl,-E -ldld
-+XCOMM XA_DLL_DEF = -DXA_HPDLL
-+XCOMM XA_DLL_LIB = -Wl,-E -ldld
- XCOMM
- XCOMM
- XCOMM If you'd like to change the default directory that XAnim searches while
- XCOMM looking for dlls, then change the directory below.
- XCOMM
--XA_DLL_PATH = /usr/local/xanim/mods
-+XA_DLL_PATH = $(LIBDIR)/xanim
-
-
- XCOMM #########################################################################
-@@ -319,8 +319,8 @@
- XCOMM XA_AUDIO_LIBS = -lc
- XCOMM
- XCOMM -- Also FreeBSD, and BSDI with SBlast-BSD-1.5 (development stages)------
--XCOMM XA_AUDIO_DEFS = -DXA_LINUX_AUDIO
--XCOMM XA_AUDIO_LIBS = -lc
-+XA_AUDIO_DEFS = -DXA_LINUX_AUDIO
-+XA_AUDIO_LIBS = -lc
- XCOMM
- XCOMM -- TOWNS Linux 16 bit PCM ----------------------------------------------
- XCOMM XA_AUDIO_DEFS = -DXA_TOWNS_AUDIO
-@@ -351,9 +351,9 @@
- XCOMM XA_AUDIO_LIBS = -lAlib
- XCOMM --
- XCOMM -- HP/UX 10.x AServer
--XA_AUDIO_DEFS = -DXA_HP_AUDIO -DXA_HP10
--XA_AUDIO_LIBS = -L/opt/audio/lib -lAlib
--XA_AUDIO_INCS = -I/opt/audio/include
-+XCOMM XA_AUDIO_DEFS = -DXA_HP_AUDIO -DXA_HP10
-+XCOMM XA_AUDIO_LIBS = -L/opt/audio/lib -lAlib
-+XCOMM XA_AUDIO_INCS = -I/opt/audio/include
- XCOMM
- XCOMM ------ AF (AudioFile) Support ------------------------------------------
- XCOMM -- You need to indicate where the AF libraries libAFUtil.a and libAF.a
-@@ -447,7 +447,7 @@
- XCOMM -- following symbols(XmbufDisplayBuffers, XmbufQueryExtension,
- XCOMM -- XmbufCreateBuffers).
- XCOMM -- NOTE_8: HP-UX machines need to comment this out.
--XCOMM XA_MULTIBUF = -DXMBUF
-+XA_MULTIBUF = -DXMBUF
- XCOMM
- XCOMM ###########
- XCOMM
-@@ -470,7 +470,7 @@
-
- PROGRAMS = $(XANIM)
-
--INCLUDES = -I$(INCDIR) $(XA_INCS)
-+INCLUDES = -I$(INCDIR)/X11 $(XA_INCS)
-
- LIBS1 = $(XA_LIBS) $(EXTENSIONLIB) $(XTOOLLIB) $(XLIB) -lm
- DEPLIBS1 = $(DEPEXTENSIONLIB) $(DEPXTOOLLIB) $(DEPXLIB)
Added: trunk/multimedia/xanim/files/patch-xa_input.c
===================================================================
--- trunk/multimedia/xanim/files/patch-xa_input.c (rev 0)
+++ trunk/multimedia/xanim/files/patch-xa_input.c 2014-09-15 12:07:27 UTC (rev 17302)
@@ -0,0 +1,57 @@
+--- xa_input.c.orig Sun Mar 21 23:36:25 1999
++++ xa_input.c Thu Jun 7 15:02:43 2007
+@@ -1025,28 +1025,28 @@
+ memset(&data,0,sizeof(data));
+ memset(&from,0,sizeof(from));
+ if (gethostname(hostname, sizeof(hostname)) < 0)
+- return(xa_ftp_abort(xin));
++ return(xa_ftp_abort(*xin));
+ if ((host= (struct hostent *)gethostbyname(hostname)) == 0)
+- return(xa_ftp_abort(xin));
++ return(xa_ftp_abort(*xin));
+ data.sin_family = host->h_addrtype;
+ memcpy( (char *)&data.sin_addr, (char *)host->h_addr_list[0], host->h_length);
+ if ((tmp_sock = socket ( AF_INET , SOCK_STREAM , 0 )) < 0)
+- return(xa_ftp_abort(xin));
++ return(xa_ftp_abort(*xin));
+ len = 1;
+ if (setsockopt(tmp_sock, SOL_SOCKET, SO_REUSEADDR,
+ (char *)(&len), sizeof(len)) < 0)
+- { close(tmp_sock); return(xa_ftp_abort(xin)); }
++ { close(tmp_sock); return(xa_ftp_abort(*xin)); }
+
+ data.sin_port = 0;
+ if ( bind(tmp_sock, (struct sockaddr *)&data, sizeof(data)) < 0 )
+- { close(tmp_sock); return(xa_ftp_abort(xin)); }
++ { close(tmp_sock); return(xa_ftp_abort(*xin)); }
+
+ len = sizeof(data);
+ if (getsockname(tmp_sock, (struct sockaddr *)&data, &len) < 0 )
+- { close(tmp_sock); return(xa_ftp_abort(xin)); }
++ { close(tmp_sock); return(xa_ftp_abort(*xin)); }
+
+ if (listen(tmp_sock, 4) < 0 )
+- { close(tmp_sock); return(xa_ftp_abort(xin)); }
++ { close(tmp_sock); return(xa_ftp_abort(*xin)); }
+
+ /* POD add support for PORT command? */
+ addr = (xaUBYTE *) (&data.sin_addr);
+@@ -1059,15 +1059,15 @@
+
+ if (xa_ftp_send_cmd(xin, port_cmd, &retcode) == xaFALSE)
+ { fprintf(stderr,"FTP: send cmd err\n");
+- close(tmp_sock); return(xa_ftp_abort(xin)); }
++ close(tmp_sock); return(xa_ftp_abort(*xin)); }
+
+ if (xa_ftp_send_cmd(xin, file_cmd, &retcode) == xaFALSE)
+ { fprintf(stderr,"FTP: send cmd err\n");
+- close(tmp_sock); return(xa_ftp_abort(xin)); }
++ close(tmp_sock); return(xa_ftp_abort(*xin)); }
+
+ len = sizeof(from);
+ xin->dsock = accept((int)tmp_sock, (struct sockaddr *) &from, (int *)&len);
+- if (xin->dsock < 0) { close(tmp_sock); return(xa_ftp_abort(xin)); }
++ if (xin->dsock < 0) { close(tmp_sock); return(xa_ftp_abort(*xin)); }
+ close(tmp_sock);
+ return(xaTRUE);
+ }
More information about the Midnightbsd-cvs
mailing list