5 files changed, 43 insertions, 31 deletions

diff --git a/print/libharu/Makefile b/print/libharu/Makefile
index ad0b0d219aa5..6dc3b70deed7 100644
--- a/print/libharu/Makefile
+++ b/print/libharu/Makefile
@@ -7,32 +7,20 @@
 #
 
 PORTNAME=	libharu
-PORTVERSION=	2.0.8
+PORTVERSION=	2.1.0
 CATEGORIES=	print
-MASTER_SITES=	SF
-DISTNAME=	${PORTNAME}_${PORTVERSION:S/./_/g}
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	http://libharu.org/files/
 
-MAINTAINER=	ijliao@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Haru Free PDF Library
 
 LIB_DEPENDS=	png:${PORTSDIR}/graphics/png
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--shared \
-		--prefix=${PREFIX} \
-		--cflags="${CFLAGS}"
+GNU_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 USE_LDCONFIG=	yes
 
-PLIST_FILES=	include/hpdf.h \
-		include/hpdf_consts.h \
-		include/hpdf_types.h \
-		lib/libhpdf.so \
-		lib/libhpdf.so.1 \
-		lib/libhpdf.so.1.0.0
-
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
 
diff --git a/print/libharu/distinfo b/print/libharu/distinfo
index df5c6ea6498c..298dd4b8e236 100644
--- a/print/libharu/distinfo
+++ b/print/libharu/distinfo
@@ -1,3 +1,3 @@
-MD5 (libharu_2_0_8.tgz) = 4b9714fd89b4134b0b9c93f857add327
-SHA256 (libharu_2_0_8.tgz) = 825a18796868fecef150339a731bab7ba3ce393acba41834a7384da93a5eb7e1
-SIZE (libharu_2_0_8.tgz) = 1572158
+MD5 (libharu-2.1.0.tar.gz) = 0623b8fb08ae1b28af08b2cdbd66b662
+SHA256 (libharu-2.1.0.tar.gz) = 3c1f22ca55af6714b072866e212b38b082004783df7ce6ef61bb337c29101b09
+SIZE (libharu-2.1.0.tar.gz) = 2050828
diff --git a/print/libharu/files/patch-configure b/print/libharu/files/patch-configure
deleted file mode 100644
index c795b694f1c4..000000000000
--- a/print/libharu/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Fri Jun 15 22:47:35 2007
-+++ configure	Fri Jun 15 22:48:13 2007
-@@ -24,7 +24,7 @@
- CFLAGS_EXE='-o '
- CFLAGS_USER=
- 
--LDFLAGS='-L.'
-+LDFLAGS='-L. -L${PREFIX}/lib'
- LDFLAGS_DEMO='-L.'
- LDFLAGS_ADD=''
- 
diff --git a/print/libharu/pkg-descr b/print/libharu/pkg-descr
index dbe9627e448b..92787cd46665 100644
--- a/print/libharu/pkg-descr
+++ b/print/libharu/pkg-descr
@@ -12,4 +12,4 @@ PDF. It supports the following features.
 You can add the feature of PDF creation by using HARU without understanding
 complicated internal structure of PDF.
 
-WWW: http://libharu.sourceforge.net/
+WWW: http://libharu.org/
diff --git a/print/libharu/pkg-plist b/print/libharu/pkg-plist
new file mode 100644
index 000000000000..ab2659ccac8b
--- /dev/null
+++ b/print/libharu/pkg-plist
@@ -0,0 +1,35 @@
+include/hpdf.h
+include/hpdf_annotation.h
+include/hpdf_catalog.h
+include/hpdf_conf.h
+include/hpdf_config.h
+include/hpdf_consts.h
+include/hpdf_destination.h
+include/hpdf_doc.h
+include/hpdf_encoder.h
+include/hpdf_encrypt.h
+include/hpdf_encryptdict.h
+include/hpdf_error.h
+include/hpdf_ext_gstate.h
+include/hpdf_font.h
+include/hpdf_fontdef.h
+include/hpdf_gstate.h
+include/hpdf_image.h
+include/hpdf_info.h
+include/hpdf_list.h
+include/hpdf_mmgr.h
+include/hpdf_objects.h
+include/hpdf_outline.h
+include/hpdf_page_label.h
+include/hpdf_pages.h
+include/hpdf_streams.h
+include/hpdf_types.h
+include/hpdf_u3d.h
+include/hpdf_utils.h
+include/hpdf_version.h
+lib/libhpdf.so
+lib/libhpdf-2.1.0.so
+lib/libhpdf.la
+lib/libhpdf.a
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%