diff --git a/science/voro++/Makefile b/science/voro++/Makefile index 28a07062895e..5289bef5fb7a 100644 --- a/science/voro++/Makefile +++ b/science/voro++/Makefile @@ -1,6 +1,6 @@ PORTNAME= voro++ DISTVERSION= 0.4.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= science MASTER_SITES= http://math.lbl.gov/voro++/download/dir/ diff --git a/science/voro++/files/patch-Makefile b/science/voro++/files/patch-Makefile index 0a2ea370d078..39fe7a3d47f2 100644 --- a/science/voro++/files/patch-Makefile +++ b/science/voro++/files/patch-Makefile @@ -1,6 +1,6 @@ --- Makefile.orig 2013-10-17 17:54:13 UTC +++ Makefile -@@ -12,7 +12,7 @@ include config.mk +@@ -12,7 +12,7 @@ all: # Build all of the executable files all: $(MAKE) -C src @@ -9,7 +9,7 @@ # Build the help files (with Doxygen) help: -@@ -26,47 +26,48 @@ clean: +@@ -26,47 +26,47 @@ install: # Install the executable, man page, and shared library install: $(MAKE) -C src @@ -38,12 +38,11 @@ - $(INSTALL) $(IFLAGS) src/worklist.hh $(PREFIX)/include/voro++ + $(INSTALL) -d $(IFLAGS_EXEC) $(DESTDIR)$(PREFIX)/bin + $(INSTALL) -d $(IFLAGS_EXEC) $(DESTDIR)$(PREFIX)/lib -+ $(INSTALL) -d $(IFLAGS_EXEC) $(DESTDIR)$(PREFIX)/man -+ $(INSTALL) -d $(IFLAGS_EXEC) $(DESTDIR)$(PREFIX)/man/man1 ++ $(INSTALL) -d $(IFLAGS_EXEC) $(DESTDIR)$(PREFIX)/share/man/man1 + $(INSTALL) -d $(IFLAGS_EXEC) $(DESTDIR)$(PREFIX)/include + $(INSTALL) -d $(IFLAGS_EXEC) $(DESTDIR)$(PREFIX)/include/voro++ + $(INSTALL) $(IFLAGS_EXEC) src/voro++ $(DESTDIR)$(PREFIX)/bin -+ $(INSTALL) $(IFLAGS) man/voro++.1 $(DESTDIR)$(PREFIX)/man/man1 ++ $(INSTALL) $(IFLAGS) man/voro++.1 $(DESTDIR)$(PREFIX)/share/man/man1 + $(INSTALL) $(IFLAGS) src/libvoro++.a $(DESTDIR)$(PREFIX)/lib + $(INSTALL) $(IFLAGS) src/libvoro++.so $(DESTDIR)$(PREFIX)/lib + $(INSTALL) $(IFLAGS) src/voro++.hh $(DESTDIR)$(PREFIX)/include/voro++ @@ -82,7 +81,7 @@ - rm -f $(PREFIX)/include/voro++/worklist.hh - rmdir $(PREFIX)/include/voro++ + rm -f $(DESTDIR)$(PREFIX)/bin/voro++ -+ rm -f $(DESTDIR)$(PREFIX)/man/man1/voro++.1 ++ rm -f $(DESTDIR)$(PREFIX)/share/man/man1/voro++.1 + rm -f $(DESTDIR)$(PREFIX)/lib/libvoro++.a + rm -f $(DESTDIR)$(PREFIX)/include/voro++/voro++.hh + rm -f $(DESTDIR)$(PREFIX)/include/voro++/c_loops.hh diff --git a/science/voro++/pkg-plist b/science/voro++/pkg-plist index ba46c2c064c4..36ea4fda0422 100644 --- a/science/voro++/pkg-plist +++ b/science/voro++/pkg-plist @@ -15,4 +15,4 @@ include/voro++/wall.hh include/voro++/worklist.hh lib/libvoro++.a lib/libvoro++.so -man/man1/voro++.1.gz +share/man/man1/voro++.1.gz