From cd820ee6a3f6bafead87d19d929a15d985921083 Mon Sep 17 00:00:00 2001
From: Doug Barton <dougb@FreeBSD.org>
Date: Sun, 22 Aug 2004 18:45:22 +0000
Subject: Upgrade to 1.6.1, the latest version from sourceforge.

Switch to using PORTDOCS and PLIST_FILES instead of pkg-plist

PR:		ports/70412
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>
---
 print/hpijs/Makefile  | 10 ++++++----
 print/hpijs/distinfo  |  4 ++--
 print/hpijs/pkg-plist |  4 ----
 3 files changed, 8 insertions(+), 10 deletions(-)
 delete mode 100644 print/hpijs/pkg-plist

(limited to 'print/hpijs')

diff --git a/print/hpijs/Makefile b/print/hpijs/Makefile
index c5a870e02b85..2cc4feeec16a 100644
--- a/print/hpijs/Makefile
+++ b/print/hpijs/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	hpijs
-PORTVERSION=	1.5
+PORTVERSION=	1.6.1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	hpinkjet
@@ -17,12 +17,14 @@ COMMENT=	Drivers and support resources for HP Inkjet Printers
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--disable-foomatic-install
+CONFIGURE_ARGS=	--disable-cups-install --disable-foomatic-install
+
+PORTDOCS=	gs_hpijs.png hpijs_readme.html
+PLIST_FILES=	bin/hpijs
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|CFLAGS="-O2 -Wall"|CFLAGS="\$$CFLAGS"|g ; \
-		 s|CXXFLAGS="-O2 -Wall"|CXXFLAGS="\$$CXXFLAGS"|g ; \
-		 s|<malloc\.h>|<stdlib.h>|g' ${WRKSRC}/configure
+		 s|CXXFLAGS="-O2 -Wall"|CXXFLAGS="\$$CXXFLAGS"|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's| ijs.[cho]||g ; \
 		 s| ijs_client.h||g ; \
 		 s| ijs_server.[cho]||g ; \
diff --git a/print/hpijs/distinfo b/print/hpijs/distinfo
index be419d8ac009..5f6896175037 100644
--- a/print/hpijs/distinfo
+++ b/print/hpijs/distinfo
@@ -1,2 +1,2 @@
-MD5 (hpijs-1.5.tar.gz) = 348bbc20f42b9d7dae4b08590649098b
-SIZE (hpijs-1.5.tar.gz) = 1141804
+MD5 (hpijs-1.6.1.tar.gz) = 03563d737f03ff94432423ad885db763
+SIZE (hpijs-1.6.1.tar.gz) = 614264
diff --git a/print/hpijs/pkg-plist b/print/hpijs/pkg-plist
deleted file mode 100644
index 291df26374d0..000000000000
--- a/print/hpijs/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/hpijs
-%%PORTDOCS%%%%DOCSDIR%%/gs_hpijs.png
-%%PORTDOCS%%%%DOCSDIR%%/hpijs_readme.html
-%%PORTDOCS%%@dirrm share/doc/hpijs
-- 
cgit v1.2.3