Index: head/audio/espeak/Makefile =================================================================== --- head/audio/espeak/Makefile (revision 191029) +++ head/audio/espeak/Makefile (revision 191030) @@ -1,61 +1,61 @@ # New ports collection makefile for: espeak # Date created: 2006-03-25 # Whom: Nicola Vitale # # $FreeBSD$ # PORTNAME= espeak -PORTVERSION= 1.22 +PORTVERSION= 1.23 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} DISTNAME= ${PORTNAME}-${PORTVERSION}-source MAINTAINER= nivit@FreeBSD.org COMMENT= A software speech synthesizer LIB_DEPENDS= portaudio:${PORTSDIR}/audio/portaudio CONFLICTS= speak-1.[0-9] MAKE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" CPPFLAGS="${CPPFLAGS}" \ LDFLAGS="${LDFLAGS}" CXX="${CXX}" PLIST_SUB+= ESPEAK_LIBRARY=${ESPEAK_LIBRARY} USE_GETOPT_LONG=yes USE_GMAKE= yes USE_LDCONFIG= yes USE_ZIP= yes WRKSRC= ${WRKDIR}/${DISTNAME} BUILD_WRKSRC= ${WRKSRC}/src INSTALL_WRKSRC= ${WRKSRC}/src ESPEAK_LIBRARY= lib${PORTNAME}.so.1.${PORTVERSION} FIND_DIRS= espeak-data FIND_DOCS= docs LN_OPTS= -sf REPLACE_FILES= ${BUILD_WRKSRC}/Makefile ${BUILD_WRKSRC}/speech.h post-patch: @for FILE in ${REPLACE_FILES}; do \ ${REINPLACE_CMD} \ -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ -e "s|%%DATADIR%%|${DATADIR}|g" \ -e "s|%%PREFIX%%|${PREFIX}|g" $${FILE} ;\ done; post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} cd ${WRKSRC}/${FIND_DOCS} && ${FIND} . -type d -exec ${MKDIR} \ ${DOCSDIR}/{} \; cd ${WRKSRC}/${FIND_DOCS} && ${FIND} . -type f \ -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \; .endif .include Property changes on: head/audio/espeak/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.12 \ No newline at end of property +1.13 \ No newline at end of property Index: head/audio/espeak/distinfo =================================================================== --- head/audio/espeak/distinfo (revision 191029) +++ head/audio/espeak/distinfo (revision 191030) @@ -1,3 +1,3 @@ -MD5 (espeak-1.22-source.zip) = 57e84d1afc0992f65c568dcddea73fee -SHA256 (espeak-1.22-source.zip) = 3de077fc0397d8b63488a6c7cdb53aafb7808b4446fc5f9f3dd3cb5abc83151e -SIZE (espeak-1.22-source.zip) = 835112 +MD5 (espeak-1.23-source.zip) = 6fb175b1cf167d3ba58c9c3f087ca2aa +SHA256 (espeak-1.23-source.zip) = cd74c49bcfe458d3bbb51cec72de2166f65f262a7c546249f033cfea2778dec2 +SIZE (espeak-1.23-source.zip) = 853848 Property changes on: head/audio/espeak/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.12 \ No newline at end of property +1.13 \ No newline at end of property Index: head/audio/espeak/files/patch-src-Makefile =================================================================== --- head/audio/espeak/files/patch-src-Makefile (revision 191029) +++ head/audio/espeak/files/patch-src-Makefile (revision 191030) @@ -1,70 +1,69 @@ ---- src/Makefile Wed Apr 4 14:39:47 2007 -+++ src/Makefile.port Thu Apr 5 13:09:53 2007 +--- src/Makefile Sat Apr 21 19:05:23 2007 ++++ src/Makefile.port Mon Apr 23 15:50:29 2007 @@ -1,7 +1,7 @@ -BINDIR=/usr/bin -INCDIR=/usr/include/espeak -LIBDIR=/usr/lib -DATADIR=/usr/share/espeak-data +BINDIR=%%PREFIX%%/bin +INCDIR=%%PREFIX%%/include/espeak +LIBDIR=%%PREFIX%%/lib +DATADIR=%%DATADIR%%/espeak-data - RELEASE = 1.22 + RELEASE = 1.23 BIN_NAME = speak -@@ -28,17 +28,17 @@ +@@ -29,24 +29,24 @@ SRCS1=$(speak_SOURCES) OBJS1=$(patsubst %.cpp,%.o,$(SRCS1)) -LIBS1=-lstdc++ -lportaudio -lpthread +LIBS1=-lstdc++ -L%%LOCALBASE%%/lib -lportaudio $(PTHREAD_LIBS) SRCS2=$(libespeak_SOURCES) OBJS2=$(patsubst %.cpp,x_%.o,$(SRCS2)) -LIBS2=-lstdc++ -lportaudio -lpthread +LIBS2=-lstdc++ -L%%LOCALBASE%%/lib -lportaudio $(PTHREAD_LIBS) SRCS3 = espeak.cpp OBJS3=$(patsubst %.cpp,%.o,$(SRCS3)) -LIBS3=-lstdc++ ./libespeak.so +LIBS3=-lstdc++ ./libespeak.so $(PTHREAD_LIBS) -CXXFLAGS=-O2 +#CXXFLAGS=-O2 - ifeq ($(shell uname -m), ppc) - CXXFLAGS += -D ARCH_BIG - endif -@@ -48,7 +48,7 @@ + + + all: $(BIN_NAME) $(LIB_NAME) $(STATIC_LIB_NAME) $(BIN2_NAME) mv $(LIB_NAME) $(LIB_NAME).$(LIBTAG) .cpp.o: - $(CXX) $(CXXFLAGS) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -Wall -pedantic -I. -c -fno-exceptions $< + $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(PTHREAD_CFLAGS) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -Wall -pedantic -I. -c -fno-exceptions $< $(BIN_NAME): $(OBJS1) $(CXX) -o $@ $(OBJS1) $(LIBS1) -@@ -59,7 +59,7 @@ +@@ -57,7 +57,7 @@ x_%.o: %.cpp - $(CXX) $(CXXFLAGS) -Wall -fpic -fvisibility=hidden -pedantic \ + $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(PTHREAD_CFLAGS) -Wall -fPIC -pedantic \ -I. -D LIBRARY -c -fno-exceptions $< -o x_$*.o $(LIB_NAME): $(OBJS2) -@@ -75,7 +75,7 @@ +@@ -76,7 +76,7 @@ install: all # Create directories -- rm -r $(DESTDIR)$(DATADIR) -+ #rm -r $(DESTDIR)$(DATADIR) +- rm -rf $(DESTDIR)$(DATADIR) ++ #rm -rf $(DESTDIR)$(DATADIR) $(MKDIR) $(DESTDIR)$(BINDIR) $(MKDIR) $(DESTDIR)$(LIBDIR) $(MKDIR) $(DESTDIR)$(INCDIR) -@@ -89,5 +89,5 @@ +@@ -92,5 +92,5 @@ # Install development headers $(INSTALL) -pm 644 speak_lib.h $(DESTDIR)$(INCDIR) # Install data files - cp -prf ../espeak-data/* $(DESTDIR)$(DATADIR) + cp -pRf ../espeak-data/* $(DESTDIR)$(DATADIR) Property changes on: head/audio/espeak/files/patch-src-Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.10 \ No newline at end of property +1.11 \ No newline at end of property Index: head/audio/espeak/pkg-plist =================================================================== --- head/audio/espeak/pkg-plist (revision 191029) +++ head/audio/espeak/pkg-plist (revision 191030) @@ -1,141 +1,152 @@ @comment $FreeBSD$ bin/espeak include/espeak/speak_lib.h +lib/libespeak.a lib/libespeak.so lib/libespeak.so.1 -lib/libespeak.so.1.1.22 +lib/libespeak.so.1.1.23 %%PORTDOCS%%%%DOCSDIR%%/add_language.html %%PORTDOCS%%%%DOCSDIR%%/analyse.html %%PORTDOCS%%%%DOCSDIR%%/commands.html %%PORTDOCS%%%%DOCSDIR%%/dictionary.html %%PORTDOCS%%%%DOCSDIR%%/docindex.html %%PORTDOCS%%%%DOCSDIR%%/editor.html %%PORTDOCS%%%%DOCSDIR%%/editor_if.html %%PORTDOCS%%%%DOCSDIR%%/images/lips.png %%PORTDOCS%%%%DOCSDIR%%/images/sand-light.jpg %%PORTDOCS%%%%DOCSDIR%%/index.html %%PORTDOCS%%%%DOCSDIR%%/languages.html %%PORTDOCS%%%%DOCSDIR%%/mbrola.html %%PORTDOCS%%%%DOCSDIR%%/phonemes.html %%PORTDOCS%%%%DOCSDIR%%/phontab.html %%PORTDOCS%%%%DOCSDIR%%/speak_lib.h %%PORTDOCS%%%%DOCSDIR%%/ssml.html %%PORTDOCS%%%%DOCSDIR%%/voices.html %%DATADIR%%/espeak-data/af_dict %%DATADIR%%/espeak-data/config %%DATADIR%%/espeak-data/cs_dict %%DATADIR%%/espeak-data/cy_dict %%DATADIR%%/espeak-data/de_dict %%DATADIR%%/espeak-data/el_dict %%DATADIR%%/espeak-data/en_dict %%DATADIR%%/espeak-data/eo_dict %%DATADIR%%/espeak-data/es_dict %%DATADIR%%/espeak-data/fi_dict %%DATADIR%%/espeak-data/fr_dict %%DATADIR%%/espeak-data/hi_dict +%%DATADIR%%/espeak-data/hr_dict %%DATADIR%%/espeak-data/hu_dict %%DATADIR%%/espeak-data/it_dict %%DATADIR%%/espeak-data/mbrola_ph/af1_phtrans %%DATADIR%%/espeak-data/mbrola_ph/ca1_phtrans +%%DATADIR%%/espeak-data/mbrola_ph/cr1_phtrans %%DATADIR%%/espeak-data/mbrola_ph/cs_phtrans %%DATADIR%%/espeak-data/mbrola_ph/de4_phtrans +%%DATADIR%%/espeak-data/mbrola_ph/de5_phtrans %%DATADIR%%/espeak-data/mbrola_ph/en1_phtrans %%DATADIR%%/espeak-data/mbrola_ph/fr1_phtrans +%%DATADIR%%/espeak-data/mbrola_ph/hu1_phtrans %%DATADIR%%/espeak-data/mbrola_ph/nl_phtrans %%DATADIR%%/espeak-data/mbrola_ph/pl1_phtrans %%DATADIR%%/espeak-data/mbrola_ph/ro1_phtrans %%DATADIR%%/espeak-data/mbrola_ph/sv_phtrans %%DATADIR%%/espeak-data/mbrola_ph/us3_phtrans %%DATADIR%%/espeak-data/mbrola_ph/us_phtrans %%DATADIR%%/espeak-data/nl_dict %%DATADIR%%/espeak-data/no_dict %%DATADIR%%/espeak-data/phondata %%DATADIR%%/espeak-data/phonindex %%DATADIR%%/espeak-data/phontab %%DATADIR%%/espeak-data/pl_dict %%DATADIR%%/espeak-data/pt_dict %%DATADIR%%/espeak-data/ro_dict %%DATADIR%%/espeak-data/ru_dict %%DATADIR%%/espeak-data/sk_dict %%DATADIR%%/espeak-data/sv_dict %%DATADIR%%/espeak-data/sw_dict %%DATADIR%%/espeak-data/vi_dict %%DATADIR%%/espeak-data/voices/!v/!variant1 %%DATADIR%%/espeak-data/voices/!v/!variant11 %%DATADIR%%/espeak-data/voices/!v/!variant12 %%DATADIR%%/espeak-data/voices/!v/!variant13 %%DATADIR%%/espeak-data/voices/!v/!variant14 %%DATADIR%%/espeak-data/voices/!v/!variant2 %%DATADIR%%/espeak-data/voices/!v/!variant3 %%DATADIR%%/espeak-data/voices/!v/!variant4 %%DATADIR%%/espeak-data/voices/!v/!variant5 %%DATADIR%%/espeak-data/voices/!v/!variant6 %%DATADIR%%/espeak-data/voices/af %%DATADIR%%/espeak-data/voices/cs %%DATADIR%%/espeak-data/voices/cy %%DATADIR%%/espeak-data/voices/de %%DATADIR%%/espeak-data/voices/default %%DATADIR%%/espeak-data/voices/el %%DATADIR%%/espeak-data/voices/en/en %%DATADIR%%/espeak-data/voices/en/en-croak %%DATADIR%%/espeak-data/voices/en/en-n %%DATADIR%%/espeak-data/voices/en/en-r %%DATADIR%%/espeak-data/voices/en/en-rp %%DATADIR%%/espeak-data/voices/en/en-sc %%DATADIR%%/espeak-data/voices/en/en-wm %%DATADIR%%/espeak-data/voices/eo %%DATADIR%%/espeak-data/voices/es %%DATADIR%%/espeak-data/voices/fi %%DATADIR%%/espeak-data/voices/fr %%DATADIR%%/espeak-data/voices/fr-ca %%DATADIR%%/espeak-data/voices/hi +%%DATADIR%%/espeak-data/voices/hr %%DATADIR%%/espeak-data/voices/hu %%DATADIR%%/espeak-data/voices/it %%DATADIR%%/espeak-data/voices/mb/mb-af1 %%DATADIR%%/espeak-data/voices/mb/mb-af1-en +%%DATADIR%%/espeak-data/voices/mb/mb-cr1 %%DATADIR%%/espeak-data/voices/mb/mb-cz2 %%DATADIR%%/espeak-data/voices/mb/mb-de4 %%DATADIR%%/espeak-data/voices/mb/mb-de4-en +%%DATADIR%%/espeak-data/voices/mb/mb-de5 +%%DATADIR%%/espeak-data/voices/mb/mb-de5-en %%DATADIR%%/espeak-data/voices/mb/mb-en1 %%DATADIR%%/espeak-data/voices/mb/mb-fr1 %%DATADIR%%/espeak-data/voices/mb/mb-fr1-en %%DATADIR%%/espeak-data/voices/mb/mb-fr4 %%DATADIR%%/espeak-data/voices/mb/mb-fr4-en +%%DATADIR%%/espeak-data/voices/mb/mb-hu1 +%%DATADIR%%/espeak-data/voices/mb/mb-hu1-en %%DATADIR%%/espeak-data/voices/mb/mb-nl2 %%DATADIR%%/espeak-data/voices/mb/mb-nl2-en %%DATADIR%%/espeak-data/voices/mb/mb-pl1 %%DATADIR%%/espeak-data/voices/mb/mb-pl1-en %%DATADIR%%/espeak-data/voices/mb/mb-ro1 %%DATADIR%%/espeak-data/voices/mb/mb-ro1-en %%DATADIR%%/espeak-data/voices/mb/mb-sw1 %%DATADIR%%/espeak-data/voices/mb/mb-sw1-en %%DATADIR%%/espeak-data/voices/mb/mb-sw2 %%DATADIR%%/espeak-data/voices/mb/mb-sw2-en %%DATADIR%%/espeak-data/voices/mb/mb-us1 %%DATADIR%%/espeak-data/voices/mb/mb-us2 %%DATADIR%%/espeak-data/voices/mb/mb-us3 %%DATADIR%%/espeak-data/voices/nl %%DATADIR%%/espeak-data/voices/no %%DATADIR%%/espeak-data/voices/pl %%DATADIR%%/espeak-data/voices/pt %%DATADIR%%/espeak-data/voices/pt-pt %%DATADIR%%/espeak-data/voices/ro %%DATADIR%%/espeak-data/voices/ru %%DATADIR%%/espeak-data/voices/sk %%DATADIR%%/espeak-data/voices/sv %%DATADIR%%/espeak-data/voices/sw %%DATADIR%%/espeak-data/voices/vi %%DATADIR%%/espeak-data/voices/zhy %%DATADIR%%/espeak-data/zhy_dict @dirrm include/espeak %%PORTDOCS%%@dirrm %%DOCSDIR%%/images %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%DATADIR%%/espeak-data/mbrola @dirrm %%DATADIR%%/espeak-data/mbrola_ph @dirrm %%DATADIR%%/espeak-data/soundicons @dirrm %%DATADIR%%/espeak-data/voices/!v @dirrm %%DATADIR%%/espeak-data/voices/en @dirrm %%DATADIR%%/espeak-data/voices/mb @dirrm %%DATADIR%%/espeak-data/voices @dirrm %%DATADIR%%/espeak-data @dirrm %%DATADIR%% Property changes on: head/audio/espeak/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.9 \ No newline at end of property +1.10 \ No newline at end of property