Update to 0.33a

PR:		37403
Submitted by:	maintainer

6 files changed, 64 insertions, 10 deletions

diff --git a/textproc/pdftohtml/Makefile b/textproc/pdftohtml/Makefile
index ad8970dc9dab..39111b4d5551 100644
--- a/textproc/pdftohtml/Makefile
+++ b/textproc/pdftohtml/Makefile
@@ -7,11 +7,12 @@
 #
 
 PORTNAME=	pdftohtml
-PORTVERSION=	0.32b
+PORTVERSION=	0.33a
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+		http://ports.tolkien.dk/pdftohtml/
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}_0_32b
+DISTNAME=	${PORTNAME}_${PORTVERSION:S/./_/}
 
 MAINTAINER=	boll@fork.dk
 
@@ -19,10 +20,6 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_GMAKE=	yes
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/pdftohtml.bin ${PREFIX}/bin/pdftohtml
-	${INSTALL_PROGRAM} ${WRKSRC}/pdftops.bin ${PREFIX}/bin/pdftops
-post-install:
-	strip ${PREFIX}/bin/pdftohtml
-	strip ${PREFIX}/bin/pdftops
+	@${INSTALL_PROGRAM} ${WRKSRC}/pdftohtml ${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/textproc/pdftohtml/distinfo b/textproc/pdftohtml/distinfo
index 331af8d904f5..5d77ed9e8763 100644
--- a/textproc/pdftohtml/distinfo
+++ b/textproc/pdftohtml/distinfo
@@ -1 +1 @@
-MD5 (pdftohtml_0_32b.tar.gz) = 6888ffc3036f099b6ab69760cd71be96
+MD5 (pdftohtml_0_33a.tar.gz) = 9910fb38210be5ea3ec2acc485244fdc
diff --git a/textproc/pdftohtml/files/patch-goo::Makefile b/textproc/pdftohtml/files/patch-goo::Makefile
new file mode 100644
index 000000000000..a7ae08b348d8
--- /dev/null
+++ b/textproc/pdftohtml/files/patch-goo::Makefile
@@ -0,0 +1,18 @@
+--- goo/Makefile.orig	Sun Apr 21 18:26:03 2002
++++ goo/Makefile	Tue Apr 23 23:14:45 2002
+@@ -11,11 +11,11 @@
+ 
+ srcdir = .
+ 
+-CFLAGS = -g -O2 -DHAVE_CONFIG_H -I.. -I$(srcdir)
+-CXXFLAGS = -g -O2 -DHAVE_CONFIG_H -I.. -I$(srcdir)
++CFLAGS += -DHAVE_CONFIG_H -I.. -I$(srcdir)
++CXXFLAGS += -DHAVE_CONFIG_H -I.. -I$(srcdir)
+ 
+-CC = gcc
+-CXX = c++
++CC ?= cc
++CXX ?= c++
+ AR = ar rc
+ RANLIB = ranlib
+ 
diff --git a/textproc/pdftohtml/files/patch-src::Makefile b/textproc/pdftohtml/files/patch-src::Makefile
new file mode 100644
index 000000000000..2e810053b9b7
--- /dev/null
+++ b/textproc/pdftohtml/files/patch-src::Makefile
@@ -0,0 +1,18 @@
+--- src/Makefile.orig	Sun Apr 21 18:25:42 2002
++++ src/Makefile	Tue Apr 23 23:14:08 2002
+@@ -10,13 +10,13 @@
+ GOOLIBDIR = ../goo
+ 
+ 
+-CXXFLAGS = -g -DHAVE_DIRENT_H=1  -I.. -DHAVE_REWINDDIR=1 -DHAVE_POPEN=1   -I$(GOOSRCDIR) -I$(SRCDIR) -I$(XPDFSRCDIR)
++CXXFLAGS += -DHAVE_DIRENT_H=1  -I.. -DHAVE_REWINDDIR=1 -DHAVE_POPEN=1   -I$(GOOSRCDIR) -I$(SRCDIR) -I$(XPDFSRCDIR)
+ 
+ LDFLAGS = 
+ 
+ OTHERLIBS = 
+ 
+-CXX = c++
++CC ?= cc
+ 
+ LIBPREFIX = lib
+ EXE = 
diff --git a/textproc/pdftohtml/files/patch-xpdf::Makefile b/textproc/pdftohtml/files/patch-xpdf::Makefile
new file mode 100644
index 000000000000..96ce9bd5e023
--- /dev/null
+++ b/textproc/pdftohtml/files/patch-xpdf::Makefile
@@ -0,0 +1,22 @@
+--- xpdf/Makefile.orig	Sun Apr 21 18:25:54 2002
++++ xpdf/Makefile	Tue Apr 23 23:02:09 2002
+@@ -9,16 +9,15 @@
+ 
+ SHELL = /bin/sh
+ 
+-prefix = /usr/local
+ srcdir = .
+ 
+ GOOSRCDIR = $(srcdir)/../goo
+ GOOLIBDIR = ../goo
+ 
+-CXXFLAGS = -g -O2 -DHAVE_CONFIG_H -I.. -I$(GOOSRCDIR) -I$(srcdir) 
++CXXFLAGS += -DHAVE_CONFIG_H -I.. -I$(GOOSRCDIR) -I$(srcdir) 
+ 
+-CC = gcc
+-CXX = c++
++CC ?= cc
++CXX ?= c++
+ AR = ar rc
+ RANLIB = ranlib
+ 
diff --git a/textproc/pdftohtml/pkg-plist b/textproc/pdftohtml/pkg-plist
index 16bd196cde4b..6ec57f5c01dc 100644
--- a/textproc/pdftohtml/pkg-plist
+++ b/textproc/pdftohtml/pkg-plist
@@ -1,2 +1 @@
 bin/pdftohtml
-bin/pdftops