Index: head/cad/linuxcnc-devel/Makefile =================================================================== --- head/cad/linuxcnc-devel/Makefile (revision 475232) +++ head/cad/linuxcnc-devel/Makefile (revision 475233) @@ -1,69 +1,66 @@ # Created by: Edward Tomasz Napierala # $FreeBSD$ PORTNAME= linuxcnc PORTVERSION= 20170708 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= cad PKGNAMESUFFIX= -devel MAINTAINER= trasz@FreeBSD.org COMMENT= Open Source CNC machine controller LICENSE= GPLv2 -BROKEN= wrong DEPENDS -DEPRECATED= Broken for more than 5 months -EXPIRATION_DATE= 2018-08-20 - LIB_DEPENDS= libBLT25.so:x11-toolkits/blt \ ${PY_BOOST} \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libmodbus.so:comms/libmodbus \ libncurses.so:devel/ncurses \ libXaw.so:x11-toolkits/libXaw \ libtclx8.4.so:lang/tclX RUN_DEPENDS= bash:shells/bash \ bwidget>=1.4:x11-toolkits/bwidget \ ${PYTHON_SITELIBDIR}/gtk-2.0/vtemodule.so:x11-toolkits/py-vte \ ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gdkgl/__init__.py:x11-toolkits/py-gtkglext \ - ${LOCALBASE}/lib/Img/libtkimg1.4.6.so:graphics/libimg + ${LOCALBASE}/lib/Img/libtkimg1.4.7.so:graphics/libimg BUILD_DEPENDS= ${RUN_DEPENDS} -# Workaround for a clang crash on 12-CURRENT. -BUILD_DEPENDS+= clang38:lang/clang38 -CC= clang38 -CXX= clang++38 +## Workaround for a clang crash on 12-CURRENT. +#BUILD_DEPENDS+= clang38:lang/clang38 +#CC= clang38 +#CXX= clang++38 NO_PACKAGE= Licensing conflict between LinuxCNC (GPL2) and readline (GPL3) WRKSRC_SUBDIR= src PATCH_WRKSRC= ${WRKDIR}/linuxcnc-${GH_TAGNAME} ALL_TARGET= default GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-realtime=uspace --enable-non-distributable=yes \ CFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" \ CXXFLAGS="-I${LOCALBASE}/include" CXX="${CXX}" CC="${CC}" \ - --with-locale-dir="${PREFIX}/share/locale" --with-python=${PYTHON_CMD} + --with-locale-dir="${PREFIX}/share/locale" --with-python=${PYTHON_CMD} \ + --with-boost-python=boost_python27 MAKE_ENV= BUILD_VERBOSE=1 USES= autoreconf gettext gmake ncurses pkgconfig python:2.7 readline shebangfix tk USE_GL= gl glu USE_GNOME= cairo gdkpixbuf2 libgnomeprintui pygtksourceview USE_XORG= ice sm x11 xext xft xinerama xmu xrender xscrnsaver xt USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= LinuxCNC GH_TAGNAME= 5b7929df50e0574cb1105143fffe525916d8a4c2 post-patch: ${FIND} ${PATCH_WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -i '' \ -e 's|#!.*/bin/bash|#!${LOCALBASE}/bin/bash|' \ -e 's|#!.*/usr/bin/tclsh|#!${LOCALBASE}/bin/tclsh8.6|' \ -e 's|#!.*/usr/bin/wish|#!${LOCALBASE}/bin/wish8.6|' \ - -e 's|#!.*/usr/bin/env python|#!/usr/bin/env python2|' \ - -e 's|#!.*/usr/bin/python|#!/usr/bin/env python2|' \ + -e 's|#!.*/usr/bin/env python|#!/usr/bin/env python2.7|' \ + -e 's|#!.*/usr/bin/python|#!/usr/bin/env python2.7|' \ -e 's|lib/tcltk|lib/tcllib|' .include Index: head/cad/linuxcnc-devel/files/patch-src_Makefile =================================================================== --- head/cad/linuxcnc-devel/files/patch-src_Makefile (revision 475232) +++ head/cad/linuxcnc-devel/files/patch-src_Makefile (revision 475233) @@ -1,151 +1,160 @@ ---- src/Makefile.orig 2017-07-08 02:09:02.000000000 +0100 -+++ src/Makefile 2017-07-06 12:52:07.633525000 +0100 +--- src/Makefile.orig 2017-07-08 22:25:35.000000000 +0100 ++++ src/Makefile 2018-07-23 15:16:25.939787000 +0100 @@ -183,7 +183,7 @@ $(shell $(VECHO) 1>&2 Done reading dependencies) endif # Each directory in $(INCLUDES) is passed as a -I directory when compiling. -INCLUDE := $(patsubst %,-I%, $(INCLUDES)) -I$(RTDIR)/include +INCLUDE := $(patsubst %,-I%, $(INCLUDES)) -I$(RTDIR)/include -I/usr/local/include INCLUDE += -I$(INCLUDEPY) # Compilation options. Perhaps some of these should come from Makefile.inc? (CXXFLAGS now does) @@ -193,10 +193,12 @@ DEBUG := $(DEBUG) -g -Wall CFLAGS := $(INCLUDE) $(OPT) $(DEBUG) $(EXTRA_DEBUG) -DULAPI -std=gnu99 -fgnu89-inline CXXFLAGS := $(INCLUDE) $(CXXFLAGS) $(EXTRA_DEBUG) -DULAPI $(DEBUG) $(OPT) -Woverloaded-virtual +UNAME_S := $(shell uname -s) + ifeq ($(RUN_IN_PLACE),yes) -LDFLAGS := -L$(LIB_DIR) -Wl,-rpath,$(LIB_DIR) +LDFLAGS := -L$(LIB_DIR) -Wl,-rpath,$(LIB_DIR) -L/usr/local/lib -lintl else -LDFLAGS := -Wl,-rpath-link,../lib +LDFLAGS := -Wl,-rpath-link,../lib -L/usr/local/lib -lintl endif # Rules to make .o (object) files -@@ -501,7 +503,7 @@ $(patsubst %,../include/%,$(wildcard *.hh)): ../includ +@@ -499,12 +501,12 @@ $(patsubst %,../include/%,$(wildcard *.h)): ../include + $(patsubst %,../include/%,$(wildcard *.hh)): ../include/%.hh: %.hh + $(Q)-cp $^ $@ - DIR=install -d -m 0755 -o root - FILE=install -m 0644 -o root +-DIR=install -d -m 0755 -o root +-FILE=install -m 0644 -o root -TREE=cp -dR ++DIR=install -d -m 0755 ++FILE=install -m 0644 +TREE=cp -R CONFIGFILE=install -m 0644 - EXE=install -m 0755 -o root - SETUID=install -m 4755 -o root +-EXE=install -m 0755 -o root +-SETUID=install -m 4755 -o root ++EXE=install -m 0755 ++SETUID=install -m 4755 + GLOB=$(wildcard $(1)) + + ifeq ($(RUN_IN_PLACE),yes) @@ -549,7 +551,7 @@ install-dirs: $(DESTDIR)$(sysconfdir)/linuxcnc $(DESTDIR)$(bindir) \ $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)/linuxcnc \ $(DESTDIR)$(docsdir) $(DESTDIR)$(ncfilesdir) \ - $(DESTDIR)/etc/X11/app-defaults $(DESTDIR)$(tcldir)/bin \ + $(DESTDIR)$(prefix)/share/X11/app-defaults $(DESTDIR)$(tcldir)/bin \ $(DESTDIR)$(tcldir)/scripts \ $(DESTDIR)$(mandir)/man1 \ $(DESTDIR)$(mandir)/man3 \ @@ -605,14 +607,13 @@ install-kernel-indep: install-dirs $(EXE) ../scripts/linuxcncmkdesktop $(DESTDIR)$(bindir) $(EXE) ../scripts/update_ini $(DESTDIR)$(bindir) $(FILE) $(filter ../lib/%.a ../lib/%.so.0,$(TARGETS)) $(DESTDIR)$(libdir) - cp --no-dereference $(filter ../lib/%.so, $(TARGETS)) $(DESTDIR)$(libdir) - -ldconfig $(DESTDIR)$(libdir) + cp $(filter ../lib/%.so, $(TARGETS)) $(DESTDIR)$(libdir) $(FILE) $(HEADERS) $(DESTDIR)$(includedir)/linuxcnc/ $(FILE) $(addprefix ../docs/,$(DOCS)) $(DESTDIR)$(docsdir) $(FILE) $(DOCS_HELP) $(DESTDIR)$(docsdir) $(TREE) $(NC_FILES) $(DESTDIR)$(ncfilesdir) $(EXE) ../nc_files/M101 $(DESTDIR)$(ncfilesdir) - $(FILE) ../tcl/TkLinuxCNC $(DESTDIR)/etc/X11/app-defaults + $(FILE) ../tcl/TkLinuxCNC $(DESTDIR)$(prefix)/share/X11/app-defaults $(FILE) Makefile.modinc $(DESTDIR)$(datadir)/linuxcnc $(EXE) $(TCL) $(DESTDIR)$(tcldir) $(FILE) ../tcl/hal.so $(DESTDIR)$(tcldir) @@ -720,6 +721,7 @@ endif # that's what kbuild seems to require EXTRA_CFLAGS := $(filter-out -ffast-math,$(RTFLAGS)) -D__MODULE__ -I$(BASEPWD) -I$(BASEPWD)/libnml/linklist \ + -I/usr/local/include \ -I$(BASEPWD)/libnml/cms -I$(BASEPWD)/libnml/rcs -I$(BASEPWD)/libnml/inifile \ -I$(BASEPWD)/libnml/os_intf -I$(BASEPWD)/libnml/nml -I$(BASEPWD)/libnml/buffer \ -I$(BASEPWD)/libnml/posemath -I$(BASEPWD)/rtapi -I$(BASEPWD)/hal \ @@ -830,11 +832,11 @@ hal_gm-objs := hal/drivers/hal_gm.o $(MATHSTUB) obj-$(CONFIG_HAL_PPMC) += hal_ppmc.o hal_ppmc-objs := hal/drivers/hal_ppmc.o $(MATHSTUB) -obj-$(CONFIG_HOSTMOT2) += hostmot2.o hm2_test.o hm2_pci.o hm2_7i43.o hm2_7i90.o setsserial.o -ifeq ($(BUILD_SYS),uspace) -obj-$(CONFIG_HOSTMOT2) += hm2_eth.o hm2_spi.o hm2_rpspi.o hal_bb_gpio.o -endif -hostmot2-objs := \ +#obj-$(CONFIG_HOSTMOT2) += hostmot2.o hm2_test.o hm2_pci.o hm2_7i43.o hm2_7i90.o setsserial.o +#ifeq ($(BUILD_SYS),uspace) +#obj-$(CONFIG_HOSTMOT2) += hm2_eth.o hm2_spi.o hm2_rpspi.o hal_bb_gpio.o +#endif +#hostmot2-objs := \ hal/drivers/mesa-hostmot2/hostmot2.o \ hal/drivers/mesa-hostmot2/ioport.o \ hal/drivers/mesa-hostmot2/encoder.o \ @@ -855,35 +857,35 @@ hostmot2-objs := \ hal/drivers/mesa-hostmot2/raw.o \ hal/drivers/mesa-hostmot2/bitfile.o \ $(MATHSTUB) -hm2_7i90-objs := \ +#hm2_7i90-objs := \ hal/drivers/mesa-hostmot2/hm2_7i90.o \ hal/drivers/mesa-hostmot2/bitfile.o \ $(MATHSTUB) -hm2_7i43-objs := \ +#hm2_7i43-objs := \ hal/drivers/mesa-hostmot2/hm2_7i43.o \ hal/drivers/mesa-hostmot2/bitfile.o \ $(MATHSTUB) -hm2_pci-objs := \ +#hm2_pci-objs := \ hal/drivers/mesa-hostmot2/hm2_pci.o \ hal/drivers/mesa-hostmot2/bitfile.o \ $(MATHSTUB) -hm2_eth-objs := \ +#hm2_eth-objs := \ hal/drivers/mesa-hostmot2/hm2_eth.o \ $(MATHSTUB) -hm2_spi-objs := \ +#hm2_spi-objs := \ hal/drivers/mesa-hostmot2/hm2_spi.o \ $(MATHSTUB) -hm2_rpspi-objs := \ +#hm2_rpspi-objs := \ hal/drivers/mesa-hostmot2/hm2_rpspi.o \ $(MATHSTUB) -hal_bb_gpio-objs := \ +#hal_bb_gpio-objs := \ hal/drivers/hal_bb_gpio.o \ $(MATHSTUB) -hm2_test-objs := \ +#hm2_test-objs := \ hal/drivers/mesa-hostmot2/hm2_test.o \ hal/drivers/mesa-hostmot2/bitfile.o \ $(MATHSTUB) -setsserial-objs := \ +#setsserial-objs := \ hal/drivers/mesa-hostmot2/setsserial.o \ $(MATHSTUB) @@ -1083,13 +1085,13 @@ endif ../rtlib/rosekins$(MODULE_EXT): $(addprefix objects/rt,$(rosekins-objs)) ../rtlib/scorbot-kins$(MODULE_EXT): $(addprefix objects/rt,$(scorbot-kins-objs)) ../rtlib/hal_gm$(MODULE_EXT): $(addprefix objects/rt,$(hal_gm-objs)) -../rtlib/hostmot2$(MODULE_EXT): $(addprefix objects/rt,$(hostmot2-objs)) -../rtlib/hm2_test$(MODULE_EXT): $(addprefix objects/rt,$(hm2_test-objs)) -../rtlib/hm2_pci$(MODULE_EXT): $(addprefix objects/rt,$(hm2_pci-objs)) -../rtlib/hm2_7i43$(MODULE_EXT): $(addprefix objects/rt,$(hm2_7i43-objs)) -../rtlib/hm2_7i90$(MODULE_EXT): $(addprefix objects/rt,$(hm2_7i90-objs)) +#../rtlib/hostmot2$(MODULE_EXT): $(addprefix objects/rt,$(hostmot2-objs)) +#../rtlib/hm2_test$(MODULE_EXT): $(addprefix objects/rt,$(hm2_test-objs)) +#../rtlib/hm2_pci$(MODULE_EXT): $(addprefix objects/rt,$(hm2_pci-objs)) +#../rtlib/hm2_7i43$(MODULE_EXT): $(addprefix objects/rt,$(hm2_7i43-objs)) +#../rtlib/hm2_7i90$(MODULE_EXT): $(addprefix objects/rt,$(hm2_7i90-objs)) ../rtlib/setsserial$(MODULE_EXT): $(addprefix objects/rt,$(setsserial-objs)) -../rtlib/hal_parport$(MODULE_EXT): $(addprefix objects/rt,$(hal_parport-objs)) +#../rtlib/hal_parport$(MODULE_EXT): $(addprefix objects/rt,$(hal_parport-objs)) ../rtlib/hal_ppmc$(MODULE_EXT): $(addprefix objects/rt,$(hal_ppmc-objs)) ../rtlib/hm2_eth$(MODULE_EXT): $(addprefix objects/rt,$(hm2_eth-objs)) ../rtlib/hm2_spi$(MODULE_EXT): $(addprefix objects/rt,$(hm2_spi-objs)) Index: head/cad/linuxcnc-devel/files/patch-src_libnml_os_intf__sem.c =================================================================== --- head/cad/linuxcnc-devel/files/patch-src_libnml_os_intf__sem.c (nonexistent) +++ head/cad/linuxcnc-devel/files/patch-src_libnml_os_intf__sem.c (revision 475233) @@ -0,0 +1,12 @@ +--- src/libnml/os_intf/_sem.c.orig 2018-07-07 04:16:26.398676000 +0100 ++++ src/libnml/os_intf/_sem.c 2018-07-07 04:16:54.402946000 +0100 +@@ -30,6 +30,9 @@ + on Linux System V semaphores will be used instead. + */ + ++#ifdef __FreeBSD__ ++#define _WANT_SEMUN ++#endif + #include /* struct sembuf */ + #include /* fmod() */ + #include Property changes on: head/cad/linuxcnc-devel/files/patch-src_libnml_os_intf__sem.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property