diff --git a/cad/gdsreader/Makefile b/cad/gdsreader/Makefile
index dbf3391df80a..65f0340727ff 100644
--- a/cad/gdsreader/Makefile
+++ b/cad/gdsreader/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	gdsreader
 PORTVERSION=	0.3.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	cad
 MASTER_SITES=	LOCAL/hrs
 DISTNAME=	GDSreader.${PORTVERSION}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	GDS2 stream file to Postscript and HP/GL converter
 
 LICENSE=	GPLv2
 
 PORTDOCS=	README README.povray ChangeLog
 PORTEXAMPLES=	layers.config test.gds layers.config.7HP.5ML \
 		layers.config.5AM.4ML
 PLIST_FILES=	bin/gdsreader bin/maptolayer \
-		man/man1/gdsreader.1.gz man/man1/maptolayer.1.gz
+		share/man/man1/gdsreader.1.gz share/man/man1/maptolayer.1.gz
 
 INSTALL_TARGET=	install install-data install-docs
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .include <bsd.port.mk>
diff --git a/cad/gdsreader/files/patch-Makefile b/cad/gdsreader/files/patch-Makefile
index 458b595c30fb..38d61b0e393d 100644
--- a/cad/gdsreader/files/patch-Makefile
+++ b/cad/gdsreader/files/patch-Makefile
@@ -1,43 +1,53 @@
---- Makefile.orig	Thu Feb 24 12:15:23 2005
-+++ Makefile	Sun Apr 29 01:04:11 2007
-@@ -1,10 +1,15 @@
+--- Makefile.orig	2005-02-24 03:15:23 UTC
++++ Makefile
+@@ -1,11 +1,16 @@
  
 -CC = gcc
 -INSTROOT=/usr/local
 +CC?= gcc
 +INSTROOT?=${PREFIX}
  BINDIR=$(INSTROOT)/bin
 -DOCDIR=$(INSTROOT)/doc/gdsreader-0.3.2
+-MANDIR=$(INSTROOT)/man/man1
 +DOCDIR=$(INSTROOT)/share/doc/gdsreader
 +EXDIR=$(INSTROOT)/share/examples/gdsreader
- MANDIR=$(INSTROOT)/man/man1
++MANDIR=$(INSTROOT)/share/man/man1
  
+-#CFLAGS = -I. 
 +INSTALL_PROGRAM?=	${BSD_INSTALL_PROGRAM}
 +INSTALL_DATA?=	${BSD_INSTALL_DATA}
 +INSTALL_MAN?=	${BSD_INSTALL_MAN}
 +
- #CFLAGS = -I. 
++#CFLAGS = -I.
  CFLAGS = -I. -Wall -g #-pg
  LDFLAGS = #-pg
-@@ -19,11 +24,16 @@
+ 
+@@ -19,18 +24,20 @@ install: gdsreader maptolayer
  	${CC} ${LDFLAGS} -o gdsreader ${OBJS} -lm
  
  install: gdsreader maptolayer
 -	mkdir -p $(DOCDIR) && cp -f COPYING README README.povray \
 -	 layers.config test.gds layers.config.7HP.5ML ChangeLog \
 -	 layers.config.5AM.4ML $(DOCDIR)
 -	mkdir -p $(BINDIR) && cp -f maptolayer gdsreader $(BINDIR)
 -	mkdir -p $(MANDIR) && cp -f maptolayer.1 gdsreader.1 $(MANDIR)
 +	mkdir -p $(DESTDIR)$(BINDIR) && ${INSTALL_PROGRAM} maptolayer gdsreader $(DESTDIR)$(BINDIR)
 +	mkdir -p $(DESTDIR)$(MANDIR) && ${INSTALL_MAN} maptolayer.1 gdsreader.1 $(DESTDIR)$(MANDIR)
-+
+ 
 +install-docs:
 +	mkdir -p $(DESTDIR)$(DOCDIR) && ${INSTALL_DATA} README README.povray \
 +		ChangeLog $(DESTDIR)$(DOCDIR)
 +
 +install-data:
 +	mkdir -p $(DESTDIR)$(EXDIR) && ${INSTALL_DATA} layers.config test.gds \
 +		layers.config.7HP.5ML layers.config.5AM.4ML $(DESTDIR)$(EXDIR)
- 
++
  maptolayer: maptolayer.c
  	$(CC) -o maptolayer maptolayer.c
+ 
+ clean:
+ 	rm -f *.o *.bak core out result.xg result.txt result.ps gdsreader \
+ 	 maptolayer result.pov
+-
+-
+-