7 files changed, 27 insertions, 35 deletions

diff --git a/devel/fpp/Makefile b/devel/fpp/Makefile
index 52364ce75915..1efec5237fb9 100644
--- a/devel/fpp/Makefile
+++ b/devel/fpp/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: Sun fortran preprocessor fpp
-# Date created:		30 January 1996
-# Whom:		 	vazquez@iqm.unicamp.br
-#
+# Created by: vazquez@iqm.unicamp.br
 # $FreeBSD$
-#
 
 PORTNAME=	fpp
 PORTVERSION=	1.1
@@ -17,17 +13,23 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fortran preprocessor for FORTRAN 77 and Fortran 90 programs
 
-USE_GMAKE=	yes
 ALL_TARGET=	bsd44
-INSTALL_TARGET=	bsd44-install
 MAN1=		fpp.1
 
-post-install:
-.if !defined(NOPORTDOCS)
+OPTIONS_DEFINE=	DOCS
+PORTDOCS=	README fpp_spec fpp_license.ps
+
+PLIST_FILES=	bin/fpp
+
+.include <bsd.port.options.mk>
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/bsd44/fpp ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/man/man1/fpp.1 ${MANPREFIX}/man/man1
+
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/fpp_spec ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/fpp_license.ps ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/fpp/files/patch-Makefile b/devel/fpp/files/patch-Makefile
new file mode 100644
index 000000000000..7ed9dd4778c6
--- /dev/null
+++ b/devel/fpp/files/patch-Makefile
@@ -0,0 +1,11 @@
+--- Makefile.orig	Fri Aug 16 16:31:49 1996
++++ Makefile	Fri Feb 14 17:28:49 1997
+@@ -7,3 +7,8 @@
+ 	else echo Bad platform ; fi
+ 
+ dummy:
++
++bsd44:
++	@ echo "Making fpp for `uname -a` ..."
++	@ echo "Read carefully fpp_license.ps before proceeding to use fpp."
++	mkdir bsd44; cp sparc/Makefile bsd44; cd $@; $(MAKE)
diff --git a/devel/fpp/files/patch-aa b/devel/fpp/files/patch-aa
deleted file mode 100644
index af2ea38f6988..000000000000
--- a/devel/fpp/files/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
---- Makefile.orig	Fri Aug 16 16:31:49 1996
-+++ Makefile	Fri Feb 14 17:28:49 1997
-@@ -7,3 +7,15 @@
- 	else echo Bad platform ; fi
- 
- dummy:
-+
-+bsd44:
-+	@ echo "Making fpp for `uname -a` ..."
-+	@ echo "============================="
-+	@ echo "Read carefully fpp_license.ps before proceeding to use fpp."
-+	@ echo ""
-+	mkdir bsd44; cp sparc/Makefile bsd44;
-+	cd $@; gmake
-+
-+bsd44-install:
-+	$(BSD_INSTALL_PROGRAM) bsd44/fpp $(PREFIX)/bin
-+	$(BSD_INSTALL_MAN) man/man1/fpp.1 $(PREFIX)/man/man1/fpp.1
diff --git a/devel/fpp/files/patch-sparc::Makefile b/devel/fpp/files/patch-sparc-Makefile
index f42a2962ba19..f42a2962ba19 100644
--- a/devel/fpp/files/patch-sparc::Makefile
+++ b/devel/fpp/files/patch-sparc-Makefile
diff --git a/devel/fpp/files/patch-ab b/devel/fpp/files/patch-src-Makefile.common
index 9ed4e15dacae..9ed4e15dacae 100644
--- a/devel/fpp/files/patch-ab
+++ b/devel/fpp/files/patch-src-Makefile.common
diff --git a/devel/fpp/pkg-descr b/devel/fpp/pkg-descr
index bcd7aac4cf7a..f6de140a1b89 100644
--- a/devel/fpp/pkg-descr
+++ b/devel/fpp/pkg-descr
@@ -6,3 +6,5 @@ capabilities.  However, cpp is too closely tied into the C language syntax
 and source line format to be used without careful scrutiny.  The proposed
 Fortran PreProcessor, fpp, would provide Fortran-specific source code
 capabilities that C programmers have come to expect in UNIX environments.
+
+WWW: http://netlib.org/fortran/
diff --git a/devel/fpp/pkg-plist b/devel/fpp/pkg-plist
deleted file mode 100644
index 2c19c0497c85..000000000000
--- a/devel/fpp/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-bin/fpp
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/fpp_spec
-%%PORTDOCS%%%%DOCSDIR%%/fpp_license.ps
-%%PORTDOCS%%@dirrm %%DOCSDIR%%