diff --git a/devel/cdecl/Makefile b/devel/cdecl/Makefile
index 28e09823fe68..84454e5a7348 100644
--- a/devel/cdecl/Makefile
+++ b/devel/cdecl/Makefile
@@ -17,14 +17,14 @@ MASTER_SITES=	ftp://ftp.netsw.org/softeng/lang/c/tools/cdecl/  \
 
 MAINTAINER=	ports@FreeBSD.org
 
-ALL_TARGET=	
+ALL_TARGET=	${PORTNAME}
 MAN1=		cdecl.1
 MLINKS=		cdecl.1 c++decl.1
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/cdecl
-	${INSTALL_DATA} ${WRKSRC}/testset* ${PREFIX}/share/doc/cdecl
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/testset* ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/cdecl/files/patch-01 b/devel/cdecl/files/patch-01
index d777b627ba6c..a694cdca8d8c 100644
--- a/devel/cdecl/files/patch-01
+++ b/devel/cdecl/files/patch-01
@@ -1,5 +1,5 @@
---- Makefile.orig	Mon Jan 15 21:36:38 1996
-+++ Makefile	Sun Feb 13 21:21:04 2000
+--- Makefile.orig	Tue Jan 16 14:36:38 1996
++++ Makefile	Sat Nov 30 22:45:23 2002
 @@ -15,13 +15,13 @@
  #
  # add -DUSE_READLINE	To compile in support for the GNU readline library.
@@ -15,7 +15,21 @@
 -CATDIR= /usr/man/cat1
 +BINDIR= $(PREFIX)/bin
 +MANDIR= $(PREFIX)/man/man1
-+CATDIR= $(PREFIX/usr/man/cat1
++CATDIR= $(PREFIX)/man/cat1
  INSTALL= install -c
  INSTALL_DATA= install -c -m 644
  
+@@ -43,10 +43,10 @@
+ 	./c++decl < testset++
+ 
+ install: cdecl
+-	$(INSTALL) cdecl $(BINDIR)
++	${BSD_INSTALL_PROGRAM} cdecl $(BINDIR)
+ 	ln $(BINDIR)/cdecl $(BINDIR)/c++decl
+-	$(INSTALL_DATA) cdecl.1 $(MANDIR)
+-	$(INSTALL_DATA) c++decl.1 $(MANDIR)
++	${BSD_INSTALL_MAN} cdecl.1 $(MANDIR)
++	${BSD_INSTALL_MAN} c++decl.1 $(MANDIR)
+ 
+ clean:
+ 	rm -f cdgram.c cdlex.c cdecl y.output c++decl
diff --git a/devel/cdecl/pkg-plist b/devel/cdecl/pkg-plist
index 491fa3d1de71..bac6e279cb2f 100644
--- a/devel/cdecl/pkg-plist
+++ b/devel/cdecl/pkg-plist
@@ -1,6 +1,6 @@
 @comment $FreeBSD$
 bin/cdecl
 bin/c++decl
-share/doc/cdecl/testset
-share/doc/cdecl/testset++
-@dirrm share/doc/cdecl
+%%PORTDOCS%%share/doc/cdecl/testset
+%%PORTDOCS%%share/doc/cdecl/testset++
+%%PORTDOCS%%@dirrm share/doc/cdecl