- Install the psm* commands correctly, they used to be the same binary but

  aren't with the current version. Sigh.
- Install docs only if NOPORTDOCS is not set.
- Fix some warnings, remove -pedantic and -Wall to silence the rest.
- Bump PORTREVISION

PR: 30098
Submitted by: MAINTAINER

6 files changed, 42 insertions, 10 deletions

diff --git a/graphics/hppsmtools/Makefile b/graphics/hppsmtools/Makefile
index 1d76c53ba7db..9771b7930f0e 100644
--- a/graphics/hppsmtools/Makefile
+++ b/graphics/hppsmtools/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hppsmtools
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://unimut.fsk.uni-heidelberg.de/demi/photosmart/ \
 		http://www.freenix.no/~anders/ \
@@ -17,13 +18,13 @@ MAINTAINER=	anders@fix.no
 ALL_TARGET=
 
 do-install:
-	@${RM} -f ${PREFIX}/bin/psmget ${PREFIX}/bin/psmdir
-	@${RM} -f ${PREFIX}/bin/psmdel ${PREFIX}/bin/psmsho
 	@${INSTALL_PROGRAM} ${WRKSRC}/psmget ${PREFIX}/bin/
-	@${LN} ${PREFIX}/bin/psmget ${PREFIX}/bin/psmdir
-	@${LN} ${PREFIX}/bin/psmget ${PREFIX}/bin/psmdel
-	@${LN} ${PREFIX}/bin/psmget ${PREFIX}/bin/psmsho
+	@${INSTALL_PROGRAM} ${WRKSRC}/psmdir ${PREFIX}/bin/
+	@${INSTALL_PROGRAM} ${WRKSRC}/psmdel ${PREFIX}/bin/
+	@${INSTALL_PROGRAM} ${WRKSRC}/psmsho ${PREFIX}/bin/
+.if !defined(NOPORTDOCS)
 	@${INSTALL} -d -m 0755 ${PREFIX}/share/doc/hppsmtools
 	@${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/hppsmtools/
+.endif
 
 .include <bsd.port.mk>
diff --git a/graphics/hppsmtools/files/patch-aa b/graphics/hppsmtools/files/patch-aa
index aa1fc2becf9e..d939436777fd 100644
--- a/graphics/hppsmtools/files/patch-aa
+++ b/graphics/hppsmtools/files/patch-aa
@@ -1,12 +1,12 @@
---- Makefile.orig	Wed Mar  1 09:23:12 2000
-+++ Makefile	Mon Mar 20 19:23:54 2000
+--- Makefile.orig	Wed Mar  1 15:23:12 2000
++++ Makefile	Sun Aug 26 12:33:29 2001
 @@ -6,8 +6,7 @@
  # Set this to your liking
  PREFIX=/usr/local
  
 -COPTS=$(ADDIT_DEFS) -Wall -pedantic
 -CC=gcc
-+COPTS=$(ADDIT_DEFS) -Wall -pedantic $(CFLAGS)
++COPTS=$(ADDIT_DEFS) $(CFLAGS)
  
  FILES=	psm.h psm.c \
  	exif.h exifparse.c \
diff --git a/graphics/hppsmtools/files/patch-exif.h b/graphics/hppsmtools/files/patch-exif.h
new file mode 100644
index 000000000000..ddbbed86c1df
--- /dev/null
+++ b/graphics/hppsmtools/files/patch-exif.h
@@ -0,0 +1,11 @@
+--- exif.h.orig	Sun Aug 26 12:32:35 2001
++++ exif.h	Sun Aug 26 12:32:44 2001
+@@ -94,8 +94,6 @@
+ 
+ #define EXIF_INVALID_RATIONAL 1e40
+ 
+-typedef unsigned char uint8_t;
+-
+ /* The next two types are actually private */
+ typedef struct
+ {	int16_t tag;
diff --git a/graphics/hppsmtools/files/patch-psmdel.c b/graphics/hppsmtools/files/patch-psmdel.c
new file mode 100644
index 000000000000..7432fd0e8e57
--- /dev/null
+++ b/graphics/hppsmtools/files/patch-psmdel.c
@@ -0,0 +1,10 @@
+--- psmdel.c.orig	Sun Aug 26 12:29:07 2001
++++ psmdel.c	Sun Aug 26 12:29:11 2001
+@@ -3,7 +3,6 @@
+ #include <unistd.h>
+ #include <signal.h>
+ #include <string.h>
+-#include <malloc.h>
+ #include "psm.h"
+ #include "config.h"
+ 
diff --git a/graphics/hppsmtools/files/patch-psmdir.c b/graphics/hppsmtools/files/patch-psmdir.c
new file mode 100644
index 000000000000..9bf35b545e58
--- /dev/null
+++ b/graphics/hppsmtools/files/patch-psmdir.c
@@ -0,0 +1,10 @@
+--- psmdir.c.orig	Sun Aug 26 12:29:38 2001
++++ psmdir.c	Sun Aug 26 12:29:44 2001
+@@ -3,7 +3,6 @@
+ #include <unistd.h>
+ #include <signal.h>
+ #include <string.h>
+-#include <malloc.h>
+ #include <math.h>
+ #include "psm.h"
+ #include "config.h"
diff --git a/graphics/hppsmtools/pkg-plist b/graphics/hppsmtools/pkg-plist
index 90c9462528ec..07fae506d4a2 100644
--- a/graphics/hppsmtools/pkg-plist
+++ b/graphics/hppsmtools/pkg-plist
@@ -2,5 +2,5 @@ bin/psmget
 bin/psmdir
 bin/psmdel
 bin/psmsho
-share/doc/hppsmtools/README
-@dirrm share/doc/hppsmtools
+%%PORTDOCS%%share/doc/hppsmtools/README
+%%PORTDOCS%%@dirrm share/doc/hppsmtools