Upgrade to 20080825.

1 files changed, 36 insertions, 41 deletions

diff --git a/cad/kicad-devel/Makefile b/cad/kicad-devel/Makefile
index 848e2e3a2b0e..ecdc06a75d4d 100644
--- a/cad/kicad-devel/Makefile
+++ b/cad/kicad-devel/Makefile
@@ -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}