From owner-svn-ports-head@freebsd.org Thu Mar 26 19:46:53 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CCC422A7DFA; Thu, 26 Mar 2020 19:46:52 +0000 (UTC) (envelope-from db@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48pFqb6HJKz3K0Y; Thu, 26 Mar 2020 19:46:51 +0000 (UTC) (envelope-from db@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A3C0ABEE5; Thu, 26 Mar 2020 19:46:44 +0000 (UTC) (envelope-from db@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02QJkiRT093678; Thu, 26 Mar 2020 19:46:44 GMT (envelope-from db@FreeBSD.org) Received: (from db@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02QJkiOv093676; Thu, 26 Mar 2020 19:46:44 GMT (envelope-from db@FreeBSD.org) Message-Id: <202003261946.02QJkiOv093676@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: db set sender to db@FreeBSD.org using -f From: Diane Bruce Date: Thu, 26 Mar 2020 19:46:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r529209 - in head/comms/ebook2cw: . files X-SVN-Group: ports-head X-SVN-Commit-Author: db X-SVN-Commit-Paths: in head/comms/ebook2cw: . files X-SVN-Commit-Revision: 529209 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Mar 2020 19:46:53 -0000 Author: db Date: Thu Mar 26 19:46:43 2020 New Revision: 529209 URL: https://svnweb.freebsd.org/changeset/ports/529209 Log: - Pet porlint - strip binary - regenerate Makefile patch Modified: head/comms/ebook2cw/Makefile head/comms/ebook2cw/files/patch-Makefile (contents, props changed) Modified: head/comms/ebook2cw/Makefile ============================================================================== --- head/comms/ebook2cw/Makefile Thu Mar 26 19:22:41 2020 (r529208) +++ head/comms/ebook2cw/Makefile Thu Mar 26 19:46:43 2020 (r529209) @@ -2,7 +2,7 @@ PORTNAME= ebook2cw PORTVERSION= 0.8.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= comms hamradio MASTER_SITES= http://fkurz.net/ham/ebook2cw/ \ LOCAL/db @@ -13,6 +13,7 @@ COMMENT= Convert text files into cw as an mp3 or ogg f LICENSE= GPLv2 LIB_DEPENDS= libmp3lame.so:audio/lame \ + libogg.so:audio/libogg \ libvorbis.so:audio/libvorbis OPTIONS_DEFINE= DOCS EXAMPLES @@ -24,6 +25,7 @@ post-patch: ${WRKSRC}/Makefile do-install: ${INSTALL_SCRIPT} ${WRKSRC}/ebook2cw ${STAGEDIR}${PREFIX}/bin/ebook2cw + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ebook2cw ${INSTALL_DATA} ${WRKSRC}/ebook2cw.1 ${STAGEDIR}${PREFIX}/man/man1 ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for f in ebook2cw.conf isomap.txt utf8map.txt Modified: head/comms/ebook2cw/files/patch-Makefile ============================================================================== --- head/comms/ebook2cw/files/patch-Makefile Thu Mar 26 19:22:41 2020 (r529208) +++ head/comms/ebook2cw/files/patch-Makefile Thu Mar 26 19:46:43 2020 (r529209) @@ -1,20 +1,20 @@ ---- Makefile.orig 2013-01-04 09:33:04.000000000 -0500 -+++ Makefile 2013-01-16 10:16:50.000000000 -0500 +--- Makefile.orig 2013-01-04 14:33:04 UTC ++++ Makefile @@ -3,37 +3,26 @@ # $Id: Makefile 547 2012-12-29 21:07:53Z dj1yfk $ VERSION=0.8.2 -DESTDIR ?= /usr -- ++DESTDIR ?= /usr/local ++CC ?= gcc + -# Set to NO to compile without Lame/Ogg-vorbis support -USE_LAME?=YES -USE_OGG?=YES -+DESTDIR ?= %%PREFIX%% -+CC ?= gcc - +- CFLAGS:=$(CFLAGS) -D DESTDIR=\"$(DESTDIR)\" -D VERSION=\"$(VERSION)\" -+CFLAGS+= -I%%LOCALBASE%%/include -D LAME -D OGGV -+LDFLAGS+= -L%%LOCALBASE%%/lib -lmp3lame -lvorbis -lvorbisenc -logg ++CFLAGS+= -I/usr/local/include -D LAME -D OGGV ++LDFLAGS+= -L/usr/local/lib -lmp3lame -lvorbis -lvorbisenc -logg -ifeq ($(USE_LAME), YES) - CFLAGS:=$(CFLAGS) -D LAME @@ -24,11 +24,11 @@ - CFLAGS:=$(CFLAGS) -D OGGV - LDFLAGS:=$(LDFLAGS) -lvorbis -lvorbisenc -logg -endif -- -- --all: ebook2cw +all: ebook2cw cgi +- +-all: ebook2cw +- ebook2cw: ebook2cw.c codetables.h - gcc ebook2cw.c -pedantic -Wall -lm $(LDFLAGS) $(CFLAGS) -o ebook2cw + ${CC} ebook2cw.c -pedantic -Wall -lm $(LDFLAGS) $(CFLAGS) -o ebook2cw