Update to r20170224025915

svn path=/head/; revision=434716

cad/kicad-devel/Makefile

@@ -3,7 +3,6 @@
 
 PORTNAME=	kicad
 DISTVERSION=	r${GIT_SRC_DATE}
-PORTREVISION=	2
 #PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	LOCAL/mr
@@ -29,7 +28,6 @@ CXXFLAGS+=	-msse
 USE_GL=		glew glu gl
 USE_WX=		3.0
 WX_COMPS=	wx
-WX_UNICODE=	yes
 USE_GNOME=	atk cairo	# Required by libwx_gtk2_aui-2.8.so
 
 BROKEN_aarch64=		Fails to compile: use of undeclared identifier builtin_ia32_emms
@@ -51,6 +49,7 @@ CMAKE_ARGS=	-DLOCALBASE="${LOCALBASE}" \
 		-DKICAD_BUILD_VERSION=${DISTVERSION} \
 		-DCMAKE_INCLUDE_PATH="${LOCALBASE}/include" \
 		-DwxWidgets_CONFIG_EXECUTABLE="${WX_CONFIG}" \
+		-DwxWidgets_USE_DEBUG=ON \
 		-DKICAD_SKIP_BOOST=YES
 
 .if exists(${LOCALBASE}/bin/konqueror)
@@ -59,21 +58,9 @@ RUN_DEPENDS+=	konqueror:x11/kde4-baseapps
 RUN_DEPENDS+=	xpdf:graphics/xpdf
 .endif
 
-.if defined(BOOTSTRAP)
-BOOST_RELEASE=	1.54.0
-BOOST_VERS=	${BOOST_RELEASE:S|.|_|g}
-
-GIT_SRC_HASH=`cd ${WRKDIR}/kicad; git log -n 1 --pretty=format:"%H"`
-GIT_SRC_DATE=`cd "${WRKDIR}/kicad"; git log -n 1 --date=iso-local -n 1 --pretty=format:"%cd" | \
-	cut -c '1-19' | sed -e 's,-,,g' -e 's,:,,g' -e 's, ,,g'`
-
-.else
 .include "Makefile.git_rev"
-.endif
 
 showversions:
-	@${ECHO} "BOOST_RELEASE: ${BOOST_RELEASE}"
-	@${ECHO} "BOOST_VERS: ${BOOST_VERS}"
 	@${ECHO} "GIT_SRC_HASH: ${GIT_SRC_HASH}"
 	@${ECHO} "GIT_SRC_DATE: ${GIT_SRC_DATE}"
 	@${ECHO} "DISTDIR: ${DISTDIR}"
@@ -81,49 +68,14 @@ showversions:
 	@${ECHO} "DISTNAME: ${DISTNAME}"
 	@${ECHO} "DISTVERSION: ${DISTVERSION}"
 
-.if defined(BOOTSTRAP)
-
 # Updating to new rev:
-# make do-fetch BOOTSTRAP=YES && make do-revisions BOOTSTRAP=YES && make do-distfile BOOTSTRAP=YES
+# sh files/newVersion.sh
 # make makesum && make clean
-# make && make makeplist && make generate-plist && make check-plist
+# make install #breaks probably due to plist differences
+# make makeplist > pkg-plist #One has to edit/review the generated plist
+# make generate-plist && make check-plist
 # < Check PLIST_FILE_LIST below >
 
-FETCH_DEPENDS+=	svn:devel/subversion
-BUILD_DEPENDS+=	git:devel/git
-FETCH_DEPENDS+=	git:devel/git
-
-do-distfile:
-	@if [ \! -d "${WRKDIR}/kicad-r${GIT_SRC_DATE}" ]; then \
-	  cd ${WRKDIR}; \
-	  mkdir "${WRKDIR}/kicad-r${GIT_SRC_DATE}"; \
-	  cd kicad; \
-	  find . -type d -name .git -prune -o -print | cpio -pdamuv "../kicad-r${GIT_SRC_DATE}"; \
-	fi;
-	@cd ${WRKDIR}; \
-	  tar xvf master.zip; \
-	  tar cvfy ${DISTDIR}/${DIST_SUBDIR}/kicad-r${GIT_SRC_DATE}.tar.bz2 \
-	    kicad-r${GIT_SRC_DATE} kicad-library-master
-
-do-revisions:
-	echo "BOOST_RELEASE=  ${BOOST_RELEASE}" > ${MASTERDIR}/Makefile.git_rev
-	echo "BOOST_VERS=  ${BOOST_VERS}"   >> ${MASTERDIR}/Makefile.git_rev
-	echo "GIT_SRC_HASH=  ${GIT_SRC_HASH}"   >> ${MASTERDIR}/Makefile.git_rev
-	echo "GIT_SRC_DATE=  ${GIT_SRC_DATE}"   >> ${MASTERDIR}/Makefile.git_rev
-
-do-fetch:
-	${MKDIR} ${WRKDIR}
-	@${ECHO} ${WRKSRC}
-	@if [ \! -d "${WRKDIR}/kicad" ]; then \
-	  cd ${WRKDIR}; \
-	  echo git clone https://git.launchpad.net/kicad; \
-	fi;
-	@if [ \! -f "${WRKDIR}/master.zip" ]; then \
-	  ${FETCH_CMD} --no-verify-peer -o ${WRKDIR}/master.zip https://github.com/KiCad/kicad-library/archive/master.zip; \
-	fi;
-
-.endif
-
 tmp:
 	echo "${DATADIR} ${DATADIR:H}"
 

cad/kicad-devel/Makefile.git_rev

@@ -1,4 +1,2 @@
-BOOST_RELEASE=  1.54.0
-BOOST_VERS=  1_54_0
-GIT_SRC_HASH=  7ad2f37391e3e0debb7b96cd7164961d118f44c1
-GIT_SRC_DATE=  20160910202359
+GIT_SRC_HASH=  d3cb23b7d70251cd101b825548435ea98ec6a2a6
+GIT_SRC_DATE=  20170224025915

cad/kicad-devel/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1473692391
-SHA256 (kicad/kicad-r20160910202359.tar.bz2) = d0a7bb35b02ba73a5459a91ab92f277f1385c8eea2fb64680c9e4c620c4607ed
-SIZE (kicad/kicad-r20160910202359.tar.bz2) = 81263306
+TIMESTAMP = 1487932571
+SHA256 (kicad/kicad-r20170224025915.tar.bz2) = 430b0b12221eadf20d834a7dc3f743d4ae40cb7a4e2113b7f1228662d26bc3e6
+SIZE (kicad/kicad-r20170224025915.tar.bz2) = 216265495

cad/kicad-devel/files/newVersion.sh

@@ -0,0 +1,39 @@
+#!/bin/sh
+
+#GIT_SRC_HASH=`cd kicad-repo; git log -n 1 --pretty=format:"%H"`
+#GIT_SRC_DATE=`cd kicad-repo; git log -n 1 --date=iso-local -n 1 --pretty=format:"%cd" | \
+#        cut -c '1-19' | sed -e 's,-,,g' -e 's,:,,g' -e 's, ,,g'`
+
+CURDIR=`pwd`
+WRKDIR=`pwd`/work
+mkdir -p "${WRKDIR}"
+
+if [ \! -f "${WRKDIR}/master.zip" ]; then \
+  fetch --no-verify-peer -o ${WRKDIR}/master.zip https://github.com/KiCad/kicad-library/archive/master.zip
+else
+  echo "master.zip already exists";
+fi
+
+if [ \! -d "${CURDIR}/kicad-repo" ]; then
+ git clone https://git.launchpad.net/kicad "${CURDIR}/kicad-repo";
+else
+  cd "${CURDIR}/kicad-repo"
+  git pull https://git.launchpad.net/kicad;
+fi
+
+cd "${CURDIR}/kicad-repo"
+GIT_SRC_HASH=`git log -n 1 --pretty=format:"%H"`;
+GIT_SRC_DATE=`git log -n 1 --date=iso-local -n 1 --pretty=format:"%cd" | \
+    cut -c '1-19' | sed -e 's,-,,g' -e 's,:,,g' -e 's, ,,g'`
+
+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-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 "${WRKDIR}"
+tar xvf master.zip;
+tar cvfy /usr/ports/distfiles/kicad/kicad-r${GIT_SRC_DATE}.tar.bz2 \
+  kicad-r${GIT_SRC_DATE} kicad-library-master