Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 26 Mar 2020 19:46:44 +0000 (UTC)
From:      Diane Bruce <db@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r529209 - in head/comms/ebook2cw: . files
Message-ID:  <202003261946.02QJkiOv093676@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003261946.02QJkiOv093676>