svn commit: r323177 - in head/devel/fpp: . files

[William Grzybowski]

Author: wg
Date: Wed Jul 17 15:25:01 2013
New Revision: 323177
URL: http://svnweb.freebsd.org/changeset/ports/323177

Log:
  devel/fpp: minor fixes
  
  - Trim Makefile header
  - NOPORTDOCS -> PORT_OPTIONS:MDOCS
  - Do not use GMAKE
  - Use PLIST_FILES instead of pkg-plist
  
  PR:		ports/180578
  Submitted by:	Anton Shterenlikht <mexas bris.ac.uk>

Added:
  head/devel/fpp/files/patch-Makefile   (contents, props changed)
  head/devel/fpp/files/patch-sparc-Makefile   (contents, props changed)
  head/devel/fpp/files/patch-src-Makefile.common   (contents, props changed)
Deleted:
  head/devel/fpp/files/patch-aa
  head/devel/fpp/files/patch-ab
  head/devel/fpp/files/patch-sparc::Makefile
  head/devel/fpp/pkg-plist
Modified:
  head/devel/fpp/Makefile
  head/devel/fpp/pkg-descr

Modified: head/devel/fpp/Makefile
==============================================================================
--- head/devel/fpp/Makefile	Wed Jul 17 15:20:23 2013	(r323176)
+++ head/devel/fpp/Makefile	Wed Jul 17 15:25:01 2013	(r323177)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: Sun fortran preprocessor fpp
-# Date created:		30 January 1996
-# Whom:		 	vazquez at iqm.unicamp.br
-#
+# Created by: vazquez at iqm.unicamp.br
 # $FreeBSD$
-#
 
 PORTNAME=	fpp
 PORTVERSION=	1.1
@@ -17,17 +13,23 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports at 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>

Added: head/devel/fpp/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/fpp/files/patch-Makefile	Wed Jul 17 15:25:01 2013	(r323177)
@@ -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)

Added: head/devel/fpp/files/patch-sparc-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/fpp/files/patch-sparc-Makefile	Wed Jul 17 15:25:01 2013	(r323177)
@@ -0,0 +1,17 @@
+
+$FreeBSD$
+
+--- sparc/Makefile.orig	Tue Mar 18 21:23:25 1997
++++ sparc/Makefile	Mon Oct 21 14:10:57 2002
+@@ -1,8 +1,8 @@
+ SRC		= ../src
+ 
+-CC		= gcc 
+-COPTS   	= -ansi -O -w
+-EXTRA_DEF	= "-DRELEASE=\"v1.1\""
++CC		?= gcc 
++COPTS   	= -ansi -w ${CFLAGS}
++EXTRA_DEF	= "-DRELEASE=\"v1.1\"" -I../src
+ 
+ all:	fpp
+ 

Added: head/devel/fpp/files/patch-src-Makefile.common
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/fpp/files/patch-src-Makefile.common	Wed Jul 17 15:25:01 2013	(r323177)
@@ -0,0 +1,22 @@
+--- src/Makefile.common.orig	Tue Mar 18 21:23:18 1997
++++ src/Makefile.common	Mon Oct 21 14:08:06 2002
+@@ -20,7 +20,7 @@
+ fpp:	$(OBJ) $(OBJ1) $(EXTRA_LIB)
+ 	$(CC) $(COPTS) -o $@ $(OBJ) $(OBJ1) $(EXTRA_LIB)
+ 
+-$(OBJ):	$$(@:%.o=$(SRC)/%.c)
++$(OBJ):	#$$(@:%.o=$(SRC)/%.c)
+ 	$(CC) -c $(ALL_OPTS) $(@:%.o=$(SRC)/%.c)
+ 
+ y.tab.o: y.tab.c
+@@ -34,8 +34,8 @@
+ lint:	$(LINTFILES)
+ 	$(LINT) $(LINTFILES)
+ 
+-$(LINTFILES): $$(@:%.ln=$(SRC)/%.c)
+-	$(LINT) $(LOPTS) $(EXTRA_DEF) $(EXTRA_INC) $(@:%.ln=$(SRC)/%.c)
++#$(LINTFILES): $$(@:%.ln=$(SRC)/%.c)
++#	$(LINT) $(LOPTS) $(EXTRA_DEF) $(EXTRA_INC) $(@:%.ln=$(SRC)/%.c)
+ 
+ clean:
+ 	$(RM) fpp *.o y.tab.c $(LINTFILES)

Modified: head/devel/fpp/pkg-descr
==============================================================================
--- head/devel/fpp/pkg-descr	Wed Jul 17 15:20:23 2013	(r323176)
+++ head/devel/fpp/pkg-descr	Wed Jul 17 15:25:01 2013	(r323177)
@@ -6,3 +6,5 @@ capabilities.  However, cpp is too close
 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/