Split into kicad-devel and kicad-library-devel (follow up commit)

Update to r20180112180600
Use github

cad/kicad-devel/Makefile

@@ -5,7 +5,6 @@ PORTNAME=	kicad
 DISTVERSION=	r${GIT_SRC_DATE}
 PORTREVISION=	1
 CATEGORIES=	cad
-MASTER_SITES=	LOCAL/mr
 PKGNAMESUFFIX=	-devel
 DIST_SUBDIR=		${PORTNAME}
 
@@ -17,19 +16,22 @@ LICENSE=	GPLv3
 BUILD_DEPENDS=	${LOCALBASE}/include/glm/glm.hpp:math/glm \
 		${LOCALBASE}/bin/swig3.0:devel/swig30
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
+		libpng.so:graphics/png \
 		libcurl.so:ftp/curl
 
 CONFLICTS=	kicad-4.*
 
-LIBVERSION=	1.0
+USE_GITHUB=     yes
+GH_ACCOUNT=     KiCad
+GH_PROJECT=     kicad-source-mirror
+GH_TAGNAME=	${GIT_SRC_HASH}
 
-#CXXFLAGS+=	-std=c++11
-CXXFLAGS+=	-msse
-USE_GL=		glew glu gl
+CXXFLAGS+=	--std=c++11 -I${WRKSRC}/include -I${LOCALBASE}/include -msse
+USE_GL=		gl glew glu glut
 USE_WX=		3.0
 WX_COMPS=	wx wx:build wx:run python:build python:run
 USE_GNOME=	atk cairo	# Required by libwx_gtk2_aui-2.8.so
-USE_XORG+=	pixman
+USE_XORG+=	ice pixman x11 xext
 
 BROKEN_aarch64=		Fails to compile: use of undeclared identifier builtin_ia32_emms
 
@@ -52,6 +54,11 @@ CMAKE_ARGS=	-DLOCALBASE="${LOCALBASE}" \
 		-DCMAKE_INCLUDE_PATH="${LOCALBASE}/include" \
 		-DwxWidgets_CONFIG_EXECUTABLE="${WX_CONFIG}" \
 		-DwxWidgets_USE_DEBUG=ON \
+		-DwxWidgets_USE_USE_UNICODE=ON \
+		-DwxWidgets_wxrc_EXECUTABLE=${WXRC_CMD} \
+		-DKICAD_SCRIPTING=ON \
+		-DKICAD_SCRIPTING_MODULES=ON \
+		-DKICAD_SCRIPTING_WXPYTHON=ON \
 		-DKICAD_SKIP_BOOST=YES \
 		-DKICAD_SPICE=OFF \
 		-DKICAD_USE_OCE=OFF
@@ -97,10 +104,10 @@ post-configure:
 pre-install:
 	@echo "${DATADIR}, ${DOCSDIR}"
 
-post-install:
-.for subdir in library modules template
-	${CP} -Rp ${WRKDIR}/kicad-library-master/${subdir} ${STAGEDIR}${DATADIR}
-.endfor
+#post-install:
+#.for subdir in library modules template
+#	${CP} -Rp ${WRKDIR}/kicad-library-master/${subdir} ${STAGEDIR}${DATADIR}
+#.endfor
 #.for subdir in internat
 #	${CP} -Rp ${WRKDIR}/kicad-doc/${subdir} ${STAGEDIR}${DOCSDIR}
 #.endfor

cad/kicad-devel/Makefile.git_rev

@@ -1,2 +1,2 @@
-GIT_SRC_HASH=  93683d0021c4f592f929e9785abeda9d169ba03b
-GIT_SRC_DATE=  20171229233842
+GIT_SRC_HASH=  786312b1034c68855b7dc62d5de1525fbb14a20d
+GIT_SRC_DATE=  20180112180600

cad/kicad-devel/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1514632387
-SHA256 (kicad/kicad-r20171229233842.tar.bz2) = a095b4cb28b64242ce8551a5e668bc5c590a50cf78f8896d9edcf8125fb13dc7
-SIZE (kicad/kicad-r20171229233842.tar.bz2) = 441376282
+TIMESTAMP = 1515783402
+SHA256 (kicad/KiCad-kicad-source-mirror-r20180112180600-786312b1034c68855b7dc62d5de1525fbb14a20d_GH0.tar.gz) = b662d9a6ec974708d988779975ee771a1f13ebc2e8f7ba21723445aca3c1d6dd
+SIZE (kicad/KiCad-kicad-source-mirror-r20180112180600-786312b1034c68855b7dc62d5de1525fbb14a20d_GH0.tar.gz) = 18597713

cad/kicad-devel/files/newVersion.sh

@@ -6,14 +6,14 @@
 
 CURDIR=`pwd`
 WRKDIR=`pwd`/work
-mkdir -p "${WRKDIR}"
+#mkdir -p "${WRKDIR}"
 
-if [ \! -d "${CURDIR}/kicad-library" ]; then
- git clone https://github.com/KiCad/kicad-library.git -b master "${CURDIR}/kicad-library";
-else
-  cd "${CURDIR}/kicad-library"
-  git pull;
-fi
+#if [ \! -d "${CURDIR}/kicad-library" ]; then
+# git clone https://github.com/KiCad/kicad-library.git -b master "${CURDIR}/kicad-library";
+#else
+#  cd "${CURDIR}/kicad-library"
+#  git pull;
+#fi
 
 if [ \! -d "${CURDIR}/kicad-repo" ]; then
  git clone https://git.launchpad.net/kicad -b master "${CURDIR}/kicad-repo";
@@ -31,12 +31,12 @@ echo "$GIT_SRC_HASH, $GIT_SRC_DATE"
 echo "GIT_SRC_HASH=  ${GIT_SRC_HASH}"    > ${CURDIR}/Makefile.git_rev
 echo "GIT_SRC_DATE=  ${GIT_SRC_DATE}"   >> ${CURDIR}/Makefile.git_rev
 
-mkdir -p "${WRKDIR}/kicad-library-master"
-mkdir -p "${WRKDIR}/kicad-r${GIT_SRC_DATE}"
-cd "${CURDIR}/kicad-repo"
-find . -type d -name .git -prune -o -print | cpio -pdamuv "${WRKDIR}/kicad-r${GIT_SRC_DATE}";
-cd "${CURDIR}/kicad-library"
-find . -type d -name .git -prune -o -print | cpio -pdamuv "${WRKDIR}/kicad-library-master"
-cd "${WRKDIR}"
-tar cvfy /usr/ports/distfiles/kicad/kicad-r${GIT_SRC_DATE}.tar.bz2 \
-  kicad-r${GIT_SRC_DATE} kicad-library-master
+#mkdir -p "${WRKDIR}/kicad-library-master"
+#mkdir -p "${WRKDIR}/kicad-r${GIT_SRC_DATE}"
+#cd "${CURDIR}/kicad-repo"
+#find . -type d -name .git -prune -o -print | cpio -pdamuv "${WRKDIR}/kicad-r${GIT_SRC_DATE}";
+#cd "${CURDIR}/kicad-library"
+#find . -type d -name .git -prune -o -print | cpio -pdamuv "${WRKDIR}/kicad-library-master"
+#cd "${WRKDIR}"
+#tar cvfy /usr/ports/distfiles/kicad/kicad-r${GIT_SRC_DATE}.tar.bz2 \
+#  kicad-r${GIT_SRC_DATE} kicad-library-master