math/grace,no_x11 PLIST

classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

math/grace,no_x11 PLIST

Jeremie Courreges-Anglas-5
On Thu, Dec 26 2019, Antoine Jacoutot <[hidden email]> wrote:

> On Wed, Dec 25, 2019 at 08:00:12AM -0700, Martin Reindl wrote:
>> CVSROOT: /cvs
>> Module name: ports
>> Changes by: [hidden email] 2019/12/25 08:00:12
>>
>> Modified files:
>> math/grace     : Makefile
>> math/grace/pkg : DESCR PLIST
>>
>> Log message:
>> build with fftw and netcdf support by default, leaving no_x11 as the only
>> flavor
>>
>> input sthen@
>> ok jca@
>
> That broke it.
>
> ===>  Building package for grace-5.1.15p9-no_x11
> Create /exopi-cvs/ports/packages/amd64/all/grace-5.1.15p9-no_x11.tgz
> Creating package grace-5.1.15p9-no_x11
>
> reading plist|                                                                
> checking dependencies|                                                        
> checking dependencies|devel/t1lib                                              
> checking dependencies|graphics/jpeg                                            
> checking dependencies|graphics/png                                            
> checking dependencies|graphics/tiff                                            
> checking dependencies|math/fftw                                                
> checking dependencies|math/netcdf                                              
> checking dependencies|print/pdflib                                            
> checksumming|                                                                  
> checksumming|                                                             | 0%
> checksumming|                                                             | 1%
> checksumming|*                                                            | 1%
> checksumming|*                                                            | 2%
> checksumming|**                                                           | 3%
> checksumming|**                                                           | 4%
> checksumming|***                                                          | 5%
> checksumming|****                                                         | 6%
> checksumming|****                                                         | 7%
> checksumming|*****                                                        | 8%
> checksumming|*****                                                        | 9%
> checksumming|******                                                       | 9%
> checksumming|******                                                       | 10%
> checksumming|*******                                                      | 11%
> checksumming|*******                                                      | 12%
> checksumming|********                                                     | 13%
> checksumming|*********                                                    | 14%
> checksumming|*********                                                    | 15%
> checksumming|**********                                                   | 16%
> Error: /exopi-obj/pobj/grace-5.1.15-no_x11/fake-amd64-no_x11/usr/local/bin/xmgrace does not exist
> Error: /exopi-obj/pobj/grace-5.1.15-no_x11/fake-amd64-no_x11/usr/local/grace/bin/xmgrace does not exist
> Error: /exopi-obj/pobj/grace-5.1.15-no_x11/fake-amd64-no_x11/usr/local/man/man1/xmgrace.1 does not exist
> pkg_create: can't continue
> *** Error 1 in math/grace (/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2098 '/exopi-cvs/ports/packages/amd64/all/grace-5.1.15p9-no_x11.tgz')
> *** Error 1 in math/grace (/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2577 '_internal-package')
> *** Error 1 in math/grace (/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2556 'package')

I think Martin trusted the output of make plist too much. ;)
The no_x11 FLAVOR was not hooked up before so no new breakage.

The diff below fixes this:
- re-add the %%no_x11%% / !%%no_x11%% dance at the end of the PLIST
- remove xmgrace files provided by !%%no_x11%%
- for no_x11, remove the xmgrace manpage, installed in a bogus directory

With this, make plist is stable with the default FLAVOR, for the no_x11
FLAVOR only the location of the !%%no_x11%% line moves in the PLIST.

ok?


Index: Makefile
===================================================================
RCS file: /cvs/ports/math/grace/Makefile,v
retrieving revision 1.46
diff -u -p -r1.46 Makefile
--- Makefile 25 Dec 2019 15:00:12 -0000 1.46
+++ Makefile 26 Dec 2019 09:34:47 -0000
@@ -3,7 +3,7 @@
 COMMENT= GRaphing, Advanced Computation and Exploration of data
 
 DISTNAME= grace-5.1.15
-REVISION= 9
+REVISION= 10
 CATEGORIES= math
 
 HOMEPAGE= http://plasma-gate.weizmann.ac.il/Grace/
@@ -57,6 +57,7 @@ post-install:
 .if ${FLAVOR:Mno_x11}
  ln -sf ${GRACE_DIR}/bin/grace ${PREFIX}/bin/grace
  ln -sf ${GRACE_DIR}/bin/grace ${PREFIX}/bin/gracebat
+ rm -f ${PREFIX}/grace/doc/xmgrace.1
 .else
  ln -sf ${GRACE_DIR}/bin/xmgrace ${PREFIX}/bin/grace
  ln -sf ${GRACE_DIR}/bin/xmgrace ${PREFIX}/bin/gracebat
Index: pkg/PFRAG.no_x11
===================================================================
RCS file: /cvs/ports/math/grace/pkg/PFRAG.no_x11,v
retrieving revision 1.3
diff -u -p -r1.3 PFRAG.no_x11
--- pkg/PFRAG.no_x11 8 Oct 2004 10:37:24 -0000 1.3
+++ pkg/PFRAG.no_x11 26 Dec 2019 09:34:47 -0000
@@ -1,2 +1,2 @@
 @comment $OpenBSD: PFRAG.no_x11,v 1.3 2004/10/08 10:37:24 espie Exp $
-grace/bin/grace
+@bin grace/bin/grace
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/math/grace/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST 25 Dec 2019 15:00:12 -0000 1.8
+++ pkg/PLIST 26 Dec 2019 09:34:47 -0000
@@ -1,7 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.8 2019/12/25 15:00:12 martin Exp $
 bin/grace
 bin/gracebat
-bin/xmgrace
 grace/
 grace/auxiliary/
 grace/auxiliary/README
@@ -12,7 +11,6 @@ grace/bin/
 grace/bin/fdf2fit
 grace/bin/gracebat
 @bin grace/bin/grconvert
-@bin grace/bin/xmgrace
 grace/doc/
 grace/doc/10.1.dat
 grace/doc/10a.dat
@@ -145,4 +143,5 @@ include/grace_np.h
 @man man/man1/grace.1
 @man man/man1/gracebat.1
 @man man/man1/grconvert.1
-@man man/man1/xmgrace.1
+%%no_x11%%
+!%%no_x11%%


--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Reply | Threaded
Open this post in threaded view
|

Re: math/grace,no_x11 PLIST

Stuart Henderson-6
> I think Martin trusted the output of make plist too much. ;)
> The no_x11 FLAVOR was not hooked up before so no new breakage.
>
> The diff below fixes this:
> - re-add the %%no_x11%% / !%%no_x11%% dance at the end of the PLIST
> - remove xmgrace files provided by !%%no_x11%%
> - for no_x11, remove the xmgrace manpage, installed in a bogus directory
>
> With this, make plist is stable with the default FLAVOR, for the no_x11
> FLAVOR only the location of the !%%no_x11%% line moves in the PLIST.
>
> ok?

ok.

Reply | Threaded
Open this post in threaded view
|

Re: math/grace,no_x11 PLIST

Martin Reindl-3
In reply to this post by Jeremie Courreges-Anglas-5
Well yes, sorry, shame on me. That's what you get for blindy running
make plist.

Am 26.12.19 um 10:43 schrieb Jeremie Courreges-Anglas:

> On Thu, Dec 26 2019, Antoine Jacoutot <[hidden email]> wrote:
>> On Wed, Dec 25, 2019 at 08:00:12AM -0700, Martin Reindl wrote:
>>> CVSROOT: /cvs
>>> Module name: ports
>>> Changes by: [hidden email] 2019/12/25 08:00:12
>>>
>>> Modified files:
>>> math/grace     : Makefile
>>> math/grace/pkg : DESCR PLIST
>>>
>>> Log message:
>>> build with fftw and netcdf support by default, leaving no_x11 as the only
>>> flavor
>>>
>>> input sthen@
>>> ok jca@
>>
>> That broke it.
>>
>> ===>  Building package for grace-5.1.15p9-no_x11
>> Create /exopi-cvs/ports/packages/amd64/all/grace-5.1.15p9-no_x11.tgz
>> Creating package grace-5.1.15p9-no_x11
>>
>> reading plist|                                                                
>> checking dependencies|                                                        
>> checking dependencies|devel/t1lib                                              
>> checking dependencies|graphics/jpeg                                            
>> checking dependencies|graphics/png                                            
>> checking dependencies|graphics/tiff                                            
>> checking dependencies|math/fftw                                                
>> checking dependencies|math/netcdf                                              
>> checking dependencies|print/pdflib                                            
>> checksumming|                                                                  
>> checksumming|                                                             | 0%
>> checksumming|                                                             | 1%
>> checksumming|*                                                            | 1%
>> checksumming|*                                                            | 2%
>> checksumming|**                                                           | 3%
>> checksumming|**                                                           | 4%
>> checksumming|***                                                          | 5%
>> checksumming|****                                                         | 6%
>> checksumming|****                                                         | 7%
>> checksumming|*****                                                        | 8%
>> checksumming|*****                                                        | 9%
>> checksumming|******                                                       | 9%
>> checksumming|******                                                       | 10%
>> checksumming|*******                                                      | 11%
>> checksumming|*******                                                      | 12%
>> checksumming|********                                                     | 13%
>> checksumming|*********                                                    | 14%
>> checksumming|*********                                                    | 15%
>> checksumming|**********                                                   | 16%
>> Error: /exopi-obj/pobj/grace-5.1.15-no_x11/fake-amd64-no_x11/usr/local/bin/xmgrace does not exist
>> Error: /exopi-obj/pobj/grace-5.1.15-no_x11/fake-amd64-no_x11/usr/local/grace/bin/xmgrace does not exist
>> Error: /exopi-obj/pobj/grace-5.1.15-no_x11/fake-amd64-no_x11/usr/local/man/man1/xmgrace.1 does not exist
>> pkg_create: can't continue
>> *** Error 1 in math/grace (/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2098 '/exopi-cvs/ports/packages/amd64/all/grace-5.1.15p9-no_x11.tgz')
>> *** Error 1 in math/grace (/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2577 '_internal-package')
>> *** Error 1 in math/grace (/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2556 'package')
>
> I think Martin trusted the output of make plist too much. ;)
> The no_x11 FLAVOR was not hooked up before so no new breakage.
>
> The diff below fixes this:
> - re-add the %%no_x11%% / !%%no_x11%% dance at the end of the PLIST
> - remove xmgrace files provided by !%%no_x11%%
> - for no_x11, remove the xmgrace manpage, installed in a bogus directory
>
> With this, make plist is stable with the default FLAVOR, for the no_x11
> FLAVOR only the location of the !%%no_x11%% line moves in the PLIST.
>
> ok?
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/math/grace/Makefile,v
> retrieving revision 1.46
> diff -u -p -r1.46 Makefile
> --- Makefile 25 Dec 2019 15:00:12 -0000 1.46
> +++ Makefile 26 Dec 2019 09:34:47 -0000
> @@ -3,7 +3,7 @@
>  COMMENT= GRaphing, Advanced Computation and Exploration of data
>  
>  DISTNAME= grace-5.1.15
> -REVISION= 9
> +REVISION= 10
>  CATEGORIES= math
>  
>  HOMEPAGE= http://plasma-gate.weizmann.ac.il/Grace/
> @@ -57,6 +57,7 @@ post-install:
>  .if ${FLAVOR:Mno_x11}
>   ln -sf ${GRACE_DIR}/bin/grace ${PREFIX}/bin/grace
>   ln -sf ${GRACE_DIR}/bin/grace ${PREFIX}/bin/gracebat
> + rm -f ${PREFIX}/grace/doc/xmgrace.1
>  .else
>   ln -sf ${GRACE_DIR}/bin/xmgrace ${PREFIX}/bin/grace
>   ln -sf ${GRACE_DIR}/bin/xmgrace ${PREFIX}/bin/gracebat
> Index: pkg/PFRAG.no_x11
> ===================================================================
> RCS file: /cvs/ports/math/grace/pkg/PFRAG.no_x11,v
> retrieving revision 1.3
> diff -u -p -r1.3 PFRAG.no_x11
> --- pkg/PFRAG.no_x11 8 Oct 2004 10:37:24 -0000 1.3
> +++ pkg/PFRAG.no_x11 26 Dec 2019 09:34:47 -0000
> @@ -1,2 +1,2 @@
>  @comment $OpenBSD: PFRAG.no_x11,v 1.3 2004/10/08 10:37:24 espie Exp $
> -grace/bin/grace
> +@bin grace/bin/grace
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/math/grace/pkg/PLIST,v
> retrieving revision 1.8
> diff -u -p -r1.8 PLIST
> --- pkg/PLIST 25 Dec 2019 15:00:12 -0000 1.8
> +++ pkg/PLIST 26 Dec 2019 09:34:47 -0000
> @@ -1,7 +1,6 @@
>  @comment $OpenBSD: PLIST,v 1.8 2019/12/25 15:00:12 martin Exp $
>  bin/grace
>  bin/gracebat
> -bin/xmgrace
>  grace/
>  grace/auxiliary/
>  grace/auxiliary/README
> @@ -12,7 +11,6 @@ grace/bin/
>  grace/bin/fdf2fit
>  grace/bin/gracebat
>  @bin grace/bin/grconvert
> -@bin grace/bin/xmgrace
>  grace/doc/
>  grace/doc/10.1.dat
>  grace/doc/10a.dat
> @@ -145,4 +143,5 @@ include/grace_np.h
>  @man man/man1/grace.1
>  @man man/man1/gracebat.1
>  @man man/man1/grconvert.1
> -@man man/man1/xmgrace.1
> +%%no_x11%%
> +!%%no_x11%%
>
>

Reply | Threaded
Open this post in threaded view
|

Re: math/grace,no_x11 PLIST

Stuart Henderson-6
On 2019/12/26 12:47, Martin Reindl wrote:
> Well yes, sorry, shame on me. That's what you get for blindy running
> make plist.

Best to check you can rebuild packages (all flavours) after updating plists.