pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

qucs-s: simplify



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Sat May 9 17:55:00 2026 +0200
Changeset:	dd80fb029eb5e5f604bc2e7185962ef7d00edc74

Modified Files:
	qucs-s/Makefile
	qucs-s/distinfo
Removed Files:
	qucs-s/patches/patch-contrib_CMakeLists.txt
	qucs-s/patches/patch-qucs-transcalc_CMakeLists.txt
	qucs-s/patches/patch-qucs_CMakeLists.txt
	qucs-s/patches/patch-qucsator__rf_doc_CMakeLists.txt

Log Message:
qucs-s: simplify

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=dd80fb029eb5e5f604bc2e7185962ef7d00edc74

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 qucs-s/Makefile                                    | 22 ++++++++++++++++++----
 qucs-s/distinfo                                    |  4 ----
 qucs-s/patches/patch-contrib_CMakeLists.txt        | 12 ------------
 qucs-s/patches/patch-qucs-transcalc_CMakeLists.txt | 15 ---------------
 qucs-s/patches/patch-qucs_CMakeLists.txt           | 15 ---------------
 .../patches/patch-qucsator__rf_doc_CMakeLists.txt  | 12 ------------
 6 files changed, 18 insertions(+), 62 deletions(-)

diffs:
diff --git a/qucs-s/Makefile b/qucs-s/Makefile
index 65850334d5..c21e8241fe 100644
--- a/qucs-s/Makefile
+++ b/qucs-s/Makefile
@@ -12,16 +12,30 @@ HOMEPAGE=	https://github.com/ra3xdh/qucs_s/
 COMMENT=	Circuit simulation program based on Qucs circuit simulator
 LICENSE=	gnu-gpl-v2
 
+TOOL_DEPENDS+=	dos2unix-[0-9]*:../../converters/dos2unix
+TOOL_DEPENDS+=	gperf-[0-9]*:../../devel/gperf
+
 USE_LANGUAGES=	c c++
 # Upstream CMakeLists.txt select C++17 or C++20 depending on Qt version.
 # In pkgsrc-current, Qt >= 6.7 is used, which requires C++20
 FORCE_CXX_STD=	gnu++20
+
 USE_TOOLS+=	bison
-TOOL_DEPENDS+=	dos2unix-[0-9]*:../../converters/dos2unix
-TOOL_DEPENDS+=	gperf-[0-9]*:../../devel/gperf
 
-CMAKE_CONFIGURE_ARGS+=	-DBISON_DIR=${PREFIX}/bin
-#THIS SHOULD NOT BE NEEDED, PERHAPS UPSTREAM BUG.
+CMAKE_CONFIGURE_ARGS+=	-DBISON_DIR=${TOOLS_DIR}/bin
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${PKGMANDIR} != "share/man"
+SUBST_CLASSES+=		man
+SUBST_FILES.man+=	contrib/CMakeLists.txt
+SUBST_FILES.man+=	qucs-transcalc/CMakeLists.txt
+SUBST_FILES.man+=	qucs/CMakeLists.txt
+SUBST_FILES.man+=	qucsator_rf/doc/CMakeLists.txt
+SUBST_SED.man+=		-e "s,share/man,${PKGMANDIR},"
+SUBST_STAGE.man=	pre-configure
+SUBST_MESSAGE.man=	Fix man page installation path.
+.endif
 
 .include "../../devel/cmake/build.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/qucs-s/distinfo b/qucs-s/distinfo
index ac945b3397..260212b714 100644
--- a/qucs-s/distinfo
+++ b/qucs-s/distinfo
@@ -3,7 +3,3 @@ $NetBSD$
 BLAKE2s (qucs_s/qucs-s-25.2.0.tar.gz) = 25d6270e1ca9999a63797c3a38e8d19778849f6a9806bf9998ee7999e9c22b2c
 SHA512 (qucs_s/qucs-s-25.2.0.tar.gz) = 21161864a03fd120218657403caf51c962f612ee249d8635939eb1b225ae502b5e5f59ef8bcde417aa1783328dba406e2abbe37f75988a789b70d99529986172
 Size (qucs_s/qucs-s-25.2.0.tar.gz) = 4804075 bytes
-SHA1 (patch-contrib_CMakeLists.txt) = e39eccbabca217d35d076ba795e9bca5856b5c05
-SHA1 (patch-qucs-transcalc_CMakeLists.txt) = 9cc19f2990cc0549854e23ecbd808b548b49c3f2
-SHA1 (patch-qucs_CMakeLists.txt) = dff1be9887784fba4293e82d000973895d0dc474
-SHA1 (patch-qucsator__rf_doc_CMakeLists.txt) = af21363ffab36885e9e808ba20a19f9636cf21f3
diff --git a/qucs-s/patches/patch-contrib_CMakeLists.txt b/qucs-s/patches/patch-contrib_CMakeLists.txt
deleted file mode 100644
index 2c96e81395..0000000000
--- a/qucs-s/patches/patch-contrib_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
-changed man pages installation directory from share/man to man
-
---- contrib/CMakeLists.txt.orig	2025-09-06 14:06:28.000000000 +0000
-+++ contrib/CMakeLists.txt
-@@ -2,4 +2,4 @@
- # Netlist preprocessor script and man page
- INSTALL( FILES ps2sp DESTINATION bin/ )
- 
--INSTALL( FILES ps2sp.1 DESTINATION share/man/man1 )
-+INSTALL( FILES ps2sp.1 DESTINATION man/man1 )
diff --git a/qucs-s/patches/patch-qucs-transcalc_CMakeLists.txt b/qucs-s/patches/patch-qucs-transcalc_CMakeLists.txt
deleted file mode 100644
index a30a25fe62..0000000000
--- a/qucs-s/patches/patch-qucs-transcalc_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-changed man pages installation directory from share/man to man
-
---- qucs-transcalc/CMakeLists.txt.orig	2025-09-06 14:06:28.000000000 +0000
-+++ qucs-transcalc/CMakeLists.txt
-@@ -148,7 +148,7 @@ SET_TARGET_PROPERTIES(${QUCS_NAME}trans 
- #ADD_SUBDIRECTORY( bitmaps ) -> added as resources
- ADD_SUBDIRECTORY( examples )
- 
--#INSTALL( FILES qucstrans.1 DESTINATION share/man/man1 )
-+#INSTALL( FILES qucstrans.1 DESTINATION man/man1 )
- 
- #
- # Prepare the installation
diff --git a/qucs-s/patches/patch-qucs_CMakeLists.txt b/qucs-s/patches/patch-qucs_CMakeLists.txt
deleted file mode 100644
index 49c157619b..0000000000
--- a/qucs-s/patches/patch-qucs_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-changed man pages installation directory from share/man to man
-
---- qucs/CMakeLists.txt.orig	2025-09-06 14:06:28.000000000 +0000
-+++ qucs/CMakeLists.txt
-@@ -334,7 +334,7 @@ ENDIF()
- 
- INSTALL( FILES ${SCRIPTS} DESTINATION bin/ )
- 
--INSTALL( FILES ${QUCS_NAME}.1 DESTINATION share/man/man1 )
-+INSTALL( FILES ${QUCS_NAME}.1 DESTINATION man/man1 )
- 
- # Install wrapper scripts
- IF(WIN32)
diff --git a/qucs-s/patches/patch-qucsator__rf_doc_CMakeLists.txt b/qucs-s/patches/patch-qucsator__rf_doc_CMakeLists.txt
deleted file mode 100644
index 5f09e8ba9b..0000000000
--- a/qucs-s/patches/patch-qucsator__rf_doc_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
-changed man pages installation directory from share/man to man
-
---- qucsator_rf/doc/CMakeLists.txt.orig	2025-11-30 15:03:39.403049914 +0000
-+++ qucsator_rf/doc/CMakeLists.txt
-@@ -2,4 +2,4 @@
- 
- set(MANPAGES qucsator_rf.1 qucsconv_rf.1)
- 
--install(FILES ${MANPAGES} DESTINATION share/man/man1)
-+install(FILES ${MANPAGES} DESTINATION man/man1)


Home | Main Index | Thread Index | Old Index