mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-19 19:59:43 +00:00
Upgrade to 20080825.
This commit is contained in:
Thierry Thomas
parent
2b278d5353
commit
bb693d8a5f
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=220724
@ -6,8 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= kicad
|
||||
DISTVERSION= 2007-07-02
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 20080825
|
||||
CATEGORIES= cad
|
||||
#MASTER_SITES= ftp://iut-tice.ujf-grenoble.fr/cao/:dat \
|
||||
# ftp://ftp.lis.inpg.fr/uploads/kicad/:dat \
|
||||
@ -15,38 +14,36 @@ CATEGORIES= cad
|
||||
# ftp://iut-tice.ujf-grenoble.fr/cao/:src \
|
||||
# ftp://ftp.lis.inpg.fr/uploads/kicad/:src \
|
||||
# http://iut-tice.ujf-grenoble.fr/cao/:src
|
||||
MASTER_SITES= ${MASTER_SITE_LOCAL}
|
||||
MASTER_SITE_SUBDIR= thierry/${PORTNAME}
|
||||
DISTFILES= ${PORTNAME}-${DISTVERSION}.tgz \
|
||||
${PORTNAME}-sources--${DISTVERSION}${EXTRACT_SUFX}
|
||||
MASTER_SITES= SF
|
||||
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
|
||||
${PORTNAME}-library-${LIBVERSION}${EXTRACT_SUFX} \
|
||||
${PORTNAME}-doc-${LIBVERSION}${EXTRACT_SUFX}
|
||||
DIST_SUBDIR= ${PORTNAME}
|
||||
EXTRACT_ONLY= ${PORTNAME}-sources--${DISTVERSION}${EXTRACT_SUFX}
|
||||
#EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
|
||||
|
||||
MAINTAINER= thierry@FreeBSD.org
|
||||
COMMENT= Schematic and PCB editing software
|
||||
|
||||
.if !defined(NOPORTDOCS)
|
||||
DISTFILES+= doc_components-${DOCVERSION}.tgz
|
||||
DOCVERSION= 2007-07-02
|
||||
.endif
|
||||
LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost
|
||||
|
||||
WRKSRC= ${WRKDIR}/kicad-dev
|
||||
DOCVERSION= 1.1
|
||||
LIBVERSION= 1.0
|
||||
WRKSRC= ${WRKDIR}/kicad
|
||||
MAKEFILE= makefile.gtk
|
||||
INSTALL_TARGET= install-bin
|
||||
INSTALL_TARGET= install-bin install-res
|
||||
|
||||
USE_ZIP= yes
|
||||
USE_BZIP2= yes
|
||||
USE_GETTEXT= yes
|
||||
USE_GMAKE= yes
|
||||
USE_GL= yes
|
||||
USE_WX= 2.8
|
||||
WX_UNICODE= yes
|
||||
USE_GNOME= atk # Required by libwx_gtk2_aui-2.8.so
|
||||
#TODO Add support for Python.
|
||||
|
||||
INSTDIR= ${PORTNAME}
|
||||
PLIST_SUB= INSTDIR=${INSTDIR} OPSYS=${OPSYS} \
|
||||
PLIST_SUB= OPSYS=${OPSYS} \
|
||||
DESKTOPDIR=${DESKTOPDIR:S|^${PREFIX}/||}
|
||||
|
||||
DOS2CNV= makefile.gtk makefile.include libs.linux
|
||||
BINS= cvpcb eeschema gerbview kicad pcbnew
|
||||
EXTRAS2RM= linux-non_unicode linux wings3d LINUX.README \
|
||||
contrib_makefiles.txt running_kicad_under_W98.txt
|
||||
@ -60,15 +57,7 @@ RUN_DEPENDS+= xpdf:${PORTSDIR}/graphics/xpdf
|
||||
.endif
|
||||
|
||||
post-extract:
|
||||
.for df in ${DOS2CNV}
|
||||
for f in `${FIND} ${WRKSRC} -name ${df}`; do \
|
||||
${CP} $$f $$f.dos && \
|
||||
${TR} -d '\r' < $$f.dos > $$f ; \
|
||||
done
|
||||
.endfor
|
||||
${CP} ${WRKSRC}/libs.linux ${WRKSRC}/libs.${OPSYS}
|
||||
${REINPLACE_CMD} -e 's|kicad/linux|${INSTDIR}/${OPSYS}|' \
|
||||
${WRKSRC}/libs.${OPSYS}
|
||||
|
||||
pre-configure:
|
||||
for f in `${FIND} ${WRKSRC} -name ${MAKEFILE}` ; do \
|
||||
@ -81,30 +70,36 @@ pre-configure:
|
||||
-e 's|libs.linux|libs.${OPSYS}|' \
|
||||
-e 's|gcc -D|${CC} -D|' $$f ; \
|
||||
done
|
||||
${REINPLACE_CMD} -e 's|kicad/linux|${INSTDIR}/${OPSYS}|' \
|
||||
-e 's|/usr/share/kicad|${PREFIX}/${INSTDIR}|' \
|
||||
${REINPLACE_CMD} -e 's|kicad/linux|kicad/${OPSYS}|' \
|
||||
-e 's|/usr/share/kicad|${DATADIR}|' \
|
||||
-e 's|/usr/local|${PREFIX}|' ${WRKSRC}/common/gestfich.cpp
|
||||
.for subdir in template internat
|
||||
${REINPLACE_CMD} -e 's|libs.linux|libs.${OPSYS}|' \
|
||||
${WRKSRC}/${subdir}/makefile
|
||||
.endfor
|
||||
.for subdir in library modules
|
||||
${REINPLACE_CMD} -e 's|libs.linux|libs.${OPSYS}|' \
|
||||
${WRKDIR}/kicad-library/${subdir}/makefile
|
||||
.endfor
|
||||
${REINPLACE_CMD} -e 's|/usr/bin/xpdf|${LOCALBASE}/bin/xpdf|' \
|
||||
-e 's|/usr/bin/konqueror|${LOCALBASE}/bin/konqueror|' \
|
||||
${WRKSRC}/common/eda_doc.cpp
|
||||
|
||||
pre-install:
|
||||
${MKDIR} ${PREFIX}/${INSTDIR}/${OPSYS}/plugins ${DESKTOPDIR}
|
||||
(cd ${PREFIX} && ${TAR} -xzopf ${_DISTDIR}/${PORTNAME}-${DISTVERSION}.tgz)
|
||||
${SED} -e 's|Exec=/usr/local/kicad/linux|Exec=$(PREFIX)/bin|' \
|
||||
-e 's|Icon=/usr/local/kicad/linux|Icon=${PREFIX}/${INSTDIR}|' \
|
||||
< ${PREFIX}/${INSTDIR}/linux/kicad.desktop > ${DESKTOPDIR}/kicad.desktop
|
||||
${INSTALL_DATA} ${PREFIX}/${INSTDIR}/linux/kicad_icon.png ${PREFIX}/${INSTDIR}
|
||||
${RM} -rf ${EXTRAS2RM:S|^|${PREFIX}/${INSTDIR}/|}
|
||||
.for subdir in library modules
|
||||
${CP} -Rp ${WRKDIR}/kicad-library/${subdir} ${WRKSRC}/
|
||||
.endfor
|
||||
|
||||
post-install:
|
||||
${LN} -sf ${BINS:S|^|${PREFIX}/${INSTDIR}/${OPSYS}/|} ${PREFIX}/bin
|
||||
.if !defined(NOPORTDOCS)
|
||||
${TAR} -xf ${_DISTDIR}/doc_components-${DOCVERSION}.tgz \
|
||||
-C ${PREFIX}/${INSTDIR}/library
|
||||
${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/${INSTDIR}/library/doc
|
||||
.else
|
||||
${RM} -rf ${PREFIX}/${INSTDIR}/library/doc
|
||||
${MKDIR} ${DOCSDIR}/help ${DESKTOPDIR}
|
||||
(cd ${WRKDIR}/kicad-doc/doc/help \
|
||||
&& ${COPYTREE_SHARE} \* ${DOCSDIR}/help)
|
||||
(cd ${WRKSRC}/resources/linux/opendesktop \
|
||||
&& ${COPYTREE_SHARE} \* ${DESKTOPDIR})
|
||||
.if !defined(NOPORTEXAMPLES)
|
||||
${MKDIR} ${EXAMPLESDIR}
|
||||
(cd ${WRKSRC}/demos && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})
|
||||
${RM} ${EXAMPLESDIR}/CMakeLists.txt
|
||||
.endif
|
||||
@${ECHO_MSG}
|
||||
@${CAT} ${PKGMESSAGE}
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
MD5 (kicad/kicad-2007-07-02.tgz) = d394986d81addf7542cb0deecf5eb0ae
|
||||
SHA256 (kicad/kicad-2007-07-02.tgz) = 374ce89ef6b1baf29d59fabc835e90a6aa8caa9042c25c21cc0fab2011a0cef3
|
||||
SIZE (kicad/kicad-2007-07-02.tgz) = 62664384
|
||||
MD5 (kicad/kicad-sources--2007-07-02.zip) = 73e74097b32726312ac6cf2b760aa728
|
||||
SHA256 (kicad/kicad-sources--2007-07-02.zip) = b70eb946e50362767ee85248761bfd5746a1892426619fb195f4f6348c6fa6df
|
||||
SIZE (kicad/kicad-sources--2007-07-02.zip) = 2658596
|
||||
MD5 (kicad/doc_components-2007-07-02.tgz) = f062a27530116235e32ff72a236e528b
|
||||
SHA256 (kicad/doc_components-2007-07-02.tgz) = 555f1e921f5d8ee381f6d8c16f462c1f17ce89b1b42e4b2771772781be40bd52
|
||||
SIZE (kicad/doc_components-2007-07-02.tgz) = 61202689
|
||||
MD5 (kicad/kicad-20080825.tar.bz2) = fa3d3e0d7e2793073581cf46f23cca8d
|
||||
SHA256 (kicad/kicad-20080825.tar.bz2) = 5fe86970a1b79898b6e810f02aa89b48dc063d233cc40568d5ed77f4504d2540
|
||||
SIZE (kicad/kicad-20080825.tar.bz2) = 3965134
|
||||
MD5 (kicad/kicad-library-1.0.tar.bz2) = 9c91940aa5f5563bb86c52ff07e8f99a
|
||||
SHA256 (kicad/kicad-library-1.0.tar.bz2) = 8233cc3a63ad6a5d5cd691421a88c02ec7937fbcb932ea53feca18e958a1fdc4
|
||||
SIZE (kicad/kicad-library-1.0.tar.bz2) = 2005524
|
||||
MD5 (kicad/kicad-doc-1.0.tar.bz2) = fa98a5f0f8dc3d04e8ece4f3d1c8064c
|
||||
SHA256 (kicad/kicad-doc-1.0.tar.bz2) = 81ee341af9f2ed886c4fb152ac01cdf1e05726cded9a031aa52c0566e7511563
|
||||
SIZE (kicad/kicad-doc-1.0.tar.bz2) = 29928645
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
--- 3d-viewer/makefile.include.orig Mon Jul 2 19:55:19 2007
|
||||
+++ 3d-viewer/makefile.include Mon Jul 2 19:57:07 2007
|
||||
--- 3d-viewer/makefile.include.orig 2007-12-29 20:15:58.000000000 +0100
|
||||
+++ 3d-viewer/makefile.include 2008-09-20 18:47:08.000000000 +0200
|
||||
@@ -1,5 +1,5 @@
|
||||
EXTRALIBS =
|
||||
-EXTRACPPFLAGS= -I./ -I../include -I../common -I../pcbnew
|
||||
+EXTRACPPFLAGS= -I./ -I../include -I../common -I../pcbnew -I${LOCALBASE}/include
|
||||
-EXTRACPPFLAGS= -I./ -I../include -I../common -I../polygon -I../pcbnew
|
||||
+EXTRACPPFLAGS= -I./ -I../include -I../common -I../polygon -I../pcbnew -I${LOCALBASE}/include
|
||||
|
||||
CPPFLAGS += $(EXTRACPPFLAGS)
|
||||
|
||||
|
||||
@ -1,11 +1,12 @@
|
||||
--- cvpcb/makefile.include.orig Mon Jul 2 22:44:14 2007
|
||||
+++ cvpcb/makefile.include Mon Jul 2 22:46:55 2007
|
||||
@@ -1,7 +1,7 @@
|
||||
# makefile pour cvpcb (mingw)
|
||||
OBJSUFF = o
|
||||
--- cvpcb/makefile.include.orig 2008-08-01 20:41:51.000000000 +0200
|
||||
+++ cvpcb/makefile.include 2008-09-20 18:51:04.000000000 +0200
|
||||
@@ -3,7 +3,8 @@
|
||||
|
||||
-EXTRACPPFLAGS += -DCVPCB -fno-strict-aliasing -I./ -I../cvpcb -I../include -Ibitmaps -I../pcbnew -I../3d-viewer
|
||||
+EXTRACPPFLAGS += -DCVPCB -fno-strict-aliasing -I./ -I../cvpcb -I../include -Ibitmaps -I../pcbnew -I../3d-viewer -I${LOCALBASE}/include
|
||||
EXTRALIBS = ../common/common.a
|
||||
EXTRACPPFLAGS += -DCVPCB -fno-strict-aliasing\
|
||||
-I./ -I../cvpcb -I../include -Ibitmaps\
|
||||
- -I../pcbnew -I../3d-viewer -I ../polygon
|
||||
+ -I../pcbnew -I../3d-viewer -I ../polygon\
|
||||
+ -I${LOCALBASE}/include
|
||||
|
||||
LIBVIEWER3D = ../3d-viewer/3d-viewer.a
|
||||
EXTRALIBS = ../common/common.a ../bitmaps/libbitmaps.a\
|
||||
../polygon/lib_polygon.a\
|
||||
|
||||
@ -1,10 +1,11 @@
|
||||
--- gerbview/makefile.include.orig Mon Jul 2 22:33:47 2007
|
||||
+++ gerbview/makefile.include Mon Jul 2 22:35:17 2007
|
||||
@@ -1,6 +1,6 @@
|
||||
EXTRALIBS = ../common/common.a
|
||||
EXTRACPPFLAGS= -DGERBVIEW -DPCBNEW -fno-strict-aliasing -I./ -I../gerbview -I../include\
|
||||
- -I../share -I../pcbnew -I../3d-viewer
|
||||
+ -I../share -I../pcbnew -I../3d-viewer -I${LOCALBASE}/include
|
||||
--- gerbview/makefile.include.orig 2008-06-02 13:23:50.000000000 +0200
|
||||
+++ gerbview/makefile.include 2008-09-20 18:58:29.000000000 +0200
|
||||
@@ -4,7 +4,7 @@
|
||||
EXTRACPPFLAGS= -DGERBVIEW -DPCBNEW -fno-strict-aliasing\
|
||||
-I./ -I../gerbview -I../include\
|
||||
-I../share -I../pcbnew -I../3d-viewer\
|
||||
- -I../polygon
|
||||
+ -I../polygon -I${LOCALBASE}/include
|
||||
|
||||
|
||||
#COMMON = pcbnew.h struct.h
|
||||
|
||||
|
||||
@ -1,172 +1,117 @@
|
||||
--- libs.FreeBSD.orig Thu Jul 5 22:16:04 2007
|
||||
+++ libs.FreeBSD Thu Jul 5 22:19:03 2007
|
||||
@@ -13,9 +13,8 @@
|
||||
STD_INSTALL = 1
|
||||
--- libs.FreeBSD.orig 2008-09-21 21:25:03.000000000 +0200
|
||||
+++ libs.FreeBSD 2008-09-21 23:12:06.000000000 +0200
|
||||
@@ -18,7 +18,7 @@
|
||||
# STD_INSTALL = 2 is used only to make static link (only useful when kicad run on an other
|
||||
# linux distribution than the distributions used to compil kicad.
|
||||
|
||||
ifeq ($(STD_INSTALL), 1)
|
||||
-PREFIX = /usr
|
||||
-KICAD_BIN = $(PREFIX)/linux
|
||||
-KICAD_PLUGINS = $(PREFIX)/lib/kicad/plugins
|
||||
+KICAD_BIN = $(PREFIX)/kicad/FreeBSD
|
||||
+KICAD_PLUGINS = $(PREFIX)/kicad/FreeBSD/plugins
|
||||
KICAD_DOCS=$(PREFIX)/share/doc/kicad
|
||||
KICAD_DATA=$(PREFIX)/share/kicad
|
||||
KICAD_MODULES=$(KICAD_DATA)/modules
|
||||
@@ -25,9 +24,8 @@
|
||||
-STD_INSTALL = 0
|
||||
+STD_INSTALL = 1
|
||||
|
||||
else
|
||||
# used by myself (JP Charras) to build a statically linked distribution intalled in /usr/local (with STD_INSTALL = 0)
|
||||
-PREFIX = /usr/local/linux
|
||||
-KICAD_BIN = $(PREFIX)/bin
|
||||
-KICAD_PLUGINS = $(PREFIX)/linux/plugins
|
||||
+KICAD_BIN = ${PREFIX}/kicad/FreeBSD
|
||||
+KICAD_PLUGINS = $(PREFIX)/kicad/FreeBSD/plugins
|
||||
#*******************************************
|
||||
#*******************************************
|
||||
@@ -34,17 +34,16 @@
|
||||
endif
|
||||
|
||||
ifeq ($(STD_INSTALL), 1) # Used to build linux distribs
|
||||
-PREFIX = /usr # (can also be /usr/local)
|
||||
KICAD_BIN = $(PREFIX)/bin # Install main binaries here
|
||||
KICAD_PLUGINS = $(KICAD_BIN) # Install other binaries here
|
||||
KICAD_DOCS=$(PREFIX)/share/doc/kicad # Install doc files here
|
||||
-KICAD_DATA=$(PREFIX)/share/kicad # Install libraries and others files here
|
||||
+# Install libraries and others files here
|
||||
+KICAD_DATA = $(PREFIX)/share/kicad
|
||||
|
||||
else # Install ALL files in /usr/local/kicad
|
||||
# when STD_INSTALL = 0 or STD_INSTALL = 2
|
||||
# STD_INSTALL = 0 is used to build kicad intalled in /usr/local
|
||||
# STD_INSTALL = 2 is used by myself (JP Charras) to build a statically linked distribution intalled in /usr/local
|
||||
-PREFIX = /usr/local/kicad
|
||||
KICAD_BIN = $(PREFIX)/bin
|
||||
KICAD_PLUGINS = $(KICAD_BIN)/plugins
|
||||
KICAD_DOCS=$(PREFIX)/help
|
||||
KICAD_DATA=$(PREFIX)
|
||||
KICAD_MODULES=$(KICAD_DATA)/modules
|
||||
@@ -52,10 +50,10 @@
|
||||
# common CPPFLAGS to all components, further CPPFLAGS customization in
|
||||
@@ -57,7 +56,7 @@
|
||||
KICAD_TEMPLATE=$(KICAD_DATA)/template
|
||||
|
||||
# define compil and link
|
||||
-LD = g++
|
||||
+LD = $(CXX)
|
||||
|
||||
SRCSUFF = .cpp
|
||||
OBJSUFF = .o
|
||||
@@ -71,12 +70,12 @@
|
||||
# common CPPFLAGS to all components, further CPPFLAGS customization in
|
||||
# directory specific makefile.gtk files.
|
||||
ifeq ($(DEBUG), 1)
|
||||
-CPPFLAGS = -Wall -g `wx-config --debug --cxxflags` -fno-strict-aliasing
|
||||
+CPPFLAGS = -Wall -g `${WX_CONFIG} --debug --cxxflags` -fno-strict-aliasing
|
||||
LDFLAGS = -g #-v
|
||||
-WXXFLAGS := $(shell wx-config --debug --cxxflags)
|
||||
-CPPFLAGS = -Wall -g3 -ggdb3 ${WXXFLAGS} -fno-strict-aliasing -DDEBUG -D_UNICODE
|
||||
-LDFLAGS = -g3 -ggdb3 #-v
|
||||
+WXXFLAGS := `${WX_CONFIG} --debug --cxxflags`
|
||||
+CPPFLAGS = -Wall -g ${WXXFLAGS} -fno-strict-aliasing -DDEBUG -D_UNICODE
|
||||
+LDFLAGS = -g #-v
|
||||
else
|
||||
-CPPFLAGS = -Wall -O2 `wx-config --cxxflags` -fno-strict-aliasing
|
||||
+CPPFLAGS = -Wall `${WX_CONFIG} --cxxflags` -fno-strict-aliasing
|
||||
-WXXFLAGS := $(shell wx-config --cxxflags)
|
||||
-CPPFLAGS = -Wall -O2 ${WXXFLAGS} -fno-strict-aliasing -D_UNICODE
|
||||
+WXXFLAGS := `${WX_CONFIG} --cxxflags`
|
||||
+CPPFLAGS+= -Wall ${WXXFLAGS} -fno-strict-aliasing -D_UNICODE
|
||||
LDFLAGS = -s #-v
|
||||
endif
|
||||
|
||||
@@ -66,47 +64,47 @@
|
||||
# You must uncomment these lines for static link (or build with "make -f makefile.gtk KICAD_STATIC_LINK=1")
|
||||
# dynamic link is less difficult than static link and is what you would normally want
|
||||
# to use if kicad is running only on your system or one with same level of libraries.
|
||||
-ifndef KICAD_PYTHON
|
||||
-ifeq ($(STD_INSTALL), 0)
|
||||
-KICAD_STATIC_LINK = 1
|
||||
-endif
|
||||
-endif
|
||||
+#ifndef KICAD_PYTHON
|
||||
+#ifeq ($(STD_INSTALL), 0)
|
||||
+#KICAD_STATIC_LINK = 1
|
||||
+#endif
|
||||
+#endif
|
||||
|
||||
ifeq ($(KICAD_STATIC_LINK), 1)
|
||||
-LD = gcc
|
||||
+LD = ${CC}
|
||||
else
|
||||
-LD = g++
|
||||
+LD = ${CXX}
|
||||
endif
|
||||
@@ -88,28 +87,28 @@
|
||||
|
||||
ifdef KICAD_PYTHON
|
||||
-PYTHON_VERSION=2.5
|
||||
PYTHON_VERSION=2.5
|
||||
-PYLIBS= -L/usr/lib
|
||||
-PYLIBS+= -L /usr/include/python
|
||||
+PYTHON_VERSION=2.4
|
||||
+PYLIBS= -L${LOCALBASE}/lib
|
||||
+PYLIBS+= -L${LOCALBASE}/lib/python$(PYTHON_VERSION)
|
||||
PYLIBS+= -lpython$(PYTHON_VERSION)
|
||||
PYLIBS+= -lboost_python
|
||||
PYLIBS+= -lboost_python-mt
|
||||
-EXTRACPPFLAGS+=-I /usr/include/python$(PYTHON_VERSION) -DKICAD_PYTHON -fno-strict-aliasing
|
||||
+EXTRACPPFLAGS+=-I ${LOCALBASE}/python$(PYTHON_VERSION) -DKICAD_PYTHON -fno-strict-aliasing
|
||||
endif
|
||||
|
||||
# path and version definition for wxWidgets and mesa libs
|
||||
# mesa (free opengl library) libs
|
||||
-MESALIBSPATH = /usr/local/lib
|
||||
+MESALIBSPATH = ${LOCALBASE}/lib
|
||||
|
||||
#for static link: add wx gl lib
|
||||
-LIBVERSION=`wx-config --release`
|
||||
-WXPATH = `wx-config --prefix`/lib
|
||||
-PREFIX_WX_LIBS = lib`wx-config --basename`
|
||||
-SUFFIX_WX_LIBSTD = `wx-config --utility=`
|
||||
-SUFFIX_WX_LIBGL = _gl-$(LIBVERSION).a
|
||||
+MESALIBSPATH = ${LOCALBASE}/lib
|
||||
+LIBVERSION=`${WX_CONFIG} --release`
|
||||
+WXPATH = `${WX_CONFIG} --prefix`/lib
|
||||
+PREFIX_WX_LIBS = lib`${WX_CONFIG} --basename`
|
||||
+SUFFIX_WX_LIBSTD = `${WX_CONFIG} --utility=`
|
||||
+SUFFIX_WX_LIBGL = _gl-$(LIBVERSION)
|
||||
|
||||
# Use static link for libstdc++.a (sometimes also libsupc++.a)
|
||||
# locate libstdc++.a and copy it in kicad_dev/syslibs
|
||||
ifeq ($(KICAD_STATIC_LINK), 1)
|
||||
#define path for a copy of libstdc++.a or/and libsupc++.a:
|
||||
-LIBSTDC = ../syslibs/libstdc++.a
|
||||
+LIBSTDC = /usr/lib/libstdc++.a
|
||||
else
|
||||
# Or Use static link for libsupc++ or libstdc++ (more easy!!)
|
||||
LIBSTDC = -lstdc++
|
||||
endif
|
||||
|
||||
|
||||
-LIBVERSION=`wx-config --release`
|
||||
-LIBREGEX=$(WXPATH)/libwxregexu-$(LIBVERSION).a
|
||||
+LIBVERSION=`${WX_CONFIG} --release`
|
||||
+LIBREGEX=
|
||||
|
||||
# use link static for wxWidgets
|
||||
ifeq ($(KICAD_STATIC_LINK), 1)
|
||||
@@ -114,11 +112,11 @@
|
||||
$(MESALIBSPATH)/libGL.a $(MESALIBSPATH)/libGLU.a
|
||||
|
||||
WXSYSLIB= $(WXPATH)/$(PREFIX_WX_LIBS)-$(LIBVERSION).a \
|
||||
- $(WXPATH)/libwxpng-$(LIBVERSION).a\
|
||||
- $(WXPATH)/libwxjpeg-$(LIBVERSION).a\
|
||||
- $(WXPATH)/libwxzlib-$(LIBVERSION).a\
|
||||
+ -lpng\
|
||||
+ -ljpeg\
|
||||
+ -lz\
|
||||
$(LIBREGEX)\
|
||||
- /usr/X11R6/lib/libXinerama.a \
|
||||
+ ${LOCALBASE}/lib/libXinerama.a \
|
||||
-lgtk-x11-2.0 -lgdk-x11-2.0 \
|
||||
-latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lgthread-2.0\
|
||||
-lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl\
|
||||
@@ -127,37 +125,37 @@
|
||||
|
||||
|
||||
WXSYSLIB_WITH_GL= $(WXPATH)/$(PREFIX_WX_LIBS)-$(LIBVERSION).a \
|
||||
- $(WXPATH)/libwxpng-$(LIBVERSION).a\
|
||||
- $(WXPATH)/libwxjpeg-$(LIBVERSION).a\
|
||||
- $(WXPATH)/libwxzlib-$(LIBVERSION).a\
|
||||
+ -lpng\
|
||||
+ -ljpeg\
|
||||
+ -lz\
|
||||
$(LIBS3D)\
|
||||
- /usr/X11R6/lib/libXinerama.a \
|
||||
- /usr/X11R6/lib/libXxf86vm.a \
|
||||
+ ${LOCALBASE}/lib/libXinerama.a \
|
||||
+ ${LOCALBASE}/lib/libXxf86vm.a \
|
||||
-lgtk-x11-2.0 -lgdk-x11-2.0 \
|
||||
-latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lgthread-2.0\
|
||||
-lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl\
|
||||
-lglib-2.0 -lpangoft2-1.0 -lSM\
|
||||
- -L/usr/lib $(PYLIBS)
|
||||
+ -L${LOCALBASE}/lib $(PYLIBS)
|
||||
else
|
||||
SUFFIX_WX_LIBGL = _gl-$(LIBVERSION).a
|
||||
|
||||
ifeq ($(DEBUG), 1)
|
||||
# debug wxWidgets
|
||||
-WXSYSLIB= `wx-config --debug --libs std`
|
||||
-WXSYSLIB_WITH_GL= `wx-config --debug --libs std,gl`
|
||||
+WXSYSLIB= `${WX_CONFIG} --debug --libs std`
|
||||
+WXSYSLIB_WITH_GL= `${WX_CONFIG} --debug --libs std,gl`
|
||||
else
|
||||
# or use "standard command" for wxWidgets
|
||||
-WXSYSLIB= `wx-config --libs std`
|
||||
-WXSYSLIB_WITH_GL= `wx-config --libs std,gl`
|
||||
+WXSYSLIB= `${WX_CONFIG} --libs std`
|
||||
endif
|
||||
|
||||
# use link static
|
||||
@@ -119,16 +118,16 @@
|
||||
|
||||
else
|
||||
ifeq ($(DEBUG), 1)
|
||||
-WXSYSLIB_WITH_GL= `wx-config --debug --libs std,gl`
|
||||
+WXSYSLIB_WITH_GL= `${WX_CONFIG} --debug --libs std,gl`
|
||||
else
|
||||
-WXSYSLIB_WITH_GL= `wx-config --libs std,gl`
|
||||
+WXSYSLIB_WITH_GL= `${WX_CONFIG} --libs std,gl`
|
||||
endif
|
||||
|
||||
endif
|
||||
|
||||
|
||||
# attention à l'ordre des libairies
|
||||
# attention a l'ordre des libairies
|
||||
-LIBS = -L/usr/local/lib -L/usr/X11R6/lib\
|
||||
+LIBS = -L${LOCALBASE}/lib\
|
||||
$(EXTRALIBS) $(WXSYSLIB)\
|
||||
$(LIBSTDC) $(PYLIBS)
|
||||
+LIBS = -L${LOCALBASE}/lib \
|
||||
$(EXTRALIBS) $(WXSYSLIB) $(PYLIBS)
|
||||
|
||||
-LIBS_WITH_GL = -L/usr/local/lib -L/usr/X11R6/lib\
|
||||
+LIBS_WITH_GL = -L${LOCALBASE}/lib\
|
||||
$(EXTRALIBS) $(WXSYSLIB_WITH_GL)\
|
||||
$(LIBSTDC) $(PYLIBS)
|
||||
+LIBS_WITH_GL = -L${LOCALBASE}/lib \
|
||||
$(EXTRALIBS) $(WXSYSLIB_WITH_GL) $(PYLIBS)
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
--- ./pcbnew/class_module.cpp.orig Mon Dec 5 09:47:56 2005
|
||||
+++ ./pcbnew/class_module.cpp Sun Dec 25 16:55:30 2005
|
||||
@@ -1020,7 +1020,7 @@
|
||||
pos += 14;
|
||||
if ( flag ) // Affichage date de modification (utile en Module Editor)
|
||||
{
|
||||
- strcpy(Line, ctime(&m_LastEdit_Time));
|
||||
+ strcpy(Line, ctime((time_t*) &m_LastEdit_Time));
|
||||
strtok(Line," \n\r");
|
||||
strcpy( bufcar, strtok(NULL," \n\r") ); strcat(bufcar," ");
|
||||
strcat( bufcar, strtok(NULL," \n\r") ); strcat(bufcar,", ");
|
||||
--- ./pcbnew/class_module.cpp.orig 2008-08-09 11:05:42.000000000 +0200
|
||||
+++ ./pcbnew/class_module.cpp 2008-09-20 22:18:34.000000000 +0200
|
||||
@@ -1060,7 +1060,7 @@
|
||||
pos += 6;
|
||||
if( flag ) // Affichage date de modification (utile en Module Editor)
|
||||
{
|
||||
- strcpy( Line, ctime( &m_LastEdit_Time ) );
|
||||
+ strcpy( Line, ctime((time_t*) &m_LastEdit_Time ) );
|
||||
strtok( Line, " \n\r" );
|
||||
strcpy( bufcar, strtok( NULL, " \n\r" ) ); strcat( bufcar, " " );
|
||||
strcat( bufcar, strtok( NULL, " \n\r" ) ); strcat( bufcar, ", " );
|
||||
|
||||
@ -1,9 +1,11 @@
|
||||
--- pcbnew/makefile.include.orig Mon Jul 2 22:44:14 2007
|
||||
+++ pcbnew/makefile.include Mon Jul 2 22:45:08 2007
|
||||
@@ -1,5 +1,5 @@
|
||||
EXTRALIBS = ../common/common.a
|
||||
-EXTRACPPFLAGS += -DPCBNEW -fno-strict-aliasing -I./ -Ibitmaps -I../include -I../share -I../pcbnew -I../3d-viewer
|
||||
+EXTRACPPFLAGS += -DPCBNEW -fno-strict-aliasing -I./ -Ibitmaps -I../include -I../share -I../pcbnew -I../3d-viewer -I${LOCALBASE}/include
|
||||
--- pcbnew/makefile.include.orig 2008-07-12 10:25:35.000000000 +0200
|
||||
+++ pcbnew/makefile.include 2008-09-20 22:20:40.000000000 +0200
|
||||
@@ -4,7 +4,7 @@
|
||||
../polygon/kbool/src/libkbool.a
|
||||
|
||||
EXTRACPPFLAGS += -DPCBNEW -fno-strict-aliasing -I./ -Ibitmaps -I../include -I../share\
|
||||
- -I../pcbnew -I../3d-viewer -I../polygon -I/opt/local/include
|
||||
+ -I../pcbnew -I../3d-viewer -I../polygon -I${LOCALBASE}/include
|
||||
|
||||
#COMMON = pcbnew.h struct.h class_pad.h class_module.h class_text_mod.h \
|
||||
# class_edge_mod.h class_equipot.h
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -6,8 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= kicad
|
||||
DISTVERSION= 2007-07-02
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 20080825
|
||||
CATEGORIES= cad
|
||||
#MASTER_SITES= ftp://iut-tice.ujf-grenoble.fr/cao/:dat \
|
||||
# ftp://ftp.lis.inpg.fr/uploads/kicad/:dat \
|
||||
@ -15,38 +14,36 @@ CATEGORIES= cad
|
||||
# ftp://iut-tice.ujf-grenoble.fr/cao/:src \
|
||||
# ftp://ftp.lis.inpg.fr/uploads/kicad/:src \
|
||||
# http://iut-tice.ujf-grenoble.fr/cao/:src
|
||||
MASTER_SITES= ${MASTER_SITE_LOCAL}
|
||||
MASTER_SITE_SUBDIR= thierry/${PORTNAME}
|
||||
DISTFILES= ${PORTNAME}-${DISTVERSION}.tgz \
|
||||
${PORTNAME}-sources--${DISTVERSION}${EXTRACT_SUFX}
|
||||
MASTER_SITES= SF
|
||||
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
|
||||
${PORTNAME}-library-${LIBVERSION}${EXTRACT_SUFX} \
|
||||
${PORTNAME}-doc-${LIBVERSION}${EXTRACT_SUFX}
|
||||
DIST_SUBDIR= ${PORTNAME}
|
||||
EXTRACT_ONLY= ${PORTNAME}-sources--${DISTVERSION}${EXTRACT_SUFX}
|
||||
#EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
|
||||
|
||||
MAINTAINER= thierry@FreeBSD.org
|
||||
COMMENT= Schematic and PCB editing software
|
||||
|
||||
.if !defined(NOPORTDOCS)
|
||||
DISTFILES+= doc_components-${DOCVERSION}.tgz
|
||||
DOCVERSION= 2007-07-02
|
||||
.endif
|
||||
LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost
|
||||
|
||||
WRKSRC= ${WRKDIR}/kicad-dev
|
||||
DOCVERSION= 1.1
|
||||
LIBVERSION= 1.0
|
||||
WRKSRC= ${WRKDIR}/kicad
|
||||
MAKEFILE= makefile.gtk
|
||||
INSTALL_TARGET= install-bin
|
||||
INSTALL_TARGET= install-bin install-res
|
||||
|
||||
USE_ZIP= yes
|
||||
USE_BZIP2= yes
|
||||
USE_GETTEXT= yes
|
||||
USE_GMAKE= yes
|
||||
USE_GL= yes
|
||||
USE_WX= 2.8
|
||||
WX_UNICODE= yes
|
||||
USE_GNOME= atk # Required by libwx_gtk2_aui-2.8.so
|
||||
#TODO Add support for Python.
|
||||
|
||||
INSTDIR= ${PORTNAME}
|
||||
PLIST_SUB= INSTDIR=${INSTDIR} OPSYS=${OPSYS} \
|
||||
PLIST_SUB= OPSYS=${OPSYS} \
|
||||
DESKTOPDIR=${DESKTOPDIR:S|^${PREFIX}/||}
|
||||
|
||||
DOS2CNV= makefile.gtk makefile.include libs.linux
|
||||
BINS= cvpcb eeschema gerbview kicad pcbnew
|
||||
EXTRAS2RM= linux-non_unicode linux wings3d LINUX.README \
|
||||
contrib_makefiles.txt running_kicad_under_W98.txt
|
||||
@ -60,15 +57,7 @@ RUN_DEPENDS+= xpdf:${PORTSDIR}/graphics/xpdf
|
||||
.endif
|
||||
|
||||
post-extract:
|
||||
.for df in ${DOS2CNV}
|
||||
for f in `${FIND} ${WRKSRC} -name ${df}`; do \
|
||||
${CP} $$f $$f.dos && \
|
||||
${TR} -d '\r' < $$f.dos > $$f ; \
|
||||
done
|
||||
.endfor
|
||||
${CP} ${WRKSRC}/libs.linux ${WRKSRC}/libs.${OPSYS}
|
||||
${REINPLACE_CMD} -e 's|kicad/linux|${INSTDIR}/${OPSYS}|' \
|
||||
${WRKSRC}/libs.${OPSYS}
|
||||
|
||||
pre-configure:
|
||||
for f in `${FIND} ${WRKSRC} -name ${MAKEFILE}` ; do \
|
||||
@ -81,30 +70,36 @@ pre-configure:
|
||||
-e 's|libs.linux|libs.${OPSYS}|' \
|
||||
-e 's|gcc -D|${CC} -D|' $$f ; \
|
||||
done
|
||||
${REINPLACE_CMD} -e 's|kicad/linux|${INSTDIR}/${OPSYS}|' \
|
||||
-e 's|/usr/share/kicad|${PREFIX}/${INSTDIR}|' \
|
||||
${REINPLACE_CMD} -e 's|kicad/linux|kicad/${OPSYS}|' \
|
||||
-e 's|/usr/share/kicad|${DATADIR}|' \
|
||||
-e 's|/usr/local|${PREFIX}|' ${WRKSRC}/common/gestfich.cpp
|
||||
.for subdir in template internat
|
||||
${REINPLACE_CMD} -e 's|libs.linux|libs.${OPSYS}|' \
|
||||
${WRKSRC}/${subdir}/makefile
|
||||
.endfor
|
||||
.for subdir in library modules
|
||||
${REINPLACE_CMD} -e 's|libs.linux|libs.${OPSYS}|' \
|
||||
${WRKDIR}/kicad-library/${subdir}/makefile
|
||||
.endfor
|
||||
${REINPLACE_CMD} -e 's|/usr/bin/xpdf|${LOCALBASE}/bin/xpdf|' \
|
||||
-e 's|/usr/bin/konqueror|${LOCALBASE}/bin/konqueror|' \
|
||||
${WRKSRC}/common/eda_doc.cpp
|
||||
|
||||
pre-install:
|
||||
${MKDIR} ${PREFIX}/${INSTDIR}/${OPSYS}/plugins ${DESKTOPDIR}
|
||||
(cd ${PREFIX} && ${TAR} -xzopf ${_DISTDIR}/${PORTNAME}-${DISTVERSION}.tgz)
|
||||
${SED} -e 's|Exec=/usr/local/kicad/linux|Exec=$(PREFIX)/bin|' \
|
||||
-e 's|Icon=/usr/local/kicad/linux|Icon=${PREFIX}/${INSTDIR}|' \
|
||||
< ${PREFIX}/${INSTDIR}/linux/kicad.desktop > ${DESKTOPDIR}/kicad.desktop
|
||||
${INSTALL_DATA} ${PREFIX}/${INSTDIR}/linux/kicad_icon.png ${PREFIX}/${INSTDIR}
|
||||
${RM} -rf ${EXTRAS2RM:S|^|${PREFIX}/${INSTDIR}/|}
|
||||
.for subdir in library modules
|
||||
${CP} -Rp ${WRKDIR}/kicad-library/${subdir} ${WRKSRC}/
|
||||
.endfor
|
||||
|
||||
post-install:
|
||||
${LN} -sf ${BINS:S|^|${PREFIX}/${INSTDIR}/${OPSYS}/|} ${PREFIX}/bin
|
||||
.if !defined(NOPORTDOCS)
|
||||
${TAR} -xf ${_DISTDIR}/doc_components-${DOCVERSION}.tgz \
|
||||
-C ${PREFIX}/${INSTDIR}/library
|
||||
${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/${INSTDIR}/library/doc
|
||||
.else
|
||||
${RM} -rf ${PREFIX}/${INSTDIR}/library/doc
|
||||
${MKDIR} ${DOCSDIR}/help ${DESKTOPDIR}
|
||||
(cd ${WRKDIR}/kicad-doc/doc/help \
|
||||
&& ${COPYTREE_SHARE} \* ${DOCSDIR}/help)
|
||||
(cd ${WRKSRC}/resources/linux/opendesktop \
|
||||
&& ${COPYTREE_SHARE} \* ${DESKTOPDIR})
|
||||
.if !defined(NOPORTEXAMPLES)
|
||||
${MKDIR} ${EXAMPLESDIR}
|
||||
(cd ${WRKSRC}/demos && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})
|
||||
${RM} ${EXAMPLESDIR}/CMakeLists.txt
|
||||
.endif
|
||||
@${ECHO_MSG}
|
||||
@${CAT} ${PKGMESSAGE}
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
MD5 (kicad/kicad-2007-07-02.tgz) = d394986d81addf7542cb0deecf5eb0ae
|
||||
SHA256 (kicad/kicad-2007-07-02.tgz) = 374ce89ef6b1baf29d59fabc835e90a6aa8caa9042c25c21cc0fab2011a0cef3
|
||||
SIZE (kicad/kicad-2007-07-02.tgz) = 62664384
|
||||
MD5 (kicad/kicad-sources--2007-07-02.zip) = 73e74097b32726312ac6cf2b760aa728
|
||||
SHA256 (kicad/kicad-sources--2007-07-02.zip) = b70eb946e50362767ee85248761bfd5746a1892426619fb195f4f6348c6fa6df
|
||||
SIZE (kicad/kicad-sources--2007-07-02.zip) = 2658596
|
||||
MD5 (kicad/doc_components-2007-07-02.tgz) = f062a27530116235e32ff72a236e528b
|
||||
SHA256 (kicad/doc_components-2007-07-02.tgz) = 555f1e921f5d8ee381f6d8c16f462c1f17ce89b1b42e4b2771772781be40bd52
|
||||
SIZE (kicad/doc_components-2007-07-02.tgz) = 61202689
|
||||
MD5 (kicad/kicad-20080825.tar.bz2) = fa3d3e0d7e2793073581cf46f23cca8d
|
||||
SHA256 (kicad/kicad-20080825.tar.bz2) = 5fe86970a1b79898b6e810f02aa89b48dc063d233cc40568d5ed77f4504d2540
|
||||
SIZE (kicad/kicad-20080825.tar.bz2) = 3965134
|
||||
MD5 (kicad/kicad-library-1.0.tar.bz2) = 9c91940aa5f5563bb86c52ff07e8f99a
|
||||
SHA256 (kicad/kicad-library-1.0.tar.bz2) = 8233cc3a63ad6a5d5cd691421a88c02ec7937fbcb932ea53feca18e958a1fdc4
|
||||
SIZE (kicad/kicad-library-1.0.tar.bz2) = 2005524
|
||||
MD5 (kicad/kicad-doc-1.0.tar.bz2) = fa98a5f0f8dc3d04e8ece4f3d1c8064c
|
||||
SHA256 (kicad/kicad-doc-1.0.tar.bz2) = 81ee341af9f2ed886c4fb152ac01cdf1e05726cded9a031aa52c0566e7511563
|
||||
SIZE (kicad/kicad-doc-1.0.tar.bz2) = 29928645
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
--- 3d-viewer/makefile.include.orig Mon Jul 2 19:55:19 2007
|
||||
+++ 3d-viewer/makefile.include Mon Jul 2 19:57:07 2007
|
||||
--- 3d-viewer/makefile.include.orig 2007-12-29 20:15:58.000000000 +0100
|
||||
+++ 3d-viewer/makefile.include 2008-09-20 18:47:08.000000000 +0200
|
||||
@@ -1,5 +1,5 @@
|
||||
EXTRALIBS =
|
||||
-EXTRACPPFLAGS= -I./ -I../include -I../common -I../pcbnew
|
||||
+EXTRACPPFLAGS= -I./ -I../include -I../common -I../pcbnew -I${LOCALBASE}/include
|
||||
-EXTRACPPFLAGS= -I./ -I../include -I../common -I../polygon -I../pcbnew
|
||||
+EXTRACPPFLAGS= -I./ -I../include -I../common -I../polygon -I../pcbnew -I${LOCALBASE}/include
|
||||
|
||||
CPPFLAGS += $(EXTRACPPFLAGS)
|
||||
|
||||
|
||||
@ -1,11 +1,12 @@
|
||||
--- cvpcb/makefile.include.orig Mon Jul 2 22:44:14 2007
|
||||
+++ cvpcb/makefile.include Mon Jul 2 22:46:55 2007
|
||||
@@ -1,7 +1,7 @@
|
||||
# makefile pour cvpcb (mingw)
|
||||
OBJSUFF = o
|
||||
--- cvpcb/makefile.include.orig 2008-08-01 20:41:51.000000000 +0200
|
||||
+++ cvpcb/makefile.include 2008-09-20 18:51:04.000000000 +0200
|
||||
@@ -3,7 +3,8 @@
|
||||
|
||||
-EXTRACPPFLAGS += -DCVPCB -fno-strict-aliasing -I./ -I../cvpcb -I../include -Ibitmaps -I../pcbnew -I../3d-viewer
|
||||
+EXTRACPPFLAGS += -DCVPCB -fno-strict-aliasing -I./ -I../cvpcb -I../include -Ibitmaps -I../pcbnew -I../3d-viewer -I${LOCALBASE}/include
|
||||
EXTRALIBS = ../common/common.a
|
||||
EXTRACPPFLAGS += -DCVPCB -fno-strict-aliasing\
|
||||
-I./ -I../cvpcb -I../include -Ibitmaps\
|
||||
- -I../pcbnew -I../3d-viewer -I ../polygon
|
||||
+ -I../pcbnew -I../3d-viewer -I ../polygon\
|
||||
+ -I${LOCALBASE}/include
|
||||
|
||||
LIBVIEWER3D = ../3d-viewer/3d-viewer.a
|
||||
EXTRALIBS = ../common/common.a ../bitmaps/libbitmaps.a\
|
||||
../polygon/lib_polygon.a\
|
||||
|
||||
@ -1,10 +1,11 @@
|
||||
--- gerbview/makefile.include.orig Mon Jul 2 22:33:47 2007
|
||||
+++ gerbview/makefile.include Mon Jul 2 22:35:17 2007
|
||||
@@ -1,6 +1,6 @@
|
||||
EXTRALIBS = ../common/common.a
|
||||
EXTRACPPFLAGS= -DGERBVIEW -DPCBNEW -fno-strict-aliasing -I./ -I../gerbview -I../include\
|
||||
- -I../share -I../pcbnew -I../3d-viewer
|
||||
+ -I../share -I../pcbnew -I../3d-viewer -I${LOCALBASE}/include
|
||||
--- gerbview/makefile.include.orig 2008-06-02 13:23:50.000000000 +0200
|
||||
+++ gerbview/makefile.include 2008-09-20 18:58:29.000000000 +0200
|
||||
@@ -4,7 +4,7 @@
|
||||
EXTRACPPFLAGS= -DGERBVIEW -DPCBNEW -fno-strict-aliasing\
|
||||
-I./ -I../gerbview -I../include\
|
||||
-I../share -I../pcbnew -I../3d-viewer\
|
||||
- -I../polygon
|
||||
+ -I../polygon -I${LOCALBASE}/include
|
||||
|
||||
|
||||
#COMMON = pcbnew.h struct.h
|
||||
|
||||
|
||||
@ -1,172 +1,117 @@
|
||||
--- libs.FreeBSD.orig Thu Jul 5 22:16:04 2007
|
||||
+++ libs.FreeBSD Thu Jul 5 22:19:03 2007
|
||||
@@ -13,9 +13,8 @@
|
||||
STD_INSTALL = 1
|
||||
--- libs.FreeBSD.orig 2008-09-21 21:25:03.000000000 +0200
|
||||
+++ libs.FreeBSD 2008-09-21 23:12:06.000000000 +0200
|
||||
@@ -18,7 +18,7 @@
|
||||
# STD_INSTALL = 2 is used only to make static link (only useful when kicad run on an other
|
||||
# linux distribution than the distributions used to compil kicad.
|
||||
|
||||
ifeq ($(STD_INSTALL), 1)
|
||||
-PREFIX = /usr
|
||||
-KICAD_BIN = $(PREFIX)/linux
|
||||
-KICAD_PLUGINS = $(PREFIX)/lib/kicad/plugins
|
||||
+KICAD_BIN = $(PREFIX)/kicad/FreeBSD
|
||||
+KICAD_PLUGINS = $(PREFIX)/kicad/FreeBSD/plugins
|
||||
KICAD_DOCS=$(PREFIX)/share/doc/kicad
|
||||
KICAD_DATA=$(PREFIX)/share/kicad
|
||||
KICAD_MODULES=$(KICAD_DATA)/modules
|
||||
@@ -25,9 +24,8 @@
|
||||
-STD_INSTALL = 0
|
||||
+STD_INSTALL = 1
|
||||
|
||||
else
|
||||
# used by myself (JP Charras) to build a statically linked distribution intalled in /usr/local (with STD_INSTALL = 0)
|
||||
-PREFIX = /usr/local/linux
|
||||
-KICAD_BIN = $(PREFIX)/bin
|
||||
-KICAD_PLUGINS = $(PREFIX)/linux/plugins
|
||||
+KICAD_BIN = ${PREFIX}/kicad/FreeBSD
|
||||
+KICAD_PLUGINS = $(PREFIX)/kicad/FreeBSD/plugins
|
||||
#*******************************************
|
||||
#*******************************************
|
||||
@@ -34,17 +34,16 @@
|
||||
endif
|
||||
|
||||
ifeq ($(STD_INSTALL), 1) # Used to build linux distribs
|
||||
-PREFIX = /usr # (can also be /usr/local)
|
||||
KICAD_BIN = $(PREFIX)/bin # Install main binaries here
|
||||
KICAD_PLUGINS = $(KICAD_BIN) # Install other binaries here
|
||||
KICAD_DOCS=$(PREFIX)/share/doc/kicad # Install doc files here
|
||||
-KICAD_DATA=$(PREFIX)/share/kicad # Install libraries and others files here
|
||||
+# Install libraries and others files here
|
||||
+KICAD_DATA = $(PREFIX)/share/kicad
|
||||
|
||||
else # Install ALL files in /usr/local/kicad
|
||||
# when STD_INSTALL = 0 or STD_INSTALL = 2
|
||||
# STD_INSTALL = 0 is used to build kicad intalled in /usr/local
|
||||
# STD_INSTALL = 2 is used by myself (JP Charras) to build a statically linked distribution intalled in /usr/local
|
||||
-PREFIX = /usr/local/kicad
|
||||
KICAD_BIN = $(PREFIX)/bin
|
||||
KICAD_PLUGINS = $(KICAD_BIN)/plugins
|
||||
KICAD_DOCS=$(PREFIX)/help
|
||||
KICAD_DATA=$(PREFIX)
|
||||
KICAD_MODULES=$(KICAD_DATA)/modules
|
||||
@@ -52,10 +50,10 @@
|
||||
# common CPPFLAGS to all components, further CPPFLAGS customization in
|
||||
@@ -57,7 +56,7 @@
|
||||
KICAD_TEMPLATE=$(KICAD_DATA)/template
|
||||
|
||||
# define compil and link
|
||||
-LD = g++
|
||||
+LD = $(CXX)
|
||||
|
||||
SRCSUFF = .cpp
|
||||
OBJSUFF = .o
|
||||
@@ -71,12 +70,12 @@
|
||||
# common CPPFLAGS to all components, further CPPFLAGS customization in
|
||||
# directory specific makefile.gtk files.
|
||||
ifeq ($(DEBUG), 1)
|
||||
-CPPFLAGS = -Wall -g `wx-config --debug --cxxflags` -fno-strict-aliasing
|
||||
+CPPFLAGS = -Wall -g `${WX_CONFIG} --debug --cxxflags` -fno-strict-aliasing
|
||||
LDFLAGS = -g #-v
|
||||
-WXXFLAGS := $(shell wx-config --debug --cxxflags)
|
||||
-CPPFLAGS = -Wall -g3 -ggdb3 ${WXXFLAGS} -fno-strict-aliasing -DDEBUG -D_UNICODE
|
||||
-LDFLAGS = -g3 -ggdb3 #-v
|
||||
+WXXFLAGS := `${WX_CONFIG} --debug --cxxflags`
|
||||
+CPPFLAGS = -Wall -g ${WXXFLAGS} -fno-strict-aliasing -DDEBUG -D_UNICODE
|
||||
+LDFLAGS = -g #-v
|
||||
else
|
||||
-CPPFLAGS = -Wall -O2 `wx-config --cxxflags` -fno-strict-aliasing
|
||||
+CPPFLAGS = -Wall `${WX_CONFIG} --cxxflags` -fno-strict-aliasing
|
||||
-WXXFLAGS := $(shell wx-config --cxxflags)
|
||||
-CPPFLAGS = -Wall -O2 ${WXXFLAGS} -fno-strict-aliasing -D_UNICODE
|
||||
+WXXFLAGS := `${WX_CONFIG} --cxxflags`
|
||||
+CPPFLAGS+= -Wall ${WXXFLAGS} -fno-strict-aliasing -D_UNICODE
|
||||
LDFLAGS = -s #-v
|
||||
endif
|
||||
|
||||
@@ -66,47 +64,47 @@
|
||||
# You must uncomment these lines for static link (or build with "make -f makefile.gtk KICAD_STATIC_LINK=1")
|
||||
# dynamic link is less difficult than static link and is what you would normally want
|
||||
# to use if kicad is running only on your system or one with same level of libraries.
|
||||
-ifndef KICAD_PYTHON
|
||||
-ifeq ($(STD_INSTALL), 0)
|
||||
-KICAD_STATIC_LINK = 1
|
||||
-endif
|
||||
-endif
|
||||
+#ifndef KICAD_PYTHON
|
||||
+#ifeq ($(STD_INSTALL), 0)
|
||||
+#KICAD_STATIC_LINK = 1
|
||||
+#endif
|
||||
+#endif
|
||||
|
||||
ifeq ($(KICAD_STATIC_LINK), 1)
|
||||
-LD = gcc
|
||||
+LD = ${CC}
|
||||
else
|
||||
-LD = g++
|
||||
+LD = ${CXX}
|
||||
endif
|
||||
@@ -88,28 +87,28 @@
|
||||
|
||||
ifdef KICAD_PYTHON
|
||||
-PYTHON_VERSION=2.5
|
||||
PYTHON_VERSION=2.5
|
||||
-PYLIBS= -L/usr/lib
|
||||
-PYLIBS+= -L /usr/include/python
|
||||
+PYTHON_VERSION=2.4
|
||||
+PYLIBS= -L${LOCALBASE}/lib
|
||||
+PYLIBS+= -L${LOCALBASE}/lib/python$(PYTHON_VERSION)
|
||||
PYLIBS+= -lpython$(PYTHON_VERSION)
|
||||
PYLIBS+= -lboost_python
|
||||
PYLIBS+= -lboost_python-mt
|
||||
-EXTRACPPFLAGS+=-I /usr/include/python$(PYTHON_VERSION) -DKICAD_PYTHON -fno-strict-aliasing
|
||||
+EXTRACPPFLAGS+=-I ${LOCALBASE}/python$(PYTHON_VERSION) -DKICAD_PYTHON -fno-strict-aliasing
|
||||
endif
|
||||
|
||||
# path and version definition for wxWidgets and mesa libs
|
||||
# mesa (free opengl library) libs
|
||||
-MESALIBSPATH = /usr/local/lib
|
||||
+MESALIBSPATH = ${LOCALBASE}/lib
|
||||
|
||||
#for static link: add wx gl lib
|
||||
-LIBVERSION=`wx-config --release`
|
||||
-WXPATH = `wx-config --prefix`/lib
|
||||
-PREFIX_WX_LIBS = lib`wx-config --basename`
|
||||
-SUFFIX_WX_LIBSTD = `wx-config --utility=`
|
||||
-SUFFIX_WX_LIBGL = _gl-$(LIBVERSION).a
|
||||
+MESALIBSPATH = ${LOCALBASE}/lib
|
||||
+LIBVERSION=`${WX_CONFIG} --release`
|
||||
+WXPATH = `${WX_CONFIG} --prefix`/lib
|
||||
+PREFIX_WX_LIBS = lib`${WX_CONFIG} --basename`
|
||||
+SUFFIX_WX_LIBSTD = `${WX_CONFIG} --utility=`
|
||||
+SUFFIX_WX_LIBGL = _gl-$(LIBVERSION)
|
||||
|
||||
# Use static link for libstdc++.a (sometimes also libsupc++.a)
|
||||
# locate libstdc++.a and copy it in kicad_dev/syslibs
|
||||
ifeq ($(KICAD_STATIC_LINK), 1)
|
||||
#define path for a copy of libstdc++.a or/and libsupc++.a:
|
||||
-LIBSTDC = ../syslibs/libstdc++.a
|
||||
+LIBSTDC = /usr/lib/libstdc++.a
|
||||
else
|
||||
# Or Use static link for libsupc++ or libstdc++ (more easy!!)
|
||||
LIBSTDC = -lstdc++
|
||||
endif
|
||||
|
||||
|
||||
-LIBVERSION=`wx-config --release`
|
||||
-LIBREGEX=$(WXPATH)/libwxregexu-$(LIBVERSION).a
|
||||
+LIBVERSION=`${WX_CONFIG} --release`
|
||||
+LIBREGEX=
|
||||
|
||||
# use link static for wxWidgets
|
||||
ifeq ($(KICAD_STATIC_LINK), 1)
|
||||
@@ -114,11 +112,11 @@
|
||||
$(MESALIBSPATH)/libGL.a $(MESALIBSPATH)/libGLU.a
|
||||
|
||||
WXSYSLIB= $(WXPATH)/$(PREFIX_WX_LIBS)-$(LIBVERSION).a \
|
||||
- $(WXPATH)/libwxpng-$(LIBVERSION).a\
|
||||
- $(WXPATH)/libwxjpeg-$(LIBVERSION).a\
|
||||
- $(WXPATH)/libwxzlib-$(LIBVERSION).a\
|
||||
+ -lpng\
|
||||
+ -ljpeg\
|
||||
+ -lz\
|
||||
$(LIBREGEX)\
|
||||
- /usr/X11R6/lib/libXinerama.a \
|
||||
+ ${LOCALBASE}/lib/libXinerama.a \
|
||||
-lgtk-x11-2.0 -lgdk-x11-2.0 \
|
||||
-latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lgthread-2.0\
|
||||
-lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl\
|
||||
@@ -127,37 +125,37 @@
|
||||
|
||||
|
||||
WXSYSLIB_WITH_GL= $(WXPATH)/$(PREFIX_WX_LIBS)-$(LIBVERSION).a \
|
||||
- $(WXPATH)/libwxpng-$(LIBVERSION).a\
|
||||
- $(WXPATH)/libwxjpeg-$(LIBVERSION).a\
|
||||
- $(WXPATH)/libwxzlib-$(LIBVERSION).a\
|
||||
+ -lpng\
|
||||
+ -ljpeg\
|
||||
+ -lz\
|
||||
$(LIBS3D)\
|
||||
- /usr/X11R6/lib/libXinerama.a \
|
||||
- /usr/X11R6/lib/libXxf86vm.a \
|
||||
+ ${LOCALBASE}/lib/libXinerama.a \
|
||||
+ ${LOCALBASE}/lib/libXxf86vm.a \
|
||||
-lgtk-x11-2.0 -lgdk-x11-2.0 \
|
||||
-latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lgthread-2.0\
|
||||
-lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl\
|
||||
-lglib-2.0 -lpangoft2-1.0 -lSM\
|
||||
- -L/usr/lib $(PYLIBS)
|
||||
+ -L${LOCALBASE}/lib $(PYLIBS)
|
||||
else
|
||||
SUFFIX_WX_LIBGL = _gl-$(LIBVERSION).a
|
||||
|
||||
ifeq ($(DEBUG), 1)
|
||||
# debug wxWidgets
|
||||
-WXSYSLIB= `wx-config --debug --libs std`
|
||||
-WXSYSLIB_WITH_GL= `wx-config --debug --libs std,gl`
|
||||
+WXSYSLIB= `${WX_CONFIG} --debug --libs std`
|
||||
+WXSYSLIB_WITH_GL= `${WX_CONFIG} --debug --libs std,gl`
|
||||
else
|
||||
# or use "standard command" for wxWidgets
|
||||
-WXSYSLIB= `wx-config --libs std`
|
||||
-WXSYSLIB_WITH_GL= `wx-config --libs std,gl`
|
||||
+WXSYSLIB= `${WX_CONFIG} --libs std`
|
||||
endif
|
||||
|
||||
# use link static
|
||||
@@ -119,16 +118,16 @@
|
||||
|
||||
else
|
||||
ifeq ($(DEBUG), 1)
|
||||
-WXSYSLIB_WITH_GL= `wx-config --debug --libs std,gl`
|
||||
+WXSYSLIB_WITH_GL= `${WX_CONFIG} --debug --libs std,gl`
|
||||
else
|
||||
-WXSYSLIB_WITH_GL= `wx-config --libs std,gl`
|
||||
+WXSYSLIB_WITH_GL= `${WX_CONFIG} --libs std,gl`
|
||||
endif
|
||||
|
||||
endif
|
||||
|
||||
|
||||
# attention à l'ordre des libairies
|
||||
# attention a l'ordre des libairies
|
||||
-LIBS = -L/usr/local/lib -L/usr/X11R6/lib\
|
||||
+LIBS = -L${LOCALBASE}/lib\
|
||||
$(EXTRALIBS) $(WXSYSLIB)\
|
||||
$(LIBSTDC) $(PYLIBS)
|
||||
+LIBS = -L${LOCALBASE}/lib \
|
||||
$(EXTRALIBS) $(WXSYSLIB) $(PYLIBS)
|
||||
|
||||
-LIBS_WITH_GL = -L/usr/local/lib -L/usr/X11R6/lib\
|
||||
+LIBS_WITH_GL = -L${LOCALBASE}/lib\
|
||||
$(EXTRALIBS) $(WXSYSLIB_WITH_GL)\
|
||||
$(LIBSTDC) $(PYLIBS)
|
||||
+LIBS_WITH_GL = -L${LOCALBASE}/lib \
|
||||
$(EXTRALIBS) $(WXSYSLIB_WITH_GL) $(PYLIBS)
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
--- ./pcbnew/class_module.cpp.orig Mon Dec 5 09:47:56 2005
|
||||
+++ ./pcbnew/class_module.cpp Sun Dec 25 16:55:30 2005
|
||||
@@ -1020,7 +1020,7 @@
|
||||
pos += 14;
|
||||
if ( flag ) // Affichage date de modification (utile en Module Editor)
|
||||
{
|
||||
- strcpy(Line, ctime(&m_LastEdit_Time));
|
||||
+ strcpy(Line, ctime((time_t*) &m_LastEdit_Time));
|
||||
strtok(Line," \n\r");
|
||||
strcpy( bufcar, strtok(NULL," \n\r") ); strcat(bufcar," ");
|
||||
strcat( bufcar, strtok(NULL," \n\r") ); strcat(bufcar,", ");
|
||||
--- ./pcbnew/class_module.cpp.orig 2008-08-09 11:05:42.000000000 +0200
|
||||
+++ ./pcbnew/class_module.cpp 2008-09-20 22:18:34.000000000 +0200
|
||||
@@ -1060,7 +1060,7 @@
|
||||
pos += 6;
|
||||
if( flag ) // Affichage date de modification (utile en Module Editor)
|
||||
{
|
||||
- strcpy( Line, ctime( &m_LastEdit_Time ) );
|
||||
+ strcpy( Line, ctime((time_t*) &m_LastEdit_Time ) );
|
||||
strtok( Line, " \n\r" );
|
||||
strcpy( bufcar, strtok( NULL, " \n\r" ) ); strcat( bufcar, " " );
|
||||
strcat( bufcar, strtok( NULL, " \n\r" ) ); strcat( bufcar, ", " );
|
||||
|
||||
@ -1,9 +1,11 @@
|
||||
--- pcbnew/makefile.include.orig Mon Jul 2 22:44:14 2007
|
||||
+++ pcbnew/makefile.include Mon Jul 2 22:45:08 2007
|
||||
@@ -1,5 +1,5 @@
|
||||
EXTRALIBS = ../common/common.a
|
||||
-EXTRACPPFLAGS += -DPCBNEW -fno-strict-aliasing -I./ -Ibitmaps -I../include -I../share -I../pcbnew -I../3d-viewer
|
||||
+EXTRACPPFLAGS += -DPCBNEW -fno-strict-aliasing -I./ -Ibitmaps -I../include -I../share -I../pcbnew -I../3d-viewer -I${LOCALBASE}/include
|
||||
--- pcbnew/makefile.include.orig 2008-07-12 10:25:35.000000000 +0200
|
||||
+++ pcbnew/makefile.include 2008-09-20 22:20:40.000000000 +0200
|
||||
@@ -4,7 +4,7 @@
|
||||
../polygon/kbool/src/libkbool.a
|
||||
|
||||
EXTRACPPFLAGS += -DPCBNEW -fno-strict-aliasing -I./ -Ibitmaps -I../include -I../share\
|
||||
- -I../pcbnew -I../3d-viewer -I../polygon -I/opt/local/include
|
||||
+ -I../pcbnew -I../3d-viewer -I../polygon -I${LOCALBASE}/include
|
||||
|
||||
#COMMON = pcbnew.h struct.h class_pad.h class_module.h class_text_mod.h \
|
||||
# class_edge_mod.h class_equipot.h
|
||||
|
||||
2507
cad/kicad/pkg-plist
2507
cad/kicad/pkg-plist
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user