diff --git a/cad/gdsreader/Makefile b/cad/gdsreader/Makefile
index 51be9172d630..16fbad1d5260 100644
--- a/cad/gdsreader/Makefile
+++ b/cad/gdsreader/Makefile
@@ -10,24 +10,16 @@ DISTNAME=	GDSreader.${PORTVERSION}
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	GDS2 stream file to Postscript and HP/GL converter
 
-MAN1=		gdsreader.1 maptolayer.1
 PORTDOCS=	README README.povray ChangeLog
 EXFILES=	layers.config test.gds layers.config.7HP.5ML \
 		layers.config.5AM.4ML
 PLIST_FILES=	bin/gdsreader bin/maptolayer \
-		${EXFILES:S,^,${EXAMPLESDIR_REL}/,}
+		${EXFILES:S,^,${EXAMPLESDIR_REL}/,} \
+		man/man1/gdsreader.1.gz man/man1/maptolayer.1.gz
 PLIST_DIRS=	${EXAMPLESDIR_REL}
 
-NO_STAGE=	yes
+INSTALL_TARGET=	install install-data install-docs
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-post-install:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} install-data
-.if ${PORT_OPTIONS:MDOCS}
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} install-docs
-.endif
-
 .include <bsd.port.mk>
diff --git a/cad/gdsreader/files/patch-Makefile b/cad/gdsreader/files/patch-Makefile
index 7ae6e5cc6e78..458b595c30fb 100644
--- a/cad/gdsreader/files/patch-Makefile
+++ b/cad/gdsreader/files/patch-Makefile
@@ -28,16 +28,16 @@
 -	 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 $(BINDIR) && ${INSTALL_PROGRAM} maptolayer gdsreader $(BINDIR)
-+	mkdir -p $(MANDIR) && ${INSTALL_MAN} 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 $(DOCDIR) && ${INSTALL_DATA} README README.povray \
-+		ChangeLog $(DOCDIR)
++	mkdir -p $(DESTDIR)$(DOCDIR) && ${INSTALL_DATA} README README.povray \
++		ChangeLog $(DESTDIR)$(DOCDIR)
 +
 +install-data:
-+	mkdir -p $(EXDIR) && ${INSTALL_DATA} layers.config test.gds \
-+		layers.config.7HP.5ML layers.config.5AM.4ML $(EXDIR)
++	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