diff --git a/.portsignore b/.portsignore index ef95dfe8580f..70cf32226416 100644 --- a/.portsignore +++ b/.portsignore @@ -2081,6 +2081,7 @@ science/bout++-merging-filaments science/chrono science/code_saturne science/dakota +science/drawxtl science/dynare science/frontistr science/fvcom diff --git a/science/Makefile b/science/Makefile index 1a386af1cf01..b8d41de5c1a3 100644 --- a/science/Makefile +++ b/science/Makefile @@ -72,7 +72,6 @@ SUBDIR += dirac SUBDIR += dkh SUBDIR += dlib-cpp - SUBDIR += drawxtl SUBDIR += dssp SUBDIR += dvc SUBDIR += dwave-preprocessing diff --git a/science/drawxtl/Makefile b/science/drawxtl/Makefile deleted file mode 100644 index 1b66c6bca559..000000000000 --- a/science/drawxtl/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -PORTNAME= DRAWxtl -DISTVERSION= 5.5 -PORTREVISION= 1 -CATEGORIES= science -MASTER_SITES= https://www.lwfinger.com/drawxtl/ -DISTNAME= ${PORTNAME}${DISTVERSION:S/.//} - -MAINTAINER= yuri@FreeBSD.org -COMMENT= Crystal structure visualization tool -WWW= http://www.lwfinger.net/drawxtl/ - -LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING - -LIB_DEPENDS= libfltk.so:x11-toolkits/fltk - -USES= desktop-file-utils gl gmake localbase xorg -USE_GL= gl glu -USE_XORG= xinerama xft xext x11 xpm - -BINARY_ALIAS= gcc=${CC} g++=${CXX} - -WRKSRC= ${WRKDIR}/${PORTNAME}/source/${DISTNAME} - -PLIST_FILES= bin/${PORTNAME} share/pixmaps/${PORTNAME}.xpm - -DESKTOP_ENTRIES="${PORTNAME}" \ - "${COMMENT}" \ - "${PREFIX}/share/pixmaps/${PORTNAME}.xpm" \ - "${PORTNAME}" \ - "Chemistry;Physics;Science;Education;Viewer;" \ - "" -POST_PLIST= complete-desktop-entries - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/../../exe/${DISTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.xpm ${STAGEDIR}${PREFIX}/share/pixmaps - -complete-desktop-entries: - @${ECHO} "MimeType=chemical/x-cif;chemical/x-shelx;" >> ${STAGEDIR}${DESKTOPDIR}/${PORTNAME}.desktop - -.include diff --git a/science/drawxtl/distinfo b/science/drawxtl/distinfo deleted file mode 100644 index e45cb969e52e..000000000000 --- a/science/drawxtl/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1545010903 -SHA256 (DRAWxtl55.tar.gz) = e33bddb99f349d02f2c889ab04116285daf2ee026c2a33e8129866ffc6eb5da4 -SIZE (DRAWxtl55.tar.gz) = 4014223 diff --git a/science/drawxtl/files/patch-Makefile b/science/drawxtl/files/patch-Makefile deleted file mode 100644 index 7f5c93af116f..000000000000 --- a/science/drawxtl/files/patch-Makefile +++ /dev/null @@ -1,118 +0,0 @@ ---- Makefile.orig 2011-03-08 18:55:26 UTC -+++ Makefile -@@ -6,7 +6,7 @@ - - OPTIM = error - TARGET = ../../exe/DRAWxtl55 --PREINC = -+PREINC = - RESFILE = - - # post processing command - overwritten for Mac -@@ -34,29 +34,29 @@ ifeq ($(OS),Linux) - - prefix = /usr/local - includedir = ${prefix}/include -- libdir = /usr/lib/ -+ libdir = ${prefix}/lib/ - - BUILD_CPU=$(shell uname -m) - ifneq (,$(findstring 64,$(BUILD_CPU))) -- libdir = /usr/lib64/ -+ libdir = ${prefix}/lib/ - endif - - # compiler name: - CXX = g++ - - # flags for C++ compiler: -- OPTIM = -g -Wall -Wunused -fno-exceptions --# work around a bug in freeglut 2.4 - only enable this if you have to use a version -+ OPTIM = -g -Wall -Wunused -fno-exceptions --std=c++14 -+# work around a bug in freeglut 2.4 - only enable this if you have to use a version - # of fltk before 1.1.8 AND exactly version 2.4 of freeglut - # GLUT = -DFREEGLUT24 - CXXFLAGS = $(OPTIM) -I/usr/X11R6/include $(GLUT) - - # libraries to link with: -- GLDLIBS = -L/usr/X11R6/lib -lGLU -lGL -lXinerama -lXft -lpthread -lm -lXext -lX11 -lXpm \ -+ GLDLIBS = -L$(prefix)/lib -lGLU -lGL -lXinerama -lXft -lpthread -lm -lXext -lX11 -lXpm \ - -lfltk \ - # -lglut # only needed with old versions of fltk before 1.1.8 - # -lXi -lgdkglext-x11-1.0a # Fedora Core 2 needs these libraries -- LINKFLTKGL = $(libdir)libfltk.a $(libdir)libfltk_gl.a -+ LINKFLTKGL = $(libdir)libfltk.so $(libdir)libfltk_gl.so - - # The extension to use for executables... - EXEEXT = -@@ -68,7 +68,7 @@ ifeq ($(OS),CYGWIN) - # section to define the various symbols needed to build DRAWxtl for cygwin running on Windows - - prefix = /usr/ -- includedir = -+ includedir = - libdir = /fltk/lib - - # compiler name: -@@ -108,10 +108,10 @@ ifeq ($(OS),IRIX64) # use GNU g++ compil - - # flags for C++ compiler: - OPTIM = -g -O2 -Wall -Wunused -fno-exceptions -- CXXFLAGS = $(OPTIM) -+ CXXFLAGS = $(OPTIM) - - # libraries to link with: -- GLDLIBS = -L/usr/freeware/lib32 -lglut -L/usr/lib32/ -lGL -lGLU -lm -lXpm -lX11 -+ GLDLIBS = -L/usr/freeware/lib32 -lglut -L/usr/lib32/ -lGL -lGLU -lm -lXpm -lX11 - LINKFLTKGL = -L$(libdir) -lfltk_gl -lfltk - - # The extension to use for executables... -@@ -131,8 +131,8 @@ ifeq ($(OS),Darwin) - - # flags for C++ compiler: - OPTIM = -g -O2 -Wall -Wunused -fno-exceptions -- CXXFLAGS = $(OPTIM) --# in 10.2 I think I needed to add this to the above: -+ CXXFLAGS = $(OPTIM) -+# in 10.2 I think I needed to add this to the above: - # -framework AGL -framework GLUT -framework OpenGL -framework Carbon -framework ApplicationServices - - # libraries to link with: -@@ -205,7 +205,7 @@ CPPFILES =\ - - OBJFILES = $(CPPFILES:.cxx=.o) $(RESFILE:.rc=.o) - --all: $(TARGET) -+all: $(TARGET) - - clean: - -@ rm -f $(TARGET) *.o core *~ .deps ../../examples/*.{out,cns,pov,wrl,tmp,tga,lst,fl,bmp} \ -@@ -216,23 +216,22 @@ clean: - .deps: $(CPPFILES) - echo "Building dependencies..." - echo >.deps -- for i in $(CPPFILES); do gcc -MM $(PREINC) $$i >>.deps; done -+ for i in $(CPPFILES); do gcc $(CFLAGS) -MM $(PREINC) $$i >>.deps; done - - -include .deps - --# DRAWxtl -+# DRAWxtl - --$(TARGET) : .deps $(OBJFILES) -+$(TARGET) : .deps $(OBJFILES) - echo Linking $@... - mkdir -p ../../exe - $(CXX) $(CXXFLAGS) -o $@ $(OBJFILES) \ -- $(LINKFLTKGL) $(GLDLIBS) -+ $(LINKFLTKGL) $(GLDLIBS) - $(POSTLINK) $@ - --static: .deps $(OBJFILES) -+static: .deps $(OBJFILES) - echo Linking $@... - mkdir -p ../../exe - $(CXX) $(CXXFLAGS) -static -o DRAWxtl.$@ $(OBJFILES) \ - $(LINKFLTKGL) $(GLDLIBS) -lXxf86vm -ldl - strip $@ -- diff --git a/science/drawxtl/pkg-descr b/science/drawxtl/pkg-descr deleted file mode 100644 index 01dcfae6202c..000000000000 --- a/science/drawxtl/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -DRAWxtl is a program to display crystal structures on ordinary computer hardware -and operating systems. Four forms of graphics are produced: -(1) an openGL window for immediate viewing, -(2) the Persistence of Vision Ray Tracer (POV-RAY) scene language for - publication-quality drawings, (3) the Virtual Reality Modeling Language - (VRML) for dissemination across the Internet, and -(4) a Postscript rendering of the OpenGL window for those that want high-quality - output but do not have POV-RAY installed.