Date: Tue, 16 Jul 2013 13:50:01 GMT From: Anton Shterenlikht <mexas@bristol.ac.uk> To: freebsd-ports-bugs@FreeBSD.org Subject: ports/180578: [patch] update devel/fpp to modern ports framework Message-ID: <201307161350.r6GDo1Zp049953@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/180578; it has been noted by GNATS.
From: Anton Shterenlikht <mexas@bristol.ac.uk>
To: bug-followup@freebsd.org
Cc:
Subject: ports/180578: [patch] update devel/fpp to modern ports framework
Date: Tue, 16 Jul 2013 14:45:30 +0100
--ReaqsoxgOBHFXBhH
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
ignore the previous patch. This is better.
In addition to the above changes:
- do not use gmake, make is fine
- simplified one patch
--ReaqsoxgOBHFXBhH
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="fpp.diff.2"
Index: Makefile
===================================================================
--- Makefile (revision 323101)
+++ Makefile (working copy)
@@ -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,24 @@
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
+DOCS_FILES= README fpp_spec fpp_license.ps
+PORTDOCS= *
+
+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} ${DOCS_FILES:S,^,${WRKSRC}/,} ${DOCSDIR}/
.endif
.include <bsd.port.mk>
Index: files/patch-Makefile
===================================================================
--- files/patch-Makefile (revision 0)
+++ files/patch-Makefile (working copy)
@@ -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)
Property changes on: files/patch-Makefile
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: files/patch-aa
===================================================================
--- files/patch-aa (revision 323101)
+++ files/patch-aa (working copy)
@@ -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
Index: files/patch-ab
===================================================================
--- files/patch-ab (revision 323101)
+++ files/patch-ab (working copy)
@@ -1,22 +0,0 @@
---- 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)
Index: files/patch-sparc-Makefile
===================================================================
--- files/patch-sparc-Makefile (revision 0)
+++ files/patch-sparc-Makefile (working copy)
@@ -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
+
Property changes on: files/patch-sparc-Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Index: files/patch-sparc::Makefile
===================================================================
--- files/patch-sparc::Makefile (revision 323101)
+++ files/patch-sparc::Makefile (working copy)
@@ -1,17 +0,0 @@
-
-$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
-
Index: files/patch-src-Makefile.common
===================================================================
--- files/patch-src-Makefile.common (revision 0)
+++ files/patch-src-Makefile.common (working copy)
@@ -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)
Property changes on: files/patch-src-Makefile.common
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: pkg-descr
===================================================================
--- pkg-descr (revision 323101)
+++ pkg-descr (working copy)
@@ -6,3 +6,5 @@
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/
Index: pkg-plist
===================================================================
--- pkg-plist (revision 323101)
+++ pkg-plist (working copy)
@@ -1,5 +0,0 @@
-bin/fpp
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/fpp_spec
-%%PORTDOCS%%%%DOCSDIR%%/fpp_license.ps
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
--ReaqsoxgOBHFXBhH--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307161350.r6GDo1Zp049953>