- Update to 0.5.1;

- update MASTER_SITES and WWW.

Prompted by:	ijliao

10 files changed, 10 insertions, 137 deletions

diff --git a/textproc/xlhtml/Makefile b/textproc/xlhtml/Makefile
index 003dfbc4e1ff..dec5b9d41a15 100644
--- a/textproc/xlhtml/Makefile
+++ b/textproc/xlhtml/Makefile
@@ -6,24 +6,21 @@
 #
 
 PORTNAME=	xlhtml
-PORTVERSION=	0.4
+PORTVERSION=	0.5.1
 CATEGORIES=	textproc
-MASTER_SITES=	http://www.xlhtml.org/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	sobomax
+MASTER_SITES=	http://chicago.sourceforge.net/xlhtml/
+DISTNAME=	${PORTNAME}.${PORTVERSION}
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	cole.2:${PORTSDIR}/textproc/cole
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USE_LIBTOOL=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/cole"
+GNU_CONFIGURE=	yes
 
 MAN1=		ppthtml.1 xlhtml.1
 
-do-install:
-	(cd ${WRKSRC}/xlhtml && ${MAKE} ${INSTALL_TARGET})
-	(cd ${WRKSRC}/ppthtml && ${MAKE} ${INSTALL_TARGET})
+post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/xlhtml
 	${INSTALL_MAN} ${WRKSRC}/xlhtml/README \
diff --git a/textproc/xlhtml/distinfo b/textproc/xlhtml/distinfo
index 48319ec5bf31..1479c36ac0dc 100644
--- a/textproc/xlhtml/distinfo
+++ b/textproc/xlhtml/distinfo
@@ -1 +1 @@
-MD5 (xlhtml-0.4.tar.gz) = 4ead069a59340e728ce3597cd07aa222
+MD5 (xlhtml.0.5.1.tgz) = deeb108545e1848fce5dcb8d84d8a48e
diff --git a/textproc/xlhtml/files/patch-aa b/textproc/xlhtml/files/patch-aa
deleted file mode 100644
index 7dd08f948839..000000000000
--- a/textproc/xlhtml/files/patch-aa
+++ /dev/null
@@ -1,37 +0,0 @@
---- xlhtml/Makefile.in.orig	Tue Dec  4 10:57:06 2001
-+++ xlhtml/Makefile.in	Mon Feb 25 01:19:14 2002
-@@ -76,13 +76,13 @@
- 
- EXTRA_DIST = README ChangeLog TODO THANKS Test.xls Test.html xlhtml.1 
- 
--INCLUDES = -I../cole
-+INCLUDES = -I$(LOCALBASE)/include -I../cole
- noinst_PROGRAMS = xldump xlcdump
- noinst_SCRIPTS = xls-handler gpdemo
- man_MANS = xlhtml.1
- bin_SCRIPTS = nsopen nsxlview
- bin_PROGRAMS = xlhtml
--LDADD = ../cole/libcole.a
-+LDADD = -L$(LOCALBASE)/lib -lcole
- xlhtml_SOURCES = xlhtml.c 
- xldump_SOURCES = xldump.c 
- xlcdump_SOURCES = xlcdump.c 
-@@ -99,15 +99,15 @@
- LIBS = @LIBS@
- xlhtml_OBJECTS =  xlhtml.o
- xlhtml_LDADD = $(LDADD)
--xlhtml_DEPENDENCIES =  ../cole/libcole.a
-+xlhtml_DEPENDENCIES =
- xlhtml_LDFLAGS = 
- xldump_OBJECTS =  xldump.o
- xldump_LDADD = $(LDADD)
--xldump_DEPENDENCIES =  ../cole/libcole.a
-+xldump_DEPENDENCIES =
- xldump_LDFLAGS = 
- xlcdump_OBJECTS =  xlcdump.o
- xlcdump_LDADD = $(LDADD)
--xlcdump_DEPENDENCIES =  ../cole/libcole.a
-+xlcdump_DEPENDENCIES =
- xlcdump_LDFLAGS = 
- SCRIPTS =  $(bin_SCRIPTS) $(noinst_SCRIPTS)
- 
diff --git a/textproc/xlhtml/files/patch-ab b/textproc/xlhtml/files/patch-ab
deleted file mode 100644
index 17d4646b32f7..000000000000
--- a/textproc/xlhtml/files/patch-ab
+++ /dev/null
@@ -1,33 +0,0 @@
---- ppthtml/Makefile.in.orig	Mon Feb 25 00:50:26 2002
-+++ ppthtml/Makefile.in	Mon Feb 25 00:51:18 2002
-@@ -76,13 +76,13 @@
- 
- EXTRA_DIST = README ChangeLog TODO THANKS test.ppt ppthtml.1
- 
--INCLUDES = -I../cole
-+INCLUDES = -I$(LOCALBASE)/include -I../cole
- 
- noinst_PROGRAMS = pptdump 
- man_MANS = ppthtml.1
- bin_SCRIPTS = nspptview
- bin_PROGRAMS = ppthtml
--LDADD = ../cole/libcole.a
-+LDADD = -L$(LOCALBASE)/lib -lcole
- ppthtml_SOURCES = ppthtml.c 
- AM_CFLAGS = -Wall -Wshadow -Wcast-align -Wpointer-arith 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -97,12 +97,12 @@
- LIBS = @LIBS@
- ppthtml_OBJECTS =  ppthtml.o
- ppthtml_LDADD = $(LDADD)
--ppthtml_DEPENDENCIES =  ../cole/libcole.a
-+ppthtml_DEPENDENCIES =
- ppthtml_LDFLAGS = 
- pptdump_SOURCES = pptdump.c
- pptdump_OBJECTS =  pptdump.o
- pptdump_LDADD = $(LDADD)
--pptdump_DEPENDENCIES =  ../cole/libcole.a
-+pptdump_DEPENDENCIES =
- pptdump_LDFLAGS = 
- SCRIPTS =  $(bin_SCRIPTS)
- 
diff --git a/textproc/xlhtml/files/patch-af b/textproc/xlhtml/files/patch-af
deleted file mode 100644
index 182b2c5363b7..000000000000
--- a/textproc/xlhtml/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Mon Feb 25 01:11:12 2002
-+++ Makefile.in	Mon Feb 25 01:11:18 2002
-@@ -74,7 +74,7 @@
- STRIP = @STRIP@
- VERSION = @VERSION@
- 
--SUBDIRS = cole xlhtml ppthtml
-+SUBDIRS = xlhtml ppthtml
- EXTRA_DIST = README-xlhtml README-ppthtml
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/textproc/xlhtml/files/patch-ag b/textproc/xlhtml/files/patch-ag
deleted file mode 100644
index b0cd8e3a5fb0..000000000000
--- a/textproc/xlhtml/files/patch-ag
+++ /dev/null
@@ -1,7 +0,0 @@
---- Makefile.am.orig	Mon Feb 25 01:12:58 2002
-+++ Makefile.am	Mon Feb 25 01:13:04 2002
-@@ -1,3 +1,3 @@
--SUBDIRS = cole xlhtml ppthtml
-+SUBDIRS = xlhtml ppthtml
- EXTRA_DIST = README-xlhtml README-ppthtml
- 
diff --git a/textproc/xlhtml/files/patch-ah b/textproc/xlhtml/files/patch-ah
deleted file mode 100644
index a454bad29664..000000000000
--- a/textproc/xlhtml/files/patch-ah
+++ /dev/null
@@ -1,18 +0,0 @@
---- xlhtml/Makefile.am.orig	Mon Feb 25 01:15:12 2002
-+++ xlhtml/Makefile.am	Mon Feb 25 01:15:59 2002
-@@ -2,13 +2,13 @@
- 
- EXTRA_DIST = README ChangeLog TODO THANKS Test.xls Test.html xlhtml.1 
- 
--INCLUDES = -I../cole
-+INCLUDES = -I$(LOCALBASE)/include -I../cole
- noinst_PROGRAMS = xldump xlcdump
- noinst_SCRIPTS = xls-handler gpdemo
- man_MANS = xlhtml.1
- bin_SCRIPTS = nsopen nsxlview
- bin_PROGRAMS = xlhtml
--LDADD = ../cole/libcole.a
-+LDADD = -L$(LOCALBASE)/lib -lcole
- xlhtml_SOURCES = xlhtml.c 
- xldump_SOURCES = xldump.c 
- xlcdump_SOURCES = xlcdump.c 
diff --git a/textproc/xlhtml/files/patch-ai b/textproc/xlhtml/files/patch-ai
deleted file mode 100644
index 8a025abc134a..000000000000
--- a/textproc/xlhtml/files/patch-ai
+++ /dev/null
@@ -1,18 +0,0 @@
---- ppthtml/Makefile.am.orig	Mon Feb 25 01:16:11 2002
-+++ ppthtml/Makefile.am	Mon Feb 25 01:16:32 2002
-@@ -2,13 +2,13 @@
- 
- EXTRA_DIST = README ChangeLog TODO THANKS test.ppt ppthtml.1
- 
--INCLUDES = -I../cole
-+INCLUDES = -I$(LOCALBASE)/include -I../cole
- 
- noinst_PROGRAMS = pptdump 
- man_MANS = ppthtml.1
- bin_SCRIPTS = nspptview
- bin_PROGRAMS = ppthtml
--LDADD = ../cole/libcole.a
-+LDADD = -L$(LOCALBASE)/lib -lcole
- ppthtml_SOURCES = ppthtml.c 
- AM_CFLAGS = -Wall -Wshadow -Wcast-align -Wpointer-arith 
- 
diff --git a/textproc/xlhtml/pkg-descr b/textproc/xlhtml/pkg-descr
index b469b6c2c820..bc209b84790f 100644
--- a/textproc/xlhtml/pkg-descr
+++ b/textproc/xlhtml/pkg-descr
@@ -5,4 +5,4 @@ Using the program xlHtml, you can extract the content of a file generated
 by Microsoft Excel and PowerPoint and express its content using HTML or tabs
 separated text.
 
-WWW: http://www.xlhtml.org/
+WWW: http://chicago.sourceforge.net/xlhtml/
diff --git a/textproc/xlhtml/pkg-plist b/textproc/xlhtml/pkg-plist
index 045e94dfda89..ad4ba332126e 100644
--- a/textproc/xlhtml/pkg-plist
+++ b/textproc/xlhtml/pkg-plist
@@ -3,6 +3,6 @@ bin/nspptview
 bin/nsxlview
 bin/ppthtml
 bin/xlhtml
-share/doc/xlhtml/README.xlhtml
 share/doc/xlhtml/README.ppthtml
+share/doc/xlhtml/README.xlhtml
 @dirrm share/doc/xlhtml