From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jul 14 09:50:26 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 86D7816A4DD for ; Fri, 14 Jul 2006 09:50:26 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id EE99143D45 for ; Fri, 14 Jul 2006 09:50:25 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k6E9oPSq074197 for ; Fri, 14 Jul 2006 09:50:25 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k6E9oPLI074196; Fri, 14 Jul 2006 09:50:25 GMT (envelope-from gnats) Resent-Date: Fri, 14 Jul 2006 09:50:25 GMT Resent-Message-Id: <200607140950.k6E9oPLI074196@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Stanislav Sedov Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1CB5116A4DA for ; Fri, 14 Jul 2006 09:47:07 +0000 (UTC) (envelope-from stas@mbsd.msk.ru) Received: from com1.ht-systems.ru (com1.ht-systems.ru [83.97.104.204]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5F99843D4C for ; Fri, 14 Jul 2006 09:47:06 +0000 (GMT) (envelope-from stas@mbsd.msk.ru) Received: from [213.87.72.70] (helo=fonon.realnet) by com1.ht-systems.ru with esmtpa (Exim 4.62) (envelope-from ) id 1G1KNl-0002yf-Gm for FreeBSD-gnats-submit@freebsd.org; Fri, 14 Jul 2006 13:54:58 +0400 Received: by fonon.realnet (Postfix, from userid 1001) id 020B212631; Fri, 14 Jul 2006 13:45:53 +0400 (MSD) Message-Id: <20060714094554.020B212631@fonon.realnet> Date: Fri, 14 Jul 2006 13:45:53 +0400 (MSD) From: Stanislav Sedov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/100285: [PATCH] cad/electric: QT, NLS, T1lib support, take maintainership X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Jul 2006 09:50:26 -0000 >Number: 100285 >Category: ports >Synopsis: [PATCH] cad/electric: QT, NLS, T1lib support, take maintainership >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Jul 14 09:50:24 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Stanislav Sedov >Release: FreeBSD 7.0-CURRENT i386 >Organization: MBSD labs, Inc. >Environment: System: FreeBSD fonon.realnet 7.0-CURRENT FreeBSD 7.0-CURRENT #7: Sun Jun 18 20:51:36 MSD 2006 >Description: - Add QT frontend support - Add support for Type1 fonts via T1 library - Add NLS support (French localization) - Fix GCC 4.1 compatiblity - Fix comment - Add OPTIONS - Enable builds with optimized CFLAGS - Fix patchname to make portlint happy - Take maintainership Added file(s): - files/patch-Makefile.in - files/patch-src_graph_graphqtdlg.h - files/patch-src_graph_graphunixx11.c - files/patch-src_include_global.h Removed file(s): - files/patch-src::graph::graphunixx11.c Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- electric-7.0.0.patch begins here --- diff -ruN --exclude=CVS /usr/ports/cad/electric/Makefile /var/tmp/work4/electric/Makefile --- /usr/ports/cad/electric/Makefile Thu May 4 03:38:27 2006 +++ /var/tmp/work4/electric/Makefile Fri Jul 14 13:42:32 2006 @@ -12,12 +12,40 @@ MASTER_SITE_SUBDIR= ${PORTNAME} DISTNAME= ${PORTNAME}-${PORTVERSION:C/^(...)\./\1/} -MAINTAINER= ports@FreeBSD.org -COMMENT= A Sophisticated electrical CAD system +MAINTAINER= ssedov@mbsd.msk.ru +COMMENT= A sophisticated electrical CAD system -USE_MOTIF= yes GNU_CONFIGURE= yes +OPTIONS= QT "Use QT gui (instead of Motif)" off \ + T1LIB "Use T1lib Type1 font library" on \ + NLS "Build with internationalization support" on \ + OPT "Build with optimized CFLAGS" off + +.include + +.if defined(WITH_QT) +LIB_DEPENDS+= qt-mt:${PORTSDIR}/x11-toolkits/qt33 +FEATURES+= QT +.else +USE_MOTIF= yes +FEATURES+= MOTIF +.endif + +.if !defined(WITHOUT_T1LIB) +LIB_DEPENDS+= t1.5:${PORTSDIR}/devel/t1lib +FEATURES+= T1LIB +.endif + +.if !defined(WITHOUT_NLS) +USE_GETTEXT= yes +FEATURES+= INT +.endif + +.if defined(WITH_OPT) +FEATURES+= OPT +.endif + post-patch: @${REINPLACE_CMD} -e 's|/usr/share/electric/lib/|${DATADIR}/lib/|; \ s|/usr/share/electric/doc/|${DOCSDIR}/|; \ @@ -26,11 +54,15 @@ ${WRKSRC}/src/include/config.h @${REINPLACE_CMD} -e 's|/usr/share/electric/lib|${DATADIR}/lib|; \ s|/usr/share/electric/doc|${DOCSDIR}|; \ + s|%%LOCALBASE%%|${LOCALBASE}|g; \ s|@PTHREAD_LIBS@|${PTHREAD_LIBS:S/"//g}|' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|/usr/X11R6/|${X11BASE}/|' ${WRKSRC}/configure +.for FEATURE in ${FEATURES} + @${REINPLACE_CMD} -e 's|#%%${FEATURE}%%||g' ${WRKSRC}/Makefile.in +.endfor post-install: ${STRIP_CMD} ${PREFIX}/bin/electric -.include +.include diff -ruN --exclude=CVS /usr/ports/cad/electric/files/patch-Makefile.in /var/tmp/work4/electric/files/patch-Makefile.in --- /usr/ports/cad/electric/files/patch-Makefile.in Thu Jan 1 03:00:00 1970 +++ /var/tmp/work4/electric/files/patch-Makefile.in Fri Jul 14 13:19:24 2006 @@ -0,0 +1,90 @@ +--- Makefile.in.orig Fri Jul 16 05:59:50 2004 ++++ Makefile.in Fri Jul 14 13:19:06 2006 +@@ -1,14 +1,14 @@ + ########################################################## USING QT + ##### If using Qt, uncomment these five lines +-# GRAPH_FLAGS = -DUSEQT -DQT_THREAD_SUPPORT -I$(QTDIR)/include $(QUI_CFLAGS) +-# GRAPH_LIBS = -L$(QTDIR)/lib $(QUI_LIBS) $(QT_LIB_EXTRAS) +-# GRAPH_OBJS = $(GRAPH_OBJS_QT) +-# GRAPH_SRC = $(GRAPH_SRC_QT) +-# CCOMPILER = @CXX@ ++#%%QT%% GRAPH_FLAGS = -DUSEQT `pkg-config --cflags qt-mt` $(QUI_CFLAGS) ++#%%QT%% GRAPH_LIBS = -L$(QTDIR)/lib $(QUI_LIBS) $(QT_LIB_EXTRAS) ++#%%QT%% GRAPH_OBJS = $(GRAPH_OBJS_QT) ++#%%QT%% GRAPH_SRC = $(GRAPH_SRC_QT) ++#%%QT%% CCOMPILER = @CXX@ + + ##### Qt on UNIX/Linux: uncomment the next two lines: + ELECTRIC_TARGET = electric-target-unix +-QT_LIB_EXTRAS = -lqt-mt -lX11 ++QT_LIB_EXTRAS = `pkg-config --libs qt-mt` + + ##### Qt on Macintosh: uncomment the next two lines (for Qt Evaluation, change "-lqt" to "-lqt-mt"): + # ELECTRIC_TARGET = electric-target-mac +@@ -20,11 +20,11 @@ + + ########################################################### USING MOTIF + ##### If using Motif (or OpenMotif/Lesstif), uncomment these five lines +-GRAPH_FLAGS = @X_CFLAGS@ +-GRAPH_LIBS = -lXm @XMULIB@ -lXt @XPLIB@ @XEXTLIB@ -lX11 +-GRAPH_OBJS = $(GRAPH_OBJS_XT) +-GRAPH_SRC = $(GRAPH_SRC_XT) +-CCOMPILER = @PTHREAD_CC@ ++#%%MOTIF%% GRAPH_FLAGS = @X_CFLAGS@ ++#%%MOTIF%% GRAPH_LIBS = -lXm @XMULIB@ -lXt @XPLIB@ @XEXTLIB@ -lX11 ++#%%MOTIF%% GRAPH_OBJS = $(GRAPH_OBJS_XT) ++#%%MOTIF%% GRAPH_SRC = $(GRAPH_SRC_XT) ++#%%MOTIF%% CCOMPILER = @PTHREAD_CC@ + + ##### For the general-purpose X facility, uncomment this line + XPOWER = -DANYDEPTH +@@ -32,8 +32,8 @@ + # XPOWER = + + ##### For the T1lib TrueType, uncomment these two lines and set them to the proper location +-# TRUETYPE_LIBS = /usr/local/lib/libt1.a +-# TRUETYPECFLAGS = -DTRUETYPE -I/usr/local/include ++#%%T1LIB%% TRUETYPE_LIBS = -L%%LOCALBASE%%/lib -lt1 ++#%%T1LIB%% TRUETYPECFLAGS = -DTRUETYPE -I%%LOCALBASE%%/include + ########################################################### + + +@@ -61,8 +61,8 @@ + + ########################################################### TCL INTERPRETER + ##### If building with a TCL interpreter, uncomment these two lines +-# LANGTCLCFLAGS = -DFORCETCL=1 +-# LANGTCLLIBS = -ltcl ++#%%TCL%% LANGTCLCFLAGS = -DFORCETCL=1 ++#%%TCL%% LANGTCLLIBS = -ltcl + ########################################################### + + +@@ -164,7 +164,8 @@ + + ########################################################### MISCELLANEOUS EXTRAS + ##### If building with Internationalization, uncomment this line +-# INTERNATIONALCFLAGS = -DINTERNATIONAL ++#%%INT%% INTERNATIONALCFLAGS = -DINTERNATIONAL -I%%LOCALBASE%%/include ++#%%INT%% INTERNATIONALLIBS = -L%%LOCALBASE%%/lib -lintl + + ##### If building with Unicode text, uncomment this line + # UNICODECFLAGS = -D_UNICODE +@@ -179,7 +180,7 @@ + # FORTECFLAGS = -compat + + ##### If optimizing, uncomment this line (modify optimizations to taste) +-# OPTIMIZE = -O3 ++#%%OPT%% OPTIMIZE = -O3 -ffast-math -fomit-frame-pointer + + ##### If debugging, uncomment this line (modify debug options to taste) + # DEBUG = -g3 +@@ -801,7 +802,7 @@ + $(CADENCECFLAGS) $(SUNCFLAGS) $(INTERNATIONALCFLAGS) $(UNICODECFLAGS) @PTHREAD_CFLAGS@ + XCFLAGS = $(CFLAGS) $(XPOWER) $(TRUETYPECFLAGS) $(QT_CFLAGS) + LIBS = @X_PRE_LIBS@ @X_LIBS@ $(TRUETYPE_LIBS) $(FSDB_LIBS) $(GRAPH_LIBS) -lm @X_EXTRA_LIBS@ \ +- $(LANGTCLLIBS) $(LANGJAVALIBS) @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ ++ $(LANGTCLLIBS) $(LANGJAVALIBS) $(INTERNATIONALLIBS) @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ + FIND = find + INSTALL = install + DESTDIR = diff -ruN --exclude=CVS /usr/ports/cad/electric/files/patch-src::graph::graphunixx11.c /var/tmp/work4/electric/files/patch-src::graph::graphunixx11.c --- /usr/ports/cad/electric/files/patch-src::graph::graphunixx11.c Fri Sep 20 06:32:14 2002 +++ /var/tmp/work4/electric/files/patch-src::graph::graphunixx11.c Thu Jan 1 03:00:00 1970 @@ -1,26 +0,0 @@ ---- src/graph/graphunixx11.c.orig Fri Jun 14 20:01:11 2002 -+++ src/graph/graphunixx11.c Thu Sep 19 23:30:14 2002 -@@ -149,6 +149,8 @@ - INTBIG gra_initializetcl(void); - #endif - -+#include -+ - /****** windows ******/ - - #define WMLEFTBORDER 8 /* size of left border for windows */ -@@ -2889,8 +2891,13 @@ - INTBIG enumprocessors(void) - { - INTBIG numproc; -+ size_t proclen; -+ -+ proclen = sizeof(numproc); -+ if ((sysctlbyname("hw.ncpu", &numproc, &proclen, NULL, 0) < 0) || -+ (proclen != sizeof(numproc))) -+ numproc = 1; - -- numproc = sysconf(_SC_NPROCESSORS_ONLN); - return(numproc); - } - diff -ruN --exclude=CVS /usr/ports/cad/electric/files/patch-src_graph_graphqtdlg.h /var/tmp/work4/electric/files/patch-src_graph_graphqtdlg.h --- /usr/ports/cad/electric/files/patch-src_graph_graphqtdlg.h Thu Jan 1 03:00:00 1970 +++ /var/tmp/work4/electric/files/patch-src_graph_graphqtdlg.h Fri Jul 14 00:34:21 2006 @@ -0,0 +1,10 @@ +--- src/graph/graphqtdlg.h.orig Fri Jul 14 00:33:51 2006 ++++ src/graph/graphqtdlg.h Fri Jul 14 00:34:01 2006 +@@ -59,6 +59,7 @@ + class QSignalMapper; + class EScrollField; + class EDialogPrivate; ++class EDialog; + + class EDialogPrivate: public QDialog + { diff -ruN --exclude=CVS /usr/ports/cad/electric/files/patch-src_graph_graphunixx11.c /var/tmp/work4/electric/files/patch-src_graph_graphunixx11.c --- /usr/ports/cad/electric/files/patch-src_graph_graphunixx11.c Thu Jan 1 03:00:00 1970 +++ /var/tmp/work4/electric/files/patch-src_graph_graphunixx11.c Fri Jul 14 01:11:33 2006 @@ -0,0 +1,51 @@ +--- src/graph/graphunixx11.c.orig Fri Jul 16 05:59:53 2004 ++++ src/graph/graphunixx11.c Fri Jul 14 01:11:20 2006 +@@ -167,6 +167,8 @@ + #define TRUESTRLEN strlen + + ++#include ++ + /****** windows ******/ + + #define WMLEFTBORDER 8 /* size of left border for windows */ +@@ -1518,13 +1520,13 @@ + gra_truetypeon = 1; + + /* Preload T1 fonts here, because T1_LoadFont spoils memory */ +- for(j=0; jcluster); + if (gra_facelist == 0) return(0); diff -ruN --exclude=CVS /usr/ports/cad/electric/files/patch-src_include_global.h /var/tmp/work4/electric/files/patch-src_include_global.h --- /usr/ports/cad/electric/files/patch-src_include_global.h Thu Jan 1 03:00:00 1970 +++ /var/tmp/work4/electric/files/patch-src_include_global.h Fri Jul 14 12:47:43 2006 @@ -0,0 +1,11 @@ +--- src/include/global.h.orig Fri Jul 14 12:43:20 2006 ++++ src/include/global.h Fri Jul 14 12:45:34 2006 +@@ -204,7 +204,7 @@ + #define INTSML short /* at least 16 bits */ + #define UINTSML unsigned short + #define INTHUGE int64_t /* at least 64 bits */ +-#define UINTHUGE u_int64_t ++#define UINTHUGE uint64_t + #define SIZEOFCHAR (sizeof (CHAR)) /* bytes per character */ + #define SIZEOFINTSML (sizeof (INTSML)) /* bytes per short integer */ + #define SIZEOFINTBIG (sizeof (INTBIG)) /* bytes per long integer */ --- electric-7.0.0.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: