Attachment #32422 for bug #53584

View | Details | Raw Unified | Return to bug 53584
Collapse All | Expand All




#

PORTNAME=	wv
PORTVERSION=	0.7.6
CATEGORIES=	textproc
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	wvware

MAINTAINER=	mzaki@e-mail.ne.jp
COMMENT=	A library and executables which allow access to Microsoft Word files

LIB_DEPENDS=	wmf.2:${PORTSDIR}/graphics/libwmf
		iconv.3:${PORTSDIR}/converters/libiconv \
		png.5:${PORTSDIR}/graphics/png
RUN_DEPENDS=	lynx:${PORTSDIR}/www/lynx

USE_GETOPT_LONG=	yes
USE_REINPLACE=	yes
USE_GMAKE=	yes
USE_LIBTOOL=	yes
LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS=	--with-exporter --without-glib
MAKEFILE=	GNUmakefile
INSTALLS_SHLIB=	yes

MAN1=	wvAbw.1 wvCleanLatex.1 wvDVI.1 wvHtml.1 wvLatex.1 wvMime.1 wvPDF.1 \
	wvPS.1 wvRTF.1 wvSummary.1 wvText.1 wvVersion.1 wvWare.1 wvWml.1
MLINKS=	wvWare.1 wvConvert.1

CPPFLAGS=	-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include
LDFLAGS=	-L${LOCALBASE}/lib

post-patch:
	@${REINPLACE_CMD} -e '/HAVE_MALLOC_H/d' ${WRKSRC}/config.h.in

.include <bsd.port.mk>

Line 1 Link Here

(-)textproc/wv/distinfo (-1 / +1 lines)
1	MD5 (wv-0.7.5.tar.gz) = 5c52991ce95b2ee02fbaebff0dc36869	1	MD5 (wv-0.7.6.tar.gz) = 28c46d6676e0fce6a19e3cb730b04556




--- Makefile.in.orig	Wed Nov  6 03:01:41 2002
+++ Makefile.in	Wed Nov 20 17:44:12 2002
@@ -64,6 +64,8 @@
 RM = rm
 
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_DATA = @INSTALL_DATA@
 
 @SET_MAKE@
@@ -85,7 +87,7 @@
 
 DEFS = @DEFS@ -DVERSION=\"@VERSION@\" -DXMLCONFIG=\"$(datadir)/wv/wvConfig.xml\" -DHTMLCONFIG=\"$(datadir)/wv/wvHtml.xml\" -DWVDATADIR=\"$(datadir)/wv\"
 
-CPPFLAGS = @CPPFLAGS@ @ICONV_CFLAGS@ @WMF_CFLAGS@ @XML_CFLAGS@ @GLIB_CFLAGS@ @PNG_CFLAGS@ @ZLIB_CFLAGS@
+CPPFLAGS = @WMF_CFLAGS@ @XML_CFLAGS@ @GLIB_CFLAGS@ @PNG_CFLAGS@ @ZLIB_CFLAGS@ @ICONV_CFLAGS@ @CPPFLAGS@
 
 ifeq ($(EPATH_DYLIB),1)
 WVPICFLAGS = -fno-common -DPIC
@@ -453,30 +455,24 @@
 	$(includedir)	
 
 install: installdirs all
-	chmod +x $(srcdir)/wvHtml
-	chmod +x $(srcdir)/wvLatex
-	chmod +x $(srcdir)/wvText
-	chmod +x $(srcdir)/wvWml
-	chmod +x $(srcdir)/wvCleanLatex
-	chmod +x $(srcdir)/wvAbw	
-	$(INSTALL) $(srcdir)/wvSummary$(EXEEXT) $(bindir)/wvSummary$(EXEEXT)
-	$(INSTALL) $(srcdir)/wvVersion$(EXEEXT) $(bindir)/wvVersion$(EXEEXT)
-	$(INSTALL) $(srcdir)/wvConvert$(EXEEXT) $(bindir)/wvConvert$(EXEEXT)
-	$(INSTALL) $(srcdir)/wvWare$(EXEEXT) $(bindir)/wvWare$(EXEEXT)
-	$(INSTALL) $(srcdir)/wvRTF$(EXEEXT) $(bindir)/wvRTF$(EXEEXT)
-	$(INSTALL) $(srcdir)/wvCleanLatex $(bindir)/wvCleanLatex
-	$(INSTALL) $(srcdir)/wvHtml $(bindir)/wvHtml
-	$(INSTALL) $(srcdir)/wvAbw $(bindir)/wvAbw
-	$(INSTALL) $(srcdir)/wvMime $(bindir)/wvMime
-	$(INSTALL) $(srcdir)/wvPS $(bindir)/wvPS
-	$(INSTALL) $(srcdir)/wvDVI $(bindir)/wvDVI
-	$(INSTALL) $(srcdir)/wvLatex $(bindir)/wvLatex
-	$(INSTALL) $(srcdir)/wvPDF $(bindir)/wvPDF
-	$(INSTALL) $(srcdir)/wvText $(bindir)/wvText
-	$(INSTALL) $(srcdir)/wvWml $(bindir)/wvWml
-	$(INSTALL) $(srcdir)/wv-libconfig $(bindir)/wv-libconfig
-	$(INSTALL) $(srcdir)/wv-incconfig $(bindir)/wv-incconfig
-	$(INSTALL) $(srcdir)/make_epses.sh $(bindir)/make_epses.sh
+	$(INSTALL_PROGRAM) $(srcdir)/wvSummary$(EXEEXT) $(bindir)/wvSummary$(EXEEXT)
+	$(INSTALL_PROGRAM) $(srcdir)/wvVersion$(EXEEXT) $(bindir)/wvVersion$(EXEEXT)
+	$(INSTALL_PROGRAM) $(srcdir)/wvConvert$(EXEEXT) $(bindir)/wvConvert$(EXEEXT)
+	$(INSTALL_PROGRAM) $(srcdir)/wvWare$(EXEEXT) $(bindir)/wvWare$(EXEEXT)
+	$(INSTALL_PROGRAM) $(srcdir)/wvRTF$(EXEEXT) $(bindir)/wvRTF$(EXEEXT)
+	$(INSTALL_SCRIPT) $(srcdir)/wvCleanLatex $(bindir)/wvCleanLatex
+	$(INSTALL_SCRIPT) $(srcdir)/wvHtml $(bindir)/wvHtml
+	$(INSTALL_SCRIPT) $(srcdir)/wvAbw $(bindir)/wvAbw
+	$(INSTALL_SCRIPT) $(srcdir)/wvMime $(bindir)/wvMime
+	$(INSTALL_SCRIPT) $(srcdir)/wvPS $(bindir)/wvPS
+	$(INSTALL_SCRIPT) $(srcdir)/wvDVI $(bindir)/wvDVI
+	$(INSTALL_SCRIPT) $(srcdir)/wvLatex $(bindir)/wvLatex
+	$(INSTALL_SCRIPT) $(srcdir)/wvPDF $(bindir)/wvPDF
+	$(INSTALL_SCRIPT) $(srcdir)/wvText $(bindir)/wvText
+	$(INSTALL_SCRIPT) $(srcdir)/wvWml $(bindir)/wvWml
+	$(INSTALL_SCRIPT) $(srcdir)/wv-libconfig $(bindir)/wv-libconfig
+	$(INSTALL_SCRIPT) $(srcdir)/wv-incconfig $(bindir)/wv-incconfig
+	$(INSTALL_SCRIPT) $(srcdir)/make_epses.sh $(bindir)/make_epses.sh
 	$(INSTALL_DATA) $(src_mandir)/wvWare.1 $(mandir)/man1/
 	$(INSTALL_DATA) $(src_mandir)/wvHtml.1 $(mandir)/man1/
 	$(INSTALL_DATA) $(src_mandir)/wvLatex.1 $(mandir)/man1/

Line 0 Link Here

(-)textproc/wv/files/patch-configure (+10 lines)
	1	--- configure.orig Fri Jun 13 23:27:28 2003
	2	+++ configure Thu Jun 19 20:20:46 2003
	3	@@ -7533,6 +7533,7 @@
	4
	5	# This can be used to rebuild libtool when needed
	6	LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
	7	+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
	8
	9	# Always use our own libtool.
	10	LIBTOOL='$(SHELL) $(top_builddir)/libtool'




bin/libwv-config
bin/wv-incconfig
bin/wv-libconfig
bin/wvAbw
bin/wvCleanLatex
bin/wvConvert
bin/wvDVI
bin/wvDocBook
bin/wvHtml
bin/wvLatex
bin/wvMime

include/wv.h
include/wvexporter.h
lib/libwv.a
lib/libwv.so
lib/libwv.so.6
share/wv/patterns/100.gif
share/wv/patterns/101.gif
share/wv/patterns/102.gif

share/wv/wvAbw.xml
share/wv/wvCleanLaTeX.xml
share/wv/wvConfig.xml
share/wv/wvDocbook.xml
share/wv/wvHtml.xml
share/wv/wvLaTeX.xml
share/wv/wvText.xml
share/wv/wvWml.xml
share/wv/wvXml.dtd
share/wv/wvXml.xml
@exec mkdir -p %D/share/wv/ttf
@dirrm share/wv/wingdingfont
@dirrm share/wv/patterns
@dirrm share/wv

Return to bug 53584

Lines 6-12 Link Here

(-)textproc/wv/Makefile (-7 / +15 lines)
6	#	6	#
7		7
8	PORTNAME= wv	8	PORTNAME= wv
9	PORTVERSION= 0.7.5	9	PORTVERSION= 0.7.6
10	CATEGORIES= textproc	10	CATEGORIES= textproc
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= wvware	12	MASTER_SITE_SUBDIR= wvware
Lines 14-32 Link Here
14	MAINTAINER= mzaki@e-mail.ne.jp	14	MAINTAINER= mzaki@e-mail.ne.jp
15	COMMENT= A library and executables which allow access to Microsoft Word files	15	COMMENT= A library and executables which allow access to Microsoft Word files
16		16
17	LIB_DEPENDS= wmf.2:${PORTSDIR}/graphics/libwmf \	17	LIB_DEPENDS= wmf.2:${PORTSDIR}/graphics/libwmf
18	iconv.3:${PORTSDIR}/converters/libiconv \
19	png.5:${PORTSDIR}/graphics/png
20	RUN_DEPENDS= lynx:${PORTSDIR}/www/lynx	18	RUN_DEPENDS= lynx:${PORTSDIR}/www/lynx
21		19
		20	USE_GETOPT_LONG= yes
		21	USE_REINPLACE= yes
22	USE_GMAKE= yes	22	USE_GMAKE= yes
23	GNU_CONFIGURE= yes	23	USE_LIBTOOL= yes
		24	LIBTOOLFLAGS= --disable-ltlibs --release-ignore
24	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}	25	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
25	CONFIGURE_ARGS= --with-libwmf=${LOCALBASE} --with-libiconv=${LOCALBASE} \	26	CONFIGURE_ARGS= --with-exporter --without-glib
26	--with-png=${LOCALBASE} --with-exporter --without-glib	27	MAKEFILE= GNUmakefile
		28	INSTALLS_SHLIB= yes
27		29
28	MAN1= wvAbw.1 wvCleanLatex.1 wvDVI.1 wvHtml.1 wvLatex.1 wvMime.1 wvPDF.1 \	30	MAN1= wvAbw.1 wvCleanLatex.1 wvDVI.1 wvHtml.1 wvLatex.1 wvMime.1 wvPDF.1 \
29	wvPS.1 wvRTF.1 wvSummary.1 wvText.1 wvVersion.1 wvWare.1 wvWml.1	31	wvPS.1 wvRTF.1 wvSummary.1 wvText.1 wvVersion.1 wvWare.1 wvWml.1
30	MLINKS= wvWare.1 wvConvert.1	32	MLINKS= wvWare.1 wvConvert.1
		33
		34	CPPFLAGS= -I${LOCALBASE}/include/libpng -I${LOCALBASE}/include
		35	LDFLAGS= -L${LOCALBASE}/lib
		36
		37	post-patch:
		38	@${REINPLACE_CMD} -e '/HAVE_MALLOC_H/d' ${WRKSRC}/config.h.in
31		39
32	.include <bsd.port.mk>	40	.include <bsd.port.mk>

Lines 1-69 Link Here

(-)textproc/wv/files/patch-Makefile.in (-69 lines)
1	--- Makefile.in.orig Wed Nov 6 03:01:41 2002
2	+++ Makefile.in Wed Nov 20 17:44:12 2002
3	@@ -64,6 +64,8 @@
4	RM = rm
5
6	INSTALL = @INSTALL@
7	+INSTALL_PROGRAM = @INSTALL_PROGRAM@
8	+INSTALL_SCRIPT = @INSTALL_SCRIPT@
9	INSTALL_DATA = @INSTALL_DATA@
10
11	@SET_MAKE@
12	@@ -85,7 +87,7 @@
13
14	DEFS = @DEFS@ -DVERSION=\"@VERSION@\" -DXMLCONFIG=\"$(datadir)/wv/wvConfig.xml\" -DHTMLCONFIG=\"$(datadir)/wv/wvHtml.xml\" -DWVDATADIR=\"$(datadir)/wv\"
15
16	-CPPFLAGS = @CPPFLAGS@ @ICONV_CFLAGS@ @WMF_CFLAGS@ @XML_CFLAGS@ @GLIB_CFLAGS@ @PNG_CFLAGS@ @ZLIB_CFLAGS@
17	+CPPFLAGS = @WMF_CFLAGS@ @XML_CFLAGS@ @GLIB_CFLAGS@ @PNG_CFLAGS@ @ZLIB_CFLAGS@ @ICONV_CFLAGS@ @CPPFLAGS@
18
19	ifeq ($(EPATH_DYLIB),1)
20	WVPICFLAGS = -fno-common -DPIC
21	@@ -453,30 +455,24 @@
22	$(includedir)
23
24	install: installdirs all
25	- chmod +x $(srcdir)/wvHtml
26	- chmod +x $(srcdir)/wvLatex
27	- chmod +x $(srcdir)/wvText
28	- chmod +x $(srcdir)/wvWml
29	- chmod +x $(srcdir)/wvCleanLatex
30	- chmod +x $(srcdir)/wvAbw
31	- $(INSTALL) $(srcdir)/wvSummary$(EXEEXT) $(bindir)/wvSummary$(EXEEXT)
32	- $(INSTALL) $(srcdir)/wvVersion$(EXEEXT) $(bindir)/wvVersion$(EXEEXT)
33	- $(INSTALL) $(srcdir)/wvConvert$(EXEEXT) $(bindir)/wvConvert$(EXEEXT)
34	- $(INSTALL) $(srcdir)/wvWare$(EXEEXT) $(bindir)/wvWare$(EXEEXT)
35	- $(INSTALL) $(srcdir)/wvRTF$(EXEEXT) $(bindir)/wvRTF$(EXEEXT)
36	- $(INSTALL) $(srcdir)/wvCleanLatex $(bindir)/wvCleanLatex
37	- $(INSTALL) $(srcdir)/wvHtml $(bindir)/wvHtml
38	- $(INSTALL) $(srcdir)/wvAbw $(bindir)/wvAbw
39	- $(INSTALL) $(srcdir)/wvMime $(bindir)/wvMime
40	- $(INSTALL) $(srcdir)/wvPS $(bindir)/wvPS
41	- $(INSTALL) $(srcdir)/wvDVI $(bindir)/wvDVI
42	- $(INSTALL) $(srcdir)/wvLatex $(bindir)/wvLatex
43	- $(INSTALL) $(srcdir)/wvPDF $(bindir)/wvPDF
44	- $(INSTALL) $(srcdir)/wvText $(bindir)/wvText
45	- $(INSTALL) $(srcdir)/wvWml $(bindir)/wvWml
46	- $(INSTALL) $(srcdir)/wv-libconfig $(bindir)/wv-libconfig
47	- $(INSTALL) $(srcdir)/wv-incconfig $(bindir)/wv-incconfig
48	- $(INSTALL) $(srcdir)/make_epses.sh $(bindir)/make_epses.sh
49	+ $(INSTALL_PROGRAM) $(srcdir)/wvSummary$(EXEEXT) $(bindir)/wvSummary$(EXEEXT)
50	+ $(INSTALL_PROGRAM) $(srcdir)/wvVersion$(EXEEXT) $(bindir)/wvVersion$(EXEEXT)
51	+ $(INSTALL_PROGRAM) $(srcdir)/wvConvert$(EXEEXT) $(bindir)/wvConvert$(EXEEXT)
52	+ $(INSTALL_PROGRAM) $(srcdir)/wvWare$(EXEEXT) $(bindir)/wvWare$(EXEEXT)
53	+ $(INSTALL_PROGRAM) $(srcdir)/wvRTF$(EXEEXT) $(bindir)/wvRTF$(EXEEXT)
54	+ $(INSTALL_SCRIPT) $(srcdir)/wvCleanLatex $(bindir)/wvCleanLatex
55	+ $(INSTALL_SCRIPT) $(srcdir)/wvHtml $(bindir)/wvHtml
56	+ $(INSTALL_SCRIPT) $(srcdir)/wvAbw $(bindir)/wvAbw
57	+ $(INSTALL_SCRIPT) $(srcdir)/wvMime $(bindir)/wvMime
58	+ $(INSTALL_SCRIPT) $(srcdir)/wvPS $(bindir)/wvPS
59	+ $(INSTALL_SCRIPT) $(srcdir)/wvDVI $(bindir)/wvDVI
60	+ $(INSTALL_SCRIPT) $(srcdir)/wvLatex $(bindir)/wvLatex
61	+ $(INSTALL_SCRIPT) $(srcdir)/wvPDF $(bindir)/wvPDF
62	+ $(INSTALL_SCRIPT) $(srcdir)/wvText $(bindir)/wvText
63	+ $(INSTALL_SCRIPT) $(srcdir)/wvWml $(bindir)/wvWml
64	+ $(INSTALL_SCRIPT) $(srcdir)/wv-libconfig $(bindir)/wv-libconfig
65	+ $(INSTALL_SCRIPT) $(srcdir)/wv-incconfig $(bindir)/wv-incconfig
66	+ $(INSTALL_SCRIPT) $(srcdir)/make_epses.sh $(bindir)/make_epses.sh
67	$(INSTALL_DATA) $(src_mandir)/wvWare.1 $(mandir)/man1/
68	$(INSTALL_DATA) $(src_mandir)/wvHtml.1 $(mandir)/man1/
69	$(INSTALL_DATA) $(src_mandir)/wvLatex.1 $(mandir)/man1/

Lines 1-10 Link Here

(-)textproc/wv/pkg-plist (-5 / +6 lines)
1	bin/make_epses.sh	1	bin/libwv-config
2	bin/wv-incconfig
3	bin/wv-libconfig
4	bin/wvAbw	2	bin/wvAbw
5	bin/wvCleanLatex	3	bin/wvCleanLatex
6	bin/wvConvert	4	bin/wvConvert
7	bin/wvDVI	5	bin/wvDVI
		6	bin/wvDocBook
8	bin/wvHtml	7	bin/wvHtml
9	bin/wvLatex	8	bin/wvLatex
10	bin/wvMime	9	bin/wvMime
Lines 19-24 Link Here
19	include/wv.h	18	include/wv.h
20	include/wvexporter.h	19	include/wvexporter.h
21	lib/libwv.a	20	lib/libwv.a
		21	lib/libwv.so
		22	lib/libwv.so.6
22	share/wv/patterns/100.gif	23	share/wv/patterns/100.gif
23	share/wv/patterns/101.gif	24	share/wv/patterns/101.gif
24	share/wv/patterns/102.gif	25	share/wv/patterns/102.gif
Lines 460-472 Link Here
460	share/wv/wvAbw.xml	461	share/wv/wvAbw.xml
461	share/wv/wvCleanLaTeX.xml	462	share/wv/wvCleanLaTeX.xml
462	share/wv/wvConfig.xml	463	share/wv/wvConfig.xml
		464	share/wv/wvDocbook.xml
463	share/wv/wvHtml.xml	465	share/wv/wvHtml.xml
464	share/wv/wvLaTeX.xml	466	share/wv/wvLaTeX.xml
465	share/wv/wvText.xml	467	share/wv/wvText.xml
466	share/wv/wvWml.xml	468	share/wv/wvWml.xml
467	share/wv/wvXml.dtd	469	share/wv/wvXml.dtd
468	share/wv/wvXml.xml	470	share/wv/wvXml.xml
469	@exec mkdir -p %D/share/wv/ttf
470	@dirrm share/wv/wingdingfont	471	@dirrm share/wv/wingdingfont
471	@dirrm share/wv/patterns	472	@dirrm share/wv/patterns
472	@unexec rm -rf %D/share/wv 2>/dev/null \|\| true	473	@dirrm share/wv