Date: Mon, 20 Apr 2020 20:07:21 +0000 (UTC) From: Ryan Steinmetz <zi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r532226 - in head/multimedia/oscam: . files Message-ID: <202004202007.03KK7L8k017171@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: zi Date: Mon Apr 20 20:07:20 2020 New Revision: 532226 URL: https://svnweb.freebsd.org/changeset/ports/532226 Log: - Update to 1.20.20200313 (convert to using snapshots) - Add LICENSE - Unbreak PR: 244817 Submitted by: daniel.engberg.lists@pyret.net Approved by: Franz Bettag <franz@bett.ag> (maintainer) Deleted: head/multimedia/oscam/files/patch-Makefile.extra head/multimedia/oscam/files/patch-module-dvbapi.c head/multimedia/oscam/files/patch-module-webif-lib.c Modified: head/multimedia/oscam/Makefile head/multimedia/oscam/distinfo (contents, props changed) head/multimedia/oscam/files/patch-config.h head/multimedia/oscam/files/patch-globals.h (contents, props changed) head/multimedia/oscam/pkg-descr (contents, props changed) Modified: head/multimedia/oscam/Makefile ============================================================================== --- head/multimedia/oscam/Makefile Mon Apr 20 20:01:49 2020 (r532225) +++ head/multimedia/oscam/Makefile Mon Apr 20 20:07:20 2020 (r532226) @@ -2,51 +2,44 @@ # $FreeBSD$ PORTNAME= oscam -PORTVERSION= 1.20 -PORTREVISION= 1 +PORTVERSION= 1.20.20200313 CATEGORIES= multimedia -MASTER_SITES= http://el8.nl/~fbettag/oscam/ +MASTER_SITES= https://repo.or.cz/oscam.git/snapshot/7f322cc2cd840f4197488a3ead2c3e48b51e8278.tar.gz?/ MAINTAINER= franz@bett.ag -COMMENT= Softcam software to decrypt digital tv channels +COMMENT= Softcam software to decrypt digital TV channels LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/COPYING -USES= compiler gmake ssl tar:bzip2 +LIB_DEPENDS= libpcsclite.so:devel/pcsc-lite + +USES= gmake localbase ssl USE_RC_SUBR= oscam -.if target(gen-dist) -FETCH_DEPENDS+= svn:devel/subversion -.endif -SVN_REV= 11062 -SVN_SRC= http://www.streamboard.tv/svn/oscam/trunk - OPTIONS_DEFINE= EXAMPLES +MAKE_ARGS= CC="${CC}" HOSTCC="${CC}" \ + USE_LIBCRYPTO=1 USE_LIBUSB=1 USE_PCSC=1 USE_SSL=1 \ + USE_UTF8=1 LIBUSB_LIB=-lusb \ + OSCAM_BIN="Distribution/oscam" CONF_DIR="${PREFIX}/etc/oscam" \ + V=1 + +WRKSRC= ${WRKDIR}/${PORTNAME}-7f322cc + .include <bsd.port.pre.mk> -.if ${SSL_DEFAULT} == base -BROKEN_FreeBSD_12= field has incomplete type 'BIGNUM' (aka 'struct bignum_st') -BROKEN_FreeBSD_13= field has incomplete type 'BIGNUM' (aka 'struct bignum_st') +.if ${ARCH:Mmips*} +USE_GCC= yes .endif -.if ${CHOSEN_COMPILER_TYPE} == clang -MAKE_ARGS+= HOSTCC=clang CC=clang -.endif - do-install: - ${RM} ${WRKSRC}/Distribution/*.debug - ${INSTALL_PROGRAM} ${WRKSRC}/Distribution/${PORTNAME}-${PORTVERSION}-* ${STAGEDIR}${PREFIX}/bin/oscam + ${INSTALL_PROGRAM} ${WRKSRC}/Distribution/oscam ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_MAN} ${WRKSRC}/Distribution/doc/man/*.1 ${STAGEDIR}${PREFIX}/man/man1/ ${INSTALL_MAN} ${WRKSRC}/Distribution/doc/man/*.5 ${STAGEDIR}${PREFIX}/man/man5/ do-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/ ${INSTALL_DATA} ${WRKSRC}/Distribution/doc/example/* ${STAGEDIR}${EXAMPLESDIR}/ - -gen-dist: - ${MKDIR} ${WRKDIR} - svn export --force -r ${SVN_REV} ${SVN_SRC} ${WRKSRC} - ${TAR} -cvy -C ${WRKDIR} -f ${DISTDIR}/${DISTNAME}.tar.bz2 ${DISTNAME} .include <bsd.port.post.mk> Modified: head/multimedia/oscam/distinfo ============================================================================== --- head/multimedia/oscam/distinfo Mon Apr 20 20:01:49 2020 (r532225) +++ head/multimedia/oscam/distinfo Mon Apr 20 20:07:20 2020 (r532226) @@ -1,2 +1,3 @@ -SHA256 (oscam-1.20.tar.bz2) = a5b5be89bfca069ae2317f9a0590cf984d839b3b7030647eb0e8bbbb60c75eeb -SIZE (oscam-1.20.tar.bz2) = 977098 +TIMESTAMP = 1584349871 +SHA256 (oscam-1.20.20200313.tar.gz) = ad22b199afb4b5f446220287df6e378d416921096b3c567ca4f6e76c91fcf516 +SIZE (oscam-1.20.20200313.tar.gz) = 1264325 Modified: head/multimedia/oscam/files/patch-config.h ============================================================================== --- head/multimedia/oscam/files/patch-config.h Mon Apr 20 20:01:49 2020 (r532225) +++ head/multimedia/oscam/files/patch-config.h Mon Apr 20 20:07:20 2020 (r532226) @@ -1,41 +1,11 @@ ---- config.h.orig 2015-09-30 21:11:35 UTC +--- config.h.orig 2020-03-14 17:14:49 UTC +++ config.h -@@ -5,10 +5,8 @@ - #define WEBIF_LIVELOG 1 - #define WEBIF_JQUERY 1 - #define TOUCH 1 --//#define WITH_SSL 1 --#if defined(__linux__) || defined(__CYGWIN__) -+#define WITH_SSL 1 - #define HAVE_DVBAPI 1 --#endif - #define READ_SDT_CHARSETS 1 - #define CLOCKFIX 1 - #define IRDETO_GUESSING 1 -@@ -23,18 +21,18 @@ - #define MODULE_MONITOR 1 +@@ -34,7 +34,7 @@ + //#define MODULE_SERIAL 1 + //#define MODULE_CONSTCW 1 + //#define MODULE_PANDORA 1 +-//#define MODULE_GHTTP 1 ++#define MODULE_GHTTP 1 + #define MODULE_SCAM 1 - //#define MODULE_CAMD33 1 --#define MODULE_CAMD35 1 --#define MODULE_CAMD35_TCP 1 -+//#define MODULE_CAMD35 1 -+//#define MODULE_CAMD35_TCP 1 - #define MODULE_NEWCAMD 1 - #define MODULE_CCCAM 1 - #define MODULE_CCCSHARE 1 --#define MODULE_GBOX 1 --#define MODULE_RADEGAST 1 --#define MODULE_SERIAL 1 -+//#define MODULE_GBOX 1 -+//#define MODULE_RADEGAST 1 -+//#define MODULE_SERIAL 1 - #define MODULE_CONSTCW 1 --#define MODULE_PANDORA 1 --#define MODULE_GHTTP 1 --#define MODULE_SCAM 1 -+//#define MODULE_PANDORA 1 -+//#define MODULE_GHTTP 1 -+//#define MODULE_SCAM 1 - #define WITH_CARDREADER 1 - Modified: head/multimedia/oscam/files/patch-globals.h ============================================================================== --- head/multimedia/oscam/files/patch-globals.h Mon Apr 20 20:01:49 2020 (r532225) +++ head/multimedia/oscam/files/patch-globals.h Mon Apr 20 20:07:20 2020 (r532226) @@ -1,21 +1,10 @@ ---- globals.h.orig 2015-09-28 21:33:12 UTC +--- globals.h.orig 2020-03-14 15:56:57 UTC +++ globals.h -@@ -124,6 +124,18 @@ typedef unsigned char uchar; - #define DEFAULT_AF AF_INET - #endif +@@ -36,7 +36,6 @@ + #include <termios.h> + #include <inttypes.h> + #include <sys/utsname.h> +-#include <sys/sysmacros.h> -+#ifdef IPV6SUPPORT -+#if !defined s6_addr32 && defined __sun__ -+# define s6_addr32 _S6_un._S6_u32 -+#elif !defined s6_addr32 && ( defined __OpenBSD__ || defined __FreeBSD__ ) -+# define s6_addr32 __u6_addr.__u6_addr32 -+#endif /* !defined s6_addr32 */ -+#endif -+ -+#ifndef SOL_TCP -+# define SOL_TCP IPPROTO_TCP -+#endif -+ - #ifndef NO_ENDIAN_H - #if defined(__APPLE__) - #include <machine/endian.h> + /* + * The following hack is taken from Linux: include/linux/kconfig.h Modified: head/multimedia/oscam/pkg-descr ============================================================================== --- head/multimedia/oscam/pkg-descr Mon Apr 20 20:01:49 2020 (r532225) +++ head/multimedia/oscam/pkg-descr Mon Apr 20 20:07:20 2020 (r532226) @@ -1,5 +1,5 @@ -OScam is a softcam, software to be used to decrypt digital television channels -on a settopbox (receiver), as an alternative for a conditional access module -(CAM). OScam is, compared with other softcams (CCcam, mgcamd, etc.), open source +OSCam is a softcam, software to be used to decrypt digital television channels +on a set-top box (receiver), as an alternative for a conditional access module +(CAM). OSCam is, compared with other softcams (CCcam, mgcamd, etc.), open source WWW: http://www.streamboard.tv/oscam/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004202007.03KK7L8k017171>