Index: head/comms/ebook2cw/Makefile =================================================================== --- head/comms/ebook2cw/Makefile (revision 529208) +++ head/comms/ebook2cw/Makefile (revision 529209) @@ -1,35 +1,37 @@ # $FreeBSD$ PORTNAME= ebook2cw PORTVERSION= 0.8.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= comms hamradio MASTER_SITES= http://fkurz.net/ham/ebook2cw/ \ LOCAL/db MAINTAINER= hamradio@FreeBSD.org COMMENT= Convert text files into cw as an mp3 or ogg file LICENSE= GPLv2 LIB_DEPENDS= libmp3lame.so:audio/lame \ + libogg.so:audio/libogg \ libvorbis.so:audio/libvorbis OPTIONS_DEFINE= DOCS EXAMPLES post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|'g \ ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|'g \ ${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 ${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${EXAMPLESDIR}/$f .endfor ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .include Index: head/comms/ebook2cw/files/patch-Makefile =================================================================== --- head/comms/ebook2cw/files/patch-Makefile (revision 529208) +++ head/comms/ebook2cw/files/patch-Makefile (revision 529209) @@ -1,49 +1,49 @@ ---- 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 - LDFLAGS:=$(LDFLAGS) -lmp3lame -endif -ifeq ($(USE_OGG), YES) - 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 cgi: ebook2cw.c codetables.h - gcc -static ebook2cw.c $(LDFLAGS) -lm $(CFLAGS) -D CGI -o cw.cgi + ${CC} -static ebook2cw.c $(LDFLAGS) -lm $(CFLAGS) -D CGI -o cw.cgi cgibuffered: ebook2cw.c codetables.h - gcc -static ebook2cw.c $(LDFLAGS) -lm $(CFLAGS) -D CGI -D CGIBUFFERED -o cw.cgi + ${CC} -static ebook2cw.c $(LDFLAGS) -lm $(CFLAGS) -D CGI -D CGIBUFFERED -o cw.cgi static: - gcc -static ebook2cw.c $(LDFLAGS) -lm $(CFLAGS) -o ebook2cw + ${CC} -static ebook2cw.c $(LDFLAGS) -lm $(CFLAGS) -o ebook2cw install: install -d -v $(DESTDIR)/share/man/man1/ Property changes on: head/comms/ebook2cw/files/patch-Makefile ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -yes \ No newline at end of property +1 \ No newline at end of property