Attachment #214472 for bug #246455

View | Details | Raw Unified | Return to bug 246455
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	ngspice_rework
PORTVERSION=	32
CATEGORIES=	cad
MASTER_SITES=	SF/ngspice/ng-spice-rework/${PORTVERSION}
DISTNAME=	ngspice-${PORTVERSION}

shlib_CONFLICTS_INSTALL=	ngspice_rework-2*
x11_CONFLICTS_INSTALL=		ngspice_rework-shlib-2*

USES=		gmake libtool ncurses readline autoreconf pkgconfig

USE_LDCONFIG=	yes
GNU_CONFIGURE=	yes

PLIST_SUB+=		SHLIB="" X11="@comment "
.else
USES+=			xorg
USE_XORG=		ice sm x11 xaw xext xmu xt xft
CONFIGURE_ARGS+=	--with-x
PLIST_SUB+=		SHLIB="@comment " X11=""
.endif

Lines 1-3 Link Here

(-)b/cad/ngspice_rework/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1572299061	1	TIMESTAMP = 1588964866
2	SHA256 (ngspice-31.tar.gz) = 845f3b0c962e47ded051dfbc134c3c1e4ac925c9f0ce1cb3df64eb9b9da5c282	2	SHA256 (ngspice-32.tar.gz) = 3cd90c4e94516d87c5b4d02a3a6405b1136b25d05c871d4fee1fd7c4c0d03ef2
3	SIZE (ngspice-31.tar.gz) = 7250057	3	SIZE (ngspice-32.tar.gz) = 7728816




--- configure.ac.orig	2020-05-06 06:11:56 UTC
+++ configure.ac
@@ -707,7 +707,6 @@ fi
 # Xft is optional, allows text rotation in plots
 
 if test "x$no_x" != xyes ; then
-    X_CFLAGS="$X_CFLAGS -I/usr/include/freetype2"
     AC_CHECK_LIB([Xaw], [main], [X_LIBS="$X_LIBS -lXaw"],
         [AC_MSG_ERROR([Couldn't find Xaw library])], [$X_LIBS $X_EXTRA_LIBS])
     AC_CHECK_LIB([Xmu], [main], [X_LIBS="$X_LIBS -lXmu"],
@@ -716,21 +715,8 @@ if test "x$no_x" != xyes ; then
     AC_CHECK_LIB([Xext], [XShmAttach], [X_LIBS="$X_LIBS -lXext"],
         [AC_MSG_ERROR([Couldn't find Xext library])], [$X_LIBS $X_EXTRA_LIBS])
     X_LIBS="$X_LIBS -lX11"
-	AC_CHECK_LIB([Xft], [main],
-        [AC_DEFINE([HAVE_LIBXFT], [1], [Have xft routines in libxft])]
-        X_LIBS="$X_LIBS -lXft -lfontconfig -lXrender -lfreetype"
-        has_xft=yes,
-        [has_xft=no], [$X_LIBS $X_EXTRA_LIBS])
-
-    if test "x$has_xft" = xyes ; then
-        AC_CHECK_LIB([fontconfig], [main], [],
-            [AC_MSG_ERROR([Couldn't find fontconfig library])], [$X_LIBS $X_EXTRA_LIBS])
-#        AC_CHECK_LIB([Xrender], [main], [],
-#            [AC_MSG_ERROR([Couldn't find Xrender library])], [$X_LIBS $X_EXTRA_LIBS])
-        AC_CHECK_LIB([freetype], [main], [],
-            [AC_MSG_ERROR([Couldn't find freetype library])], [$X_LIBS $X_EXTRA_LIBS])
-    fi
-
+    PKG_CHECK_MODULES([XFT], [xft], [X_CFLAGS="$X_CFLAGS $XFT_CFLAGS"; X_LIBS="$X_LIBS $XFT_LIBS"],
+                      [AC_MSG_ERROR([Couldn't find freetype library])])
     has_no_x=false
 else
     AC_DEFINE([X_DISPLAY_MISSING])




--- src/frontend/com_sysinfo.c.orig	2020-05-06 06:11:56 UTC
+++ src/frontend/com_sysinfo.c
@@ -396,18 +396,6 @@ static void set_static_system_info(void)
     return;
 } /* end of function set_static_system_info */
 
-#elif defined(__APPLE__) && defined(__MACH__)
-/* Get memory information */
-static int get_sysmem(struct sys_memory *memall)
-{
-    fprintf(stderr, "System memory info is not available\n");
-    return -1;
-}
-/* Get system information */
-static void set_static_system_info(void)
-{
-}
-
 #elif defined(_WIN32)
 
 /* Get memory information */
@@ -972,9 +960,14 @@ static void get_physical_processor_count(void)
     return;
 } /* end of function get_physical_processor_count */
 
+#else /* no Windows OS, no proc info file system */
 
+static int get_sysmem(struct sys_memory *memall)
+{
+    fprintf(stderr, "System memory info is not available\n");
+    return -1;
+}
 
-#else /* no Windows OS, no proc info file system */
 void set_static_system_info(void)
 {
     /* Set to no data available */

Lines 135-140 include/ngspice/twodev.h Link Here

(-)b/cad/ngspice_rework/pkg-plist (+1 lines)
135	include/ngspice/twomesh.h	135	include/ngspice/twomesh.h
136	include/ngspice/typedefs.h	136	include/ngspice/typedefs.h
137	include/ngspice/wallace.h	137	include/ngspice/wallace.h
		138	include/ngspice/wincolornames.h
138	include/ngspice/wordlist.h	139	include/ngspice/wordlist.h
139	include/ngspice/wstdio.h	140	include/ngspice/wstdio.h
140	share/ngspice/scripts/ciderinit	141	share/ngspice/scripts/ciderinit

Return to bug 246455

Lines 2-8 Link Here

(-)b/cad/ngspice_rework/Makefile (-3 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= ngspice_rework	4	PORTNAME= ngspice_rework
5	PORTVERSION= 31	5	PORTVERSION= 32
6	CATEGORIES= cad	6	CATEGORIES= cad
7	MASTER_SITES= SF/ngspice/ng-spice-rework/${PORTVERSION}	7	MASTER_SITES= SF/ngspice/ng-spice-rework/${PORTVERSION}
8	DISTNAME= ngspice-${PORTVERSION}	8	DISTNAME= ngspice-${PORTVERSION}
Lines 21-27 shlib_PKGNAMESUFFIX= -shlib Link Here
21	shlib_CONFLICTS_INSTALL= ngspice_rework-2*	21	shlib_CONFLICTS_INSTALL= ngspice_rework-2*
22	x11_CONFLICTS_INSTALL= ngspice_rework-shlib-2*	22	x11_CONFLICTS_INSTALL= ngspice_rework-shlib-2*
23		23
24	USES= gmake libtool ncurses readline	24	USES= gmake libtool ncurses readline autoreconf pkgconfig
25		25
26	USE_LDCONFIG= yes	26	USE_LDCONFIG= yes
27	GNU_CONFIGURE= yes	27	GNU_CONFIGURE= yes
Lines 35-41 CONFIGURE_ARGS+= --with-ngshared Link Here
35	PLIST_SUB+= SHLIB="" X11="@comment "	35	PLIST_SUB+= SHLIB="" X11="@comment "
36	.else	36	.else
37	USES+= xorg	37	USES+= xorg
38	USE_XORG= ice sm x11 xaw xext xmu xt	38	USE_XORG= ice sm x11 xaw xext xmu xt xft
39	CONFIGURE_ARGS+= --with-x	39	CONFIGURE_ARGS+= --with-x
40	PLIST_SUB+= SHLIB="@comment " X11=""	40	PLIST_SUB+= SHLIB="@comment " X11=""
41	.endif	41	.endif

Added Link Here

(-)b/cad/ngspice_rework/files/patch-configure.ac (+34 lines)
1	--- configure.ac.orig 2020-05-06 06:11:56 UTC
2	+++ configure.ac
3	@@ -707,7 +707,6 @@ fi
4	# Xft is optional, allows text rotation in plots
5
6	if test "x$no_x" != xyes ; then
7	- X_CFLAGS="$X_CFLAGS -I/usr/include/freetype2"
8	AC_CHECK_LIB([Xaw], [main], [X_LIBS="$X_LIBS -lXaw"],
9	[AC_MSG_ERROR([Couldn't find Xaw library])], [$X_LIBS $X_EXTRA_LIBS])
10	AC_CHECK_LIB([Xmu], [main], [X_LIBS="$X_LIBS -lXmu"],
11	@@ -716,21 +715,8 @@ if test "x$no_x" != xyes ; then
12	AC_CHECK_LIB([Xext], [XShmAttach], [X_LIBS="$X_LIBS -lXext"],
13	[AC_MSG_ERROR([Couldn't find Xext library])], [$X_LIBS $X_EXTRA_LIBS])
14	X_LIBS="$X_LIBS -lX11"
15	- AC_CHECK_LIB([Xft], [main],
16	- [AC_DEFINE([HAVE_LIBXFT], [1], [Have xft routines in libxft])]
17	- X_LIBS="$X_LIBS -lXft -lfontconfig -lXrender -lfreetype"
18	- has_xft=yes,
19	- [has_xft=no], [$X_LIBS $X_EXTRA_LIBS])
20	-
21	- if test "x$has_xft" = xyes ; then
22	- AC_CHECK_LIB([fontconfig], [main], [],
23	- [AC_MSG_ERROR([Couldn't find fontconfig library])], [$X_LIBS $X_EXTRA_LIBS])
24	-# AC_CHECK_LIB([Xrender], [main], [],
25	-# [AC_MSG_ERROR([Couldn't find Xrender library])], [$X_LIBS $X_EXTRA_LIBS])
26	- AC_CHECK_LIB([freetype], [main], [],
27	- [AC_MSG_ERROR([Couldn't find freetype library])], [$X_LIBS $X_EXTRA_LIBS])
28	- fi
29	-
30	+ PKG_CHECK_MODULES([XFT], [xft], [X_CFLAGS="$X_CFLAGS $XFT_CFLAGS"; X_LIBS="$X_LIBS $XFT_LIBS"],
31	+ [AC_MSG_ERROR([Couldn't find freetype library])])
32	has_no_x=false
33	else
34	AC_DEFINE([X_DISPLAY_MISSING])

Added Link Here

(-)b/cad/ngspice_rework/files/patch-src_frontend_com__sysinfo.c (+37 lines)
1	--- src/frontend/com_sysinfo.c.orig 2020-05-06 06:11:56 UTC
2	+++ src/frontend/com_sysinfo.c
3	@@ -396,18 +396,6 @@ static void set_static_system_info(void)
4	return;
5	} /* end of function set_static_system_info */
6
7	-#elif defined(__APPLE__) && defined(__MACH__)
8	-/* Get memory information */
9	-static int get_sysmem(struct sys_memory *memall)
10	-{
11	- fprintf(stderr, "System memory info is not available\n");
12	- return -1;
13	-}
14	-/* Get system information */
15	-static void set_static_system_info(void)
16	-{
17	-}
18	-
19	#elif defined(_WIN32)
20
21	/* Get memory information */
22	@@ -972,9 +960,14 @@ static void get_physical_processor_count(void)
23	return;
24	} /* end of function get_physical_processor_count */
25
26	+#else /* no Windows OS, no proc info file system */
27
28	+static int get_sysmem(struct sys_memory *memall)
29	+{
30	+ fprintf(stderr, "System memory info is not available\n");
31	+ return -1;
32	+}
33
34	-#else /* no Windows OS, no proc info file system */
35	void set_static_system_info(void)
36	{
37	/* Set to no data available */