9 files changed, 142 insertions, 69 deletions

diff --git a/cad/kicad/Makefile b/cad/kicad/Makefile
index 9d68c63b7107..12c7c479b393 100644
--- a/cad/kicad/Makefile
+++ b/cad/kicad/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		kicad
-DISTVERSION=		2007-05-25
+DISTVERSION=		2007-07-02
 CATEGORIES=		cad
 MASTER_SITES=		ftp://iut-tice.ujf-grenoble.fr/cao/:dat		\
 			ftp://ftp.lis.inpg.fr/uploads/kicad/:dat	\
@@ -15,20 +15,21 @@ MASTER_SITES=		ftp://iut-tice.ujf-grenoble.fr/cao/:dat		\
 			ftp://ftp.lis.inpg.fr/uploads/kicad/:src\
 			http://iut-tice.ujf-grenoble.fr/cao/:src
 DISTFILES=		${PORTNAME}-${DISTVERSION}.tgz:dat		\
-			${PORTNAME}-sources-${DISTVERSION}${EXTRACT_SUFX}:src
+			${PORTNAME}-sources--${DISTVERSION}${EXTRACT_SUFX}:src
 DIST_SUBDIR=		${PORTNAME}
-EXTRACT_ONLY=		${PORTNAME}-sources-${DISTVERSION}${EXTRACT_SUFX}
+EXTRACT_ONLY=		${PORTNAME}-sources--${DISTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=		thierry@FreeBSD.org
 COMMENT=		Schematic and PCB editing software
 
 .if !defined(NOPORTDOCS)
 DISTFILES+=	doc_components-${DOCVERSION}.tgz:dat
-DOCVERSION=	2007-05-11
+DOCVERSION=	2007-07-02
 .endif
 
 WRKSRC=		${WRKDIR}/kicad-dev
 MAKEFILE=	makefile.gtk
+INSTALL_TARGET=	install-bin
 
 USE_ZIP=	yes
 USE_GETTEXT=	yes
@@ -41,8 +42,10 @@ USE_GNOME=	atk	# Required by libwx_gtk2_aui-2.8.so
 INSTDIR=	${PORTNAME}
 PLIST_SUB=	INSTDIR=${INSTDIR} OPSYS=${OPSYS}
 
-DOS2CNV=	makefile.gtk makefile.include
+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
 
 .include <bsd.port.pre.mk>
 
@@ -64,9 +67,10 @@ post-extract:
 		${WRKSRC}/libs.${OPSYS}
 
 pre-configure:
-	for f in `${FIND} ${WRKSRC} -name ${MAKEFILE}`; do		\
+	for f in `${FIND} ${WRKSRC} -name ${MAKEFILE}` ; do		\
 		${REINPLACE_CMD} -e 's|CC = gcc|#CC = gcc|'		\
 			-e 's|LD = gcc|LD = ${CC}|'			\
+			-e 's|LD = g++|LD = ${CXX}|'			\
 			-e 's|-O2|${CFLAGS} -I${X11BASE}/include|'	\
 			-e 's|wx-config|${WX_CONFIG}|'			\
 			-e 's|LDFLAGS =|LDFLAGS += -L${X11BASE}/lib|'	\
@@ -74,6 +78,7 @@ pre-configure:
 			-e 's|gcc -D|${CC} -D|' $$f ;			\
 	done
 	${REINPLACE_CMD} -e 's|kicad/linux|${INSTDIR}/${OPSYS}|'	\
+		-e 's|/usr/share/kicad|${PREFIX}/${INSTDIR}|'		\
 		-e 's|/usr/local|${PREFIX}|' ${WRKSRC}/common/gestfich.cpp
 	${REINPLACE_CMD} -e 's|/usr/bin/xpdf|${X11BASE}/bin/xpdf|'	\
 		-e 's|/usr/bin/konqueror|${LOCALBASE}/bin/konqueror|'	\
@@ -82,9 +87,11 @@ pre-configure:
 pre-install:
 	${MKDIR} ${PREFIX}/${INSTDIR}/${OPSYS}/plugins
 	(cd ${PREFIX} && ${TAR} -xzopf ${_DISTDIR}/${PORTNAME}-${DISTVERSION}.tgz)
-	${RM} -rf ${PREFIX}/${INSTDIR}/linux-non_unicode		\
-		${PREFIX}/${INSTDIR}/linux ${PREFIX}/${INSTDIR}/wings3d	\
-		${PREFIX}/${INSTDIR}/LINUX.README
+	${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}/|}
 
 post-install:
 	${LN} -sf ${BINS:S|^|${PREFIX}/${INSTDIR}/${OPSYS}/|} ${PREFIX}/bin
diff --git a/cad/kicad/distinfo b/cad/kicad/distinfo
index c4ce3772a2f0..d84e3eb09ed9 100644
--- a/cad/kicad/distinfo
+++ b/cad/kicad/distinfo
@@ -1,9 +1,9 @@
-MD5 (kicad/kicad-2007-05-25.tgz) = bcd1f5605fde1437036cf5d945a12157
-SHA256 (kicad/kicad-2007-05-25.tgz) = 82e3396fe405676471032997ffab10d054a5a731baf2c2e16921efeb4be65f90
-SIZE (kicad/kicad-2007-05-25.tgz) = 61657926
-MD5 (kicad/kicad-sources-2007-05-25.zip) = f8ef1162a2e749c3604e76ecf96d9b73
-SHA256 (kicad/kicad-sources-2007-05-25.zip) = a95e60466889d649319930614784479e4b93ca4df7353c74bf3a65f792a7b3ba
-SIZE (kicad/kicad-sources-2007-05-25.zip) = 1749472
-MD5 (kicad/doc_components-2007-05-11.tgz) = 6596c296d757fc9dc29ac76b314fb976
-SHA256 (kicad/doc_components-2007-05-11.tgz) = 15328dbcd4d5a560973a1b03a67cb13f963ace6d252fd238adf8ec3b29b04dcf
-SIZE (kicad/doc_components-2007-05-11.tgz) = 61202948
+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
diff --git a/cad/kicad/files/patch-3d-viewer_makefile.include b/cad/kicad/files/patch-3d-viewer_makefile.include
new file mode 100644
index 000000000000..4afef4eda549
--- /dev/null
+++ b/cad/kicad/files/patch-3d-viewer_makefile.include
@@ -0,0 +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
+@@ -1,5 +1,5 @@
+ EXTRALIBS =
+-EXTRACPPFLAGS= -I./ -I../include -I../common -I../pcbnew
++EXTRACPPFLAGS= -I./ -I../include -I../common -I../pcbnew -I${X11BASE}/include
+ 
+ CPPFLAGS += $(EXTRACPPFLAGS)
+ 
diff --git a/cad/kicad/files/patch-cvpcb_makefile.include b/cad/kicad/files/patch-cvpcb_makefile.include
new file mode 100644
index 000000000000..abe33ee6ad6e
--- /dev/null
+++ b/cad/kicad/files/patch-cvpcb_makefile.include
@@ -0,0 +1,11 @@
+--- 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
+ 
+-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${X11BASE}/include
+ EXTRALIBS = ../common/common.a
+ 
+ LIBVIEWER3D = ../3d-viewer/3d-viewer.a
diff --git a/cad/kicad/files/patch-gerbview_makefile.include b/cad/kicad/files/patch-gerbview_makefile.include
new file mode 100644
index 000000000000..0479d921db13
--- /dev/null
+++ b/cad/kicad/files/patch-gerbview_makefile.include
@@ -0,0 +1,10 @@
+--- 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${X11BASE}/include
+ 
+ #COMMON = pcbnew.h struct.h
+ 
diff --git a/cad/kicad/files/patch-libs.FreeBSD b/cad/kicad/files/patch-libs.FreeBSD
index 90aa4f91af7d..ceff2834948a 100644
--- a/cad/kicad/files/patch-libs.FreeBSD
+++ b/cad/kicad/files/patch-libs.FreeBSD
@@ -1,26 +1,67 @@
---- libs.FreeBSD.orig	Fri May 25 18:35:26 2007
-+++ libs.FreeBSD	Fri May 25 21:04:46 2007
-@@ -1,6 +1,6 @@
+--- 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
  
- #Configuration for build kicad
--KICAD_BIN = /usr/local/kicad/FreeBSD
-+KICAD_BIN = ${PREFIX}/kicad/FreeBSD
+ 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 @@
  
+ 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
+ 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 
+ # 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
+ else
+-CPPFLAGS = -Wall -O2 `wx-config --cxxflags` -fno-strict-aliasing
++CPPFLAGS = -Wall `${WX_CONFIG} --cxxflags` -fno-strict-aliasing
+ LDFLAGS = -s #-v
+ endif
  
- SRCSUFF = .cpp
-@@ -14,39 +14,39 @@
- # You must comment or uncomment this line for dynamic or static link
- # dynamic link is less difficult than static link
- # choose it if you have problems (libs not found, or unresolved references) ), or if kicad is running only on YOUR system.
+@@ -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
  
  ifdef KICAD_PYTHON
--PYTHON_VERSION=2.3
+-PYTHON_VERSION=2.5
 -PYLIBS= -L/usr/lib
 -PYLIBS+= -L /usr/include/python
 +PYTHON_VERSION=2.4
@@ -46,7 +87,7 @@
  
  # Use static link for libstdc++.a (sometimes also libsupc++.a)
  # locate libstdc++.a and copy it in kicad_dev/syslibs
- ifdef KICAD_STATIC_LINK
+ 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
@@ -62,8 +103,8 @@
 +LIBREGEX=
  
  # use link static for wxWidgets
- ifdef KICAD_STATIC_LINK
-@@ -54,11 +54,11 @@
+ ifeq ($(KICAD_STATIC_LINK), 1)
+@@ -114,11 +112,11 @@
  	 $(MESALIBSPATH)/libGL.a $(MESALIBSPATH)/libGLU.a
  
  WXSYSLIB= $(WXPATH)/$(PREFIX_WX_LIBS)-$(LIBVERSION).a \
@@ -79,7 +120,7 @@
  		-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\
-@@ -67,29 +67,29 @@
+@@ -127,37 +125,37 @@
  
  
  WXSYSLIB_WITH_GL= $(WXPATH)/$(PREFIX_WX_LIBS)-$(LIBVERSION).a \
@@ -92,22 +133,32 @@
  	$(LIBS3D)\
 -       /usr/X11R6/lib/libXinerama.a \
 -        /usr/X11R6/lib/libXxf86vm.a \
-+        ${X11BASE}/lib/libXinerama.a \
++	${X11BASE}/lib/libXinerama.a \
 +        ${X11BASE}/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)
++	-L${LOCALBASE}/lib $(PYLIBS)
  else
- #or use "standard command" for wxWidgets
+ 
+ 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`
 +WXSYSLIB_WITH_GL= `${WX_CONFIG} --libs std,gl`
  endif
  
+ endif
+ 
  
  # attention à l'ordre des libairies
 -LIBS = -L/usr/local/lib -L/usr/X11R6/lib\
diff --git a/cad/kicad/files/patch-makefile.gtk b/cad/kicad/files/patch-makefile.gtk
deleted file mode 100644
index 4f20fe2db624..000000000000
--- a/cad/kicad/files/patch-makefile.gtk
+++ /dev/null
@@ -1,24 +0,0 @@
---- makefile.gtk.orig	Wed Jun 28 23:32:09 2006
-+++ makefile.gtk	Wed Jun 28 23:35:44 2006
-@@ -1,15 +1,15 @@
- KICAD_SUBDIRS =  common 3d-viewer eeschema eeschema/plugins pcbnew cvpcb kicad gerbview
- KICAD_SUBDIRS_BIN =  eeschema eeschema/plugins pcbnew cvpcb kicad gerbview
- # How to invoke make:
--MAKE = make -k -f makefile.gtk
--MAKE_INSTALL = make -f makefile.gtk install
--MAKE_CLEAN = make -f makefile.gtk clean
-+MAKE_FLAGS = -k -f
-+MAKEFILE = makefile.gtk
-+INSTALL_TARGET = install
- 
- all:
--	@for d in $(KICAD_SUBDIRS); do (cd $$d && $(MAKE)); done
-+	@for d in $(KICAD_SUBDIRS); do (cd $$d && $(MAKE) $(MAKE_FLAGS) $(MAKEFILE)); done
- 
- install:
--	@for d in $(KICAD_SUBDIRS_BIN); do (cd $$d && $(MAKE_INSTALL)); done
-+	@for d in $(KICAD_SUBDIRS_BIN); do (cd $$d && $(MAKE) $(MAKE_FLAGS) $(MAKEFILE) $(INSTALL_TARGET)); done
- 	
- clean:
--	@for d in $(KICAD_SUBDIRS); do (cd $$d && $(MAKE_CLEAN)); done
-+	@for d in $(KICAD_SUBDIRS); do (cd $$d && $(MAKE) $(MAKE_FLAGS) $(MAKEFILE) clean); done
diff --git a/cad/kicad/files/patch-pcbnew_makefile.include b/cad/kicad/files/patch-pcbnew_makefile.include
new file mode 100644
index 000000000000..69b12eb75c10
--- /dev/null
+++ b/cad/kicad/files/patch-pcbnew_makefile.include
@@ -0,0 +1,9 @@
+--- 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${X11BASE}/include
+ 
+ #COMMON = pcbnew.h struct.h class_pad.h class_module.h class_text_mod.h \
+ #		class_edge_mod.h class_equipot.h
diff --git a/cad/kicad/pkg-plist b/cad/kicad/pkg-plist
index c545b8325fc2..735f81ec1983 100644
--- a/cad/kicad/pkg-plist
+++ b/cad/kicad/pkg-plist
@@ -30,25 +30,18 @@
 %%INSTDIR%%/demos/electric/electric.cache.lib
 %%INSTDIR%%/demos/electric/electric.pro
 %%INSTDIR%%/demos/electric/electric.sch
-%%INSTDIR%%/demos/interf_u/interf_u-Component.pho
-%%INSTDIR%%/demos/interf_u/interf_u-Copper.pho
 %%INSTDIR%%/demos/interf_u/interf_u.brd
 %%INSTDIR%%/demos/interf_u/interf_u.cache.lib
 %%INSTDIR%%/demos/interf_u/interf_u.cmp
-%%INSTDIR%%/demos/interf_u/interf_u.drl
-%%INSTDIR%%/demos/interf_u/interf_u.drl.rpt
 %%INSTDIR%%/demos/interf_u/interf_u.net
 %%INSTDIR%%/demos/interf_u/interf_u.pro
 %%INSTDIR%%/demos/interf_u/interf_u.sch
 %%INSTDIR%%/demos/microwave/microwave.brd
 %%INSTDIR%%/demos/microwave/microwave.pro
 %%INSTDIR%%/demos/microwave/shape1.txt
-%%INSTDIR%%/demos/pic_programmer/pic_programmer.bak
 %%INSTDIR%%/demos/pic_programmer/pic_programmer.brd
-%%INSTDIR%%/demos/pic_programmer/pic_programmer.cache.bck
 %%INSTDIR%%/demos/pic_programmer/pic_programmer.cache.lib
 %%INSTDIR%%/demos/pic_programmer/pic_programmer.cmp
-%%INSTDIR%%/demos/pic_programmer/pic_programmer.lst
 %%INSTDIR%%/demos/pic_programmer/pic_programmer.net
 %%INSTDIR%%/demos/pic_programmer/pic_programmer.pro
 %%INSTDIR%%/demos/pic_programmer/pic_programmer.sch
@@ -82,7 +75,6 @@
 %%INSTDIR%%/demos/video/video.cmp
 %%INSTDIR%%/demos/video/video.net
 %%INSTDIR%%/demos/video/video.pro
-%%INSTDIR%%/demos/video/video.ps
 %%INSTDIR%%/demos/video/video.sch
 %%INSTDIR%%/doc_conv_orcad_to_kicad.txt
 %%INSTDIR%%/doc_conv_orcad_to_kicad_spanish.txt
@@ -584,6 +576,8 @@
 %%INSTDIR%%/help/ru/kicad/kicad_html_m7fc53a80.png
 %%INSTDIR%%/help/ru/pcbnew/doc_pcbnew.zip
 %%INSTDIR%%/help/ru/pcbnew/pcbnew_ru.html
+%%INSTDIR%%/internat/cs/kicad.mo
+%%INSTDIR%%/internat/cs/kicad.po
 %%INSTDIR%%/internat/de/kicad.mo
 %%INSTDIR%%/internat/de/kicad.po
 %%INSTDIR%%/internat/es/kicad.mo
@@ -600,8 +594,11 @@
 %%INSTDIR%%/internat/pl/kicad.po
 %%INSTDIR%%/internat/pt/kicad.mo
 %%INSTDIR%%/internat/pt/kicad.po
+%%INSTDIR%%/internat/ru/kicad.mo
+%%INSTDIR%%/internat/ru/kicad.po
 %%INSTDIR%%/internat/sl/kicad.mo
 %%INSTDIR%%/internat/sl/kicad.po
+%%INSTDIR%%/kicad_icon.png
 %%INSTDIR%%/library/74xx.dcm
 %%INSTDIR%%/library/74xx.lib
 %%INSTDIR%%/library/adc-dac.dcm
@@ -1217,6 +1214,7 @@
 %%INSTDIR%%/tutorial/Kicad_Tutorial_ru.odt
 %%INSTDIR%%/tutorial/Tutorial_Kicad_FR.odt
 %%INSTDIR%%/version.txt
+share/applications/kicad.desktop
 @dirrm %%INSTDIR%%/tutorial
 @dirrm %%INSTDIR%%/template
 @dirrm %%INSTDIR%%/modules/packages3d/valves
@@ -1277,6 +1275,7 @@
 %%PORTDOCS%%@dirrm %%INSTDIR%%/library/doc
 @dirrm %%INSTDIR%%/library
 @dirrm %%INSTDIR%%/internat/sl
+@dirrm %%INSTDIR%%/internat/ru
 @dirrm %%INSTDIR%%/internat/pt
 @dirrm %%INSTDIR%%/internat/pl
 @dirrm %%INSTDIR%%/internat/ko
@@ -1285,6 +1284,7 @@
 @dirrm %%INSTDIR%%/internat/fr
 @dirrm %%INSTDIR%%/internat/es
 @dirrm %%INSTDIR%%/internat/de
+@dirrm %%INSTDIR%%/internat/cs
 @dirrm %%INSTDIR%%/internat
 @dirrm %%INSTDIR%%/help/ru/pcbnew
 @dirrm %%INSTDIR%%/help/ru/kicad