ports/180578: [patch] update devel/fpp to modern ports framework

Anton Shterenlikht mexas at bris.ac.uk
Mon Jul 15 16:30:01 UTC 2013 

>Number:         180578
>Category:       ports
>Synopsis:       [patch] update devel/fpp to modern ports framework
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 15 16:30:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Anton Shterenlikht
>Release:        FreeBSD 10.0-CURRENT ia64
>Organization:
University of Bristol
>Environment:
System: FreeBSD mech-cluster241.men.bris.ac.uk 10.0-CURRENT FreeBSD 10.0-CURRENT #5 r252055: Fri Jun 21 15:57:18 BST 2013 root at mech-cluster241.men.bris.ac.uk:/usr/obj/usr/src/sys/TZAV ia64


	
>Description:

- updated the Makefile header
- added PLIST_FILES= to Makefile and removed pkg-plist 
- renamed patch-aa, etc. to full paths + file names
- added OPTIONS_DEFINE=, and updated the Makefile accordingly

	
>How-To-Repeat:
	
>Fix:

	

--- fpp.diff begins here ---
Index: devel/fpp/Makefile
===================================================================
--- devel/fpp/Makefile	(revision 323013)
+++ devel/fpp/Makefile	(working copy)
@@ -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
@@ -22,12 +18,22 @@
 INSTALL_TARGET=	bsd44-install
 MAN1=		fpp.1
 
-post-install:
-.if !defined(NOPORTDOCS)
+OPTIONS_DEFINE=	DOCS
+
+DOCS_FILES=	${WRKSRC}/README ${WRKSRC}/fpp_spec ${WRKSRC}/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,^,${WRKSRS}/,} ${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>
Index: devel/fpp/files/patch-Makefile
===================================================================
--- devel/fpp/files/patch-Makefile	(revision 0)
+++ devel/fpp/files/patch-Makefile	(working copy)
@@ -0,0 +1,18 @@
+--- 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

Property changes on: devel/fpp/files/patch-Makefile
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: devel/fpp/files/patch-aa
===================================================================
--- devel/fpp/files/patch-aa	(revision 323013)
+++ devel/fpp/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: devel/fpp/files/patch-ab
===================================================================
--- devel/fpp/files/patch-ab	(revision 323013)
+++ devel/fpp/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: devel/fpp/files/patch-sparc-Makefile
===================================================================
--- devel/fpp/files/patch-sparc-Makefile	(revision 0)
+++ devel/fpp/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: devel/fpp/files/patch-sparc-Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Index: devel/fpp/files/patch-sparc::Makefile
===================================================================
--- devel/fpp/files/patch-sparc::Makefile	(revision 323013)
+++ devel/fpp/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: devel/fpp/files/patch-src-Makefile.common
===================================================================
--- devel/fpp/files/patch-src-Makefile.common	(revision 0)
+++ devel/fpp/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: devel/fpp/files/patch-src-Makefile.common
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: devel/fpp/pkg-plist
===================================================================
--- devel/fpp/pkg-plist	(revision 323013)
+++ devel/fpp/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%%
--- fpp.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list