git: e3cf001d007c - main - cad/ngspice_rework: Eliminate conflict between flavors

The branch main has been updated by yuri:

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

commit e3cf001d007c4aa6ed7ac45b7bf14982e2ecb3ce
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2021-11-13 21:49:26 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2021-11-13 21:59:25 +0000

    cad/ngspice_rework: Eliminate conflict between flavors
    
    Before both flavors installed headers and .cm files.
    This caused them to conflict with each other.
    
    This commit removes conflicting files from the @x11 flavor
    allowing the executable to be installed in parallel with libraries.
    
    The executable seems to work in a standalone mode fine, but if it ever
    needs headers or .cm files the @shlib flavor can always be installed.
    
    PR:             259809
    Tested by:      kevinz5000@gmail.com
---
 cad/ngspice_rework/Makefile                       | 19 ++++++++++++-------
 cad/ngspice_rework/{pkg-plist => pkg-plist-shlib} | 10 ++++------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/cad/ngspice_rework/Makefile b/cad/ngspice_rework/Makefile
index 9ef7b0a9fa6b..4e6feafc68cc 100644
--- a/cad/ngspice_rework/Makefile
+++ b/cad/ngspice_rework/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	ngspice_rework
 PORTVERSION=	32
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	SF/ngspice/ng-spice-rework/${PORTVERSION}
 DISTNAME=	ngspice-${PORTVERSION}
@@ -18,27 +19,31 @@ BROKEN_aarch64=	Fails to link: missing sbrk
 LIB_DEPENDS=	libfftw3.so:math/fftw3
 
 FLAVORS=	x11 shlib
-shlib_PKGNAMESUFFIX=	-shlib
+shlib_PKGNAMESUFFIX=		-shlib
 shlib_CONFLICTS_INSTALL=	ngspice_rework-2*
+shlib_PLIST=			${MASTERDIR}/pkg-plist-shlib
 x11_CONFLICTS_INSTALL=		ngspice_rework-shlib-2*
 
 USES=		compiler:c11 gmake libtool ncurses readline autoreconf pkgconfig
 
-USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-
-CONFIGURE_ARGS=	--enable-cider --enable-shared --enable-xspice --with-readline=yes
+CONFIGURE_ARGS=	--enable-cider --enable-xspice --with-readline=yes
 
 OPTIONS_DEFINE=	DEBUG
 
 .if ${FLAVOR:U} ==	shlib
-CONFIGURE_ARGS+=	--with-ngshared
-PLIST_SUB+=		SHLIB="" X11="@comment "
+USE_LDCONFIG=		yes
+CONFIGURE_ARGS+=	--with-ngshared --enable-shared
 .else
 USES+=			xorg
 USE_XORG=		ice sm x11 xaw xext xmu xt xft
 CONFIGURE_ARGS+=	--with-x
-PLIST_SUB+=		SHLIB="@comment " X11=""
+RUN_DEPENDS=		ngspice_rework-shlib>0:cad/ngspice_rework@shlib
+PLIST_FILES=		bin/ngspice man/man1/ngspice.1.gz
+post-install:
+	@cd ${STAGEDIR}${PREFIX} && \
+		${RM} -r include lib share && \
+		${RM} bin/cmpp man/man1/cmpp.1
 .endif
 
 DEBUG_CONFIGURE_ENABLE=	debug
diff --git a/cad/ngspice_rework/pkg-plist b/cad/ngspice_rework/pkg-plist-shlib
similarity index 95%
rename from cad/ngspice_rework/pkg-plist
rename to cad/ngspice_rework/pkg-plist-shlib
index c4723abba754..1990dbeb4afb 100644
--- a/cad/ngspice_rework/pkg-plist
+++ b/cad/ngspice_rework/pkg-plist-shlib
@@ -1,9 +1,8 @@
 bin/cmpp
-%%X11%%bin/ngspice
-%%SHLIB%%libdata/pkgconfig/ngspice.pc
-%%SHLIB%%lib/libngspice.so
-%%SHLIB%%lib/libngspice.so.0
-%%SHLIB%%lib/libngspice.so.0.0.0
+libdata/pkgconfig/ngspice.pc
+lib/libngspice.so
+lib/libngspice.so.0
+lib/libngspice.so.0.0.0
 lib/ngspice/analog.cm
 lib/ngspice/digital.cm
 lib/ngspice/spice2poly.cm
@@ -11,7 +10,6 @@ lib/ngspice/table.cm
 lib/ngspice/xtradev.cm
 lib/ngspice/xtraevt.cm
 man/man1/cmpp.1.gz
-%%X11%%man/man1/ngspice.1.gz
 share/ngspice/dlmain.c
 include/ngspice/enhtypes.h
 include/ngspice/evtshared.h