Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 13 May 2023 14:24:59 GMT
From:      Muhammad Moinur Rahman <bofh@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: e85fe72bedb0 - main - graphics/bsd-plotutils: Unbreak on HEAD
Message-ID:  <202305131424.34DEOxKM001111@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e85fe72bedb009bdf749d1ed1b20d6d83b9e3149

commit e85fe72bedb009bdf749d1ed1b20d6d83b9e3149
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-05-13 14:23:26 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-05-13 14:24:17 +0000

    graphics/bsd-plotutils: Unbreak on HEAD
    
    - Pet portclipy
    
    Approved by:    portmgr (blanket)
---
 graphics/bsd-plotutils/Makefile  | 28 ++++++++++++++++------------
 graphics/bsd-plotutils/pkg-plist | 20 ++++++++++----------
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/graphics/bsd-plotutils/Makefile b/graphics/bsd-plotutils/Makefile
index 689f72481b57..c638ae9221a4 100644
--- a/graphics/bsd-plotutils/Makefile
+++ b/graphics/bsd-plotutils/Makefile
@@ -10,28 +10,32 @@ WWW=		https://github.com/Toranktto/bsd-plotutils
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	Toranktto
+USE_LDCONFIG=	yes
+
+CONFLICTS_INSTALL=	plotutils
+
 OPTIONS_DEFINE=	FORTRAN
 OPTIONS_SUB=	yes
+
 FORTRAN_DESC=	FORTRAN 77 support
 
-.include <bsd.port.options.mk>
+FORTRAN_USES=	fortran
 
-.if ${PORT_OPTIONS:MFORTRAN}
-USES+=	fortran
-.endif
+.include <bsd.port.pre.mk>
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	Toranktto
-
-CONFLICTS_INSTALL=	plotutils
-USE_LDCONFIG=	yes
+.if defined(NO_PROFILE) || ( ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079 )
+PLIST_SUB+=	PROFILE="@comment "
+.else
+PLIST_SUB+=	PROFILE=""
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e "s/py27plot//g" ${WRKSRC}/libplot/bindings/Makefile
 	@${REINPLACE_CMD} -e '/#pragma GCC diagnostic/d' ${WRKSRC}/graph/graph.c
 
-.if !${PORT_OPTIONS:MFORTRAN}
+post-patch-FORTRAN-on:
 	@${REINPLACE_CMD} -e "s/f77plot//g" ${WRKSRC}/libplot/bindings/Makefile
-.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/graphics/bsd-plotutils/pkg-plist b/graphics/bsd-plotutils/pkg-plist
index eb1ab56bc4f4..92bb9b2b4313 100644
--- a/graphics/bsd-plotutils/pkg-plist
+++ b/graphics/bsd-plotutils/pkg-plist
@@ -16,43 +16,43 @@ include/plotcompat.h
 %%FORTRAN%%lib/libf77plot.a
 %%FORTRAN%%lib/libf77plot.so
 %%FORTRAN%%lib/libf77plot.so.1
-%%FORTRAN%%lib/libf77plot_p.a
+%%PROFILE%%%%FORTRAN%%lib/libf77plot_p.a
 lib/libplot.a
 lib/libplot.so
 lib/libplot.so.1
 lib/libplot4013.a
 lib/libplot4013.so
 lib/libplot4013.so.1
-lib/libplot4013_p.a
+%%PROFILE%%lib/libplot4013_p.a
 lib/libplot4014.a
 lib/libplot4014.so
 lib/libplot4014.so.1
-lib/libplot4014_p.a
+%%PROFILE%%lib/libplot4014_p.a
 lib/libplot7221.a
 lib/libplot7221.so
 lib/libplot7221.so.1
-lib/libplot7221_p.a
-lib/libplot_p.a
+%%PROFILE%%lib/libplot7221_p.a
+%%PROFILE%%lib/libplot_p.a
 lib/libplotbg.a
 lib/libplotbg.so
 lib/libplotbg.so.1
-lib/libplotbg_p.a
+%%PROFILE%%lib/libplotbg_p.a
 lib/libplotcrt.a
 lib/libplotcrt.so
 lib/libplotcrt.so.1
-lib/libplotcrt_p.a
+%%PROFILE%%lib/libplotcrt_p.a
 lib/libplotdumb.a
 lib/libplotdumb.so
 lib/libplotdumb.so.1
-lib/libplotdumb_p.a
+%%PROFILE%%lib/libplotdumb_p.a
 lib/libplotgigi.a
 lib/libplotgigi.so
 lib/libplotgigi.so.1
-lib/libplotgigi_p.a
+%%PROFILE%%lib/libplotgigi_p.a
 lib/libplotimagen.a
 lib/libplotimagen.so
 lib/libplotimagen.so.1
-lib/libplotimagen_p.a
+%%PROFILE%%lib/libplotimagen_p.a
 man/man1/graph.1.gz
 man/man1/spline.1.gz
 man/man1/plot.1.gz



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202305131424.34DEOxKM001111>