Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 28 Jul 2002 08:18:45 +0800 (CST)
From:      Yen-Ming Lee <leeym@utopia.leeym.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/41067: update port: textproc/antiword
Message-ID:  <20020728001845.F198C3E9BD2@utopia.leeym.com>

next in thread | raw e-mail | index | archive | help

>Number:         41067
>Category:       ports
>Synopsis:       update port: textproc/antiword
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jul 27 17:20:02 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Yen-Ming Lee
>Release:        FreeBSD 4.6-STABLE i386
>Organization:
>Environment:
System: FreeBSD utopia.leeym.com 4.6-STABLE FreeBSD 4.6-STABLE #51: Tue Jul 23 05:19:48 CST 2002 root@utopia.leeym.com:/usr/obj/usr/src/sys/UTOPIA i386


	
>Description:
update to antiword-0.33
support REINPLACE_CMD

>How-To-Repeat:
	
>Fix:

	

--- antiword.diff begins here ---
diff -ruN --exclude CVS /usr/ports/textproc/antiword/Makefile antiword/Makefile
--- /usr/ports/textproc/antiword/Makefile	Wed Nov 21 04:33:25 2001
+++ antiword/Makefile	Sun Jul 28 08:11:41 2002
@@ -6,25 +6,24 @@
 #
 
 PORTNAME=	antiword
-PORTVERSION=	0.32
+PORTVERSION=	0.33
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.winfield.demon.nl/linux/
 
 MAINTAINER=	leeym@leeym.com
 
-WRKSRC=		${WRKDIR}/${PORTNAME}.${PORTVERSION}
+USE_REINPLACE=	yes
+INSTALL_TARGET=	global_install
 
 MAN1=		antiword.1
 
 post-patch:
-	@${PERL5} -pi -e 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/antiword.h
+	@${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},g' \
+		-e 's,/usr/share,${PREFIX}/share,g' \
+		${WRKSRC}/Makefile.* ${WRKSRC}/*.[ch]
 
-do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/antiword ${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKSRC}/kantiword ${PREFIX}/bin
+post-install:
 	@${INSTALL_MAN} ${WRKSRC}/Docs/antiword.1 ${MANPREFIX}/man/man1
-	@${MKDIR} ${DATADIR}
-	@${INSTALL_DATA} ${WRKSRC}/Resources/* ${DATADIR}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/Docs/* ${DOCSDIR}
diff -ruN --exclude CVS /usr/ports/textproc/antiword/distinfo antiword/distinfo
--- /usr/ports/textproc/antiword/distinfo	Wed Nov 21 04:33:25 2001
+++ antiword/distinfo	Sun Jul 28 06:51:27 2002
@@ -1 +1 @@
-MD5 (antiword-0.32.tar.gz) = bbbef871b7e7bea4df2102c8f634f81e
+MD5 (antiword-0.33.tar.gz) = e2178402066bbb1f5b3a49d47316a1fc
diff -ruN --exclude CVS /usr/ports/textproc/antiword/files/patch-Makefile.Linux antiword/files/patch-Makefile.Linux
--- /usr/ports/textproc/antiword/files/patch-Makefile.Linux	Wed Nov 21 04:33:28 2001
+++ antiword/files/patch-Makefile.Linux	Thu Jan  1 08:00:00 1970
@@ -1,29 +0,0 @@
---- Makefile.Linux.orig	Sat Jul 21 15:58:03 2001
-+++ Makefile.Linux	Sat Nov  3 15:30:36 2001
-@@ -2,7 +2,7 @@
- # Makefile for antiword (Linux version)
- #
- 
--CC	= gcc
-+CC	?= gcc
- LD	= gcc
- 
- # must be equal to DEBUG or NDEBUG
-@@ -12,7 +12,7 @@
- 
- LDLIBS	=
- 
--CFLAGS	= -Wall -pedantic $(OPT) -D$(DB)
-+CFLAGS	+= -Wall -pedantic -D$(DB)
- LDFLAGS	=
- 
- OBJS	=\
-@@ -27,7 +27,7 @@
- 	antiword\
- 	kantiword
- 
--INSTALL_DIR = $(HOME)/bin
-+INSTALL_DIR = $(PREFIX)/bin
- 
- all:		$(PROGS)
- 
diff -ruN --exclude CVS /usr/ports/textproc/antiword/files/patch-antiword.h antiword/files/patch-antiword.h
--- /usr/ports/textproc/antiword/files/patch-antiword.h	Wed Nov 21 04:33:28 2001
+++ antiword/files/patch-antiword.h	Thu Jan  1 08:00:00 1970
@@ -1,11 +0,0 @@
---- antiword.h.orig	Sat Oct 27 08:35:52 2001
-+++ antiword.h	Sat Oct 27 08:36:13 2001
-@@ -143,7 +143,7 @@
- #define ANTIWORD_DIR		"antiword"
- #define FONTNAMES_FILE		"fontname.txt"
- #else
--#define GLOBAL_ANTIWORD_DIR	"/opt/antiword/share"
-+#define GLOBAL_ANTIWORD_DIR	"%%PREFIX%%/share/antiword"
- #define ANTIWORD_DIR		".antiword"
- #define FONTNAMES_FILE		"fontnames"
- #endif /* __dos */
diff -ruN --exclude CVS /usr/ports/textproc/antiword/pkg-plist antiword/pkg-plist
--- /usr/ports/textproc/antiword/pkg-plist	Wed Nov 21 04:33:25 2001
+++ antiword/pkg-plist	Sun Jul 28 08:16:40 2002
@@ -5,6 +5,7 @@
 share/antiword/8859-13.txt
 share/antiword/8859-14.txt
 share/antiword/8859-15.txt
+share/antiword/8859-16.txt
 share/antiword/8859-2.txt
 share/antiword/8859-3.txt
 share/antiword/8859-4.txt
@@ -13,28 +14,29 @@
 share/antiword/8859-7.txt
 share/antiword/8859-8.txt
 share/antiword/8859-9.txt
-share/antiword/Default
-share/antiword/Example
 share/antiword/MacRoman.txt
 share/antiword/UTF-8.txt
-share/antiword/Unicode
 share/antiword/cp1250.txt
 share/antiword/cp1251.txt
 share/antiword/cp1252.txt
+share/antiword/cp437.txt
+share/antiword/cp850.txt
+share/antiword/cp852.txt
 share/antiword/fontnames
-share/antiword/fontnames.russian
 share/antiword/koi8-r.txt
+share/antiword/koi8-u.txt
 share/antiword/roman.txt
 %%PORTDOCS%%share/doc/antiword/COPYING
 %%PORTDOCS%%share/doc/antiword/ChangeLog
 %%PORTDOCS%%share/doc/antiword/Exmh
 %%PORTDOCS%%share/doc/antiword/FAQ
 %%PORTDOCS%%share/doc/antiword/History
-%%PORTDOCS%%share/doc/antiword/Netscape
 %%PORTDOCS%%share/doc/antiword/Mutt
+%%PORTDOCS%%share/doc/antiword/Netscape
 %%PORTDOCS%%share/doc/antiword/QandA
 %%PORTDOCS%%share/doc/antiword/ReadMe
 %%PORTDOCS%%share/doc/antiword/antiword.1
 %%PORTDOCS%%share/doc/antiword/antiword.man
+%%PORTDOCS%%share/doc/antiword/testdoc.doc
 %%PORTDOCS%%@dirrm share/doc/antiword
 @dirrm share/antiword
--- antiword.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




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