diff --git a/graphics/volpack/Makefile b/graphics/volpack/Makefile
index 6a5d46b9b63e..fb869220fcf6 100644
--- a/graphics/volpack/Makefile
+++ b/graphics/volpack/Makefile
@@ -1,47 +1,47 @@
 PORTNAME=	volpack
 PORTVERSION=	1.0b3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://graphics.stanford.edu/software/volpack/
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Portable software library for volume rendering
 WWW=		https://graphics.stanford.edu/software/volpack
 
 LICENSE=	MIT
 
 GNU_CONFIGURE=	yes
 MAKE_ARGS=	MFLAGS=""	# required for bmake(1) and -jX builds
 
 PLIST_FILES=	lib/libvolpack.a include/volpack.h \
-		man/man3/volpack-BruteForce.3.gz man/man3/volpack-Callback.3.gz \
-		man/man3/volpack-ClientData.3.gz man/man3/volpack-ClsfyScalar.3.gz \
-		man/man3/volpack-ClsfyScan.3.gz man/man3/volpack-ClsfyTable.3.gz \
-		man/man3/volpack-ClsfyVolume.3.gz man/man3/volpack-Context.3.gz \
-		man/man3/volpack-CurrentMatrix.3.gz man/man3/volpack-Debug.3.gz \
-		man/man3/volpack-DepthCueing.3.gz man/man3/volpack-Enable.3.gz \
-		man/man3/volpack-Error.3.gz man/man3/volpack-Extract.3.gz \
-		man/man3/volpack-Filter.3.gz man/man3/volpack-FilterTab.3.gz \
-		man/man3/volpack-Get.3.gz man/man3/volpack-GetImage.3.gz \
-		man/man3/volpack-GetLight.3.gz man/man3/volpack-GetMaterial.3.gz \
-		man/man3/volpack-GetMatrix.3.gz man/man3/volpack-Identity.3.gz \
-		man/man3/volpack-Image.3.gz man/man3/volpack-Light.3.gz \
-		man/man3/volpack-LinAlgebra.3.gz man/man3/volpack-Load.3.gz \
-		man/man3/volpack-LookupShader.3.gz man/man3/volpack-Material.3.gz \
-		man/man3/volpack-MinMaxOctree.3.gz man/man3/volpack-MultMatrix.3.gz \
-		man/man3/volpack-NormalIndex.3.gz man/man3/volpack-OctreeMask.3.gz \
-		man/man3/volpack-Ramp.3.gz man/man3/volpack-RawVoxels.3.gz \
-		man/man3/volpack-Render.3.gz man/man3/volpack-Resample.3.gz \
-		man/man3/volpack-Rotate.3.gz man/man3/volpack-Scale.3.gz \
-		man/man3/volpack-ScanNormals.3.gz man/man3/volpack-Set.3.gz \
-		man/man3/volpack-SetMatrix.3.gz man/man3/volpack-ShadeTable.3.gz \
-		man/man3/volpack-Shadow.3.gz man/man3/volpack-Store.3.gz \
-		man/man3/volpack-Timer.3.gz man/man3/volpack-TracePixel.3.gz \
-		man/man3/volpack-Translate.3.gz man/man3/volpack-Transpose.3.gz \
-		man/man3/volpack-VolPack.3.gz man/man3/volpack-VolumeNormals.3.gz \
-		man/man3/volpack-VolumeSize.3.gz man/man3/volpack-VoxelField.3.gz \
-		man/man3/volpack-VoxelSize.3.gz man/man3/volpack-Window.3.gz \
-		man/man3/volpack-WindowPHIGS.3.gz
+		share/man/man3/volpack-BruteForce.3.gz share/man/man3/volpack-Callback.3.gz \
+		share/man/man3/volpack-ClientData.3.gz share/man/man3/volpack-ClsfyScalar.3.gz \
+		share/man/man3/volpack-ClsfyScan.3.gz share/man/man3/volpack-ClsfyTable.3.gz \
+		share/man/man3/volpack-ClsfyVolume.3.gz share/man/man3/volpack-Context.3.gz \
+		share/man/man3/volpack-CurrentMatrix.3.gz share/man/man3/volpack-Debug.3.gz \
+		share/man/man3/volpack-DepthCueing.3.gz share/man/man3/volpack-Enable.3.gz \
+		share/man/man3/volpack-Error.3.gz share/man/man3/volpack-Extract.3.gz \
+		share/man/man3/volpack-Filter.3.gz share/man/man3/volpack-FilterTab.3.gz \
+		share/man/man3/volpack-Get.3.gz share/man/man3/volpack-GetImage.3.gz \
+		share/man/man3/volpack-GetLight.3.gz share/man/man3/volpack-GetMaterial.3.gz \
+		share/man/man3/volpack-GetMatrix.3.gz share/man/man3/volpack-Identity.3.gz \
+		share/man/man3/volpack-Image.3.gz share/man/man3/volpack-Light.3.gz \
+		share/man/man3/volpack-LinAlgebra.3.gz share/man/man3/volpack-Load.3.gz \
+		share/man/man3/volpack-LookupShader.3.gz share/man/man3/volpack-Material.3.gz \
+		share/man/man3/volpack-MinMaxOctree.3.gz share/man/man3/volpack-MultMatrix.3.gz \
+		share/man/man3/volpack-NormalIndex.3.gz share/man/man3/volpack-OctreeMask.3.gz \
+		share/man/man3/volpack-Ramp.3.gz share/man/man3/volpack-RawVoxels.3.gz \
+		share/man/man3/volpack-Render.3.gz share/man/man3/volpack-Resample.3.gz \
+		share/man/man3/volpack-Rotate.3.gz share/man/man3/volpack-Scale.3.gz \
+		share/man/man3/volpack-ScanNormals.3.gz share/man/man3/volpack-Set.3.gz \
+		share/man/man3/volpack-SetMatrix.3.gz share/man/man3/volpack-ShadeTable.3.gz \
+		share/man/man3/volpack-Shadow.3.gz share/man/man3/volpack-Store.3.gz \
+		share/man/man3/volpack-Timer.3.gz share/man/man3/volpack-TracePixel.3.gz \
+		share/man/man3/volpack-Translate.3.gz share/man/man3/volpack-Transpose.3.gz \
+		share/man/man3/volpack-VolPack.3.gz share/man/man3/volpack-VolumeNormals.3.gz \
+		share/man/man3/volpack-VolumeSize.3.gz share/man/man3/volpack-VoxelField.3.gz \
+		share/man/man3/volpack-VoxelSize.3.gz share/man/man3/volpack-Window.3.gz \
+		share/man/man3/volpack-WindowPHIGS.3.gz
 
 .include <bsd.port.mk>
diff --git a/graphics/volpack/files/patch-Makefile.in b/graphics/volpack/files/patch-Makefile.in
index 634cdce3f48b..d76c6e701f02 100644
--- a/graphics/volpack/files/patch-Makefile.in
+++ b/graphics/volpack/files/patch-Makefile.in
@@ -1,82 +1,91 @@
---- Makefile.in.orig	1994-12-12 21:21:47.000000000 +0100
-+++ Makefile.in	2013-09-24 09:49:45.698631771 +0200
-@@ -175,25 +175,13 @@
+--- Makefile.in.orig	1994-12-12 20:21:47 UTC
++++ Makefile.in
+@@ -47,7 +47,7 @@ INCLUDE_DIR = 	$(prefix)/include
+ INCLUDE_DIR = 	$(prefix)/include
+ 
+ # top-level directory for manual entries
+-MAN_DIR = 	$(prefix)/man
++MAN_DIR = 	$(prefix)/share/man
+ 
+ # directory in which to install manual entries for library functions
+ MAN3_DIR = 	$(MAN_DIR)/man3
+@@ -175,25 +175,13 @@ vp_opts.c: makeopts Makefile
  	cc -o makeopts makeopts.c
  
  vp_opts.c: makeopts Makefile
 -	makeopts vp_opts.c $(CFLAGS)
 +	./makeopts vp_opts.c $(CFLAGS)
  
  $(COMP_SRCS): $(COMP_IN)
 -	@for i in $(COMP_SRCS) ; \
 -	    do \
 -		rm -f $$i ;\
 -		echo "$(M4) -DSourceFile=$$i $(COMP_IN) > $$i" ;\
 -		$(M4) -DSourceFile=$$i $(COMP_IN) > $$i; \
 -		chmod -w $$i; \
 -	    done
 +	$(M4) -DSourceFile=$@ $(COMP_IN) > $@ && chmod -w $@
  
  $(WARP_SRCS): $(WARP_IN)
 -	@for i in $(WARP_SRCS) ; \
 -	    do \
 -		rm -f $$i ;\
 -		echo "$(M4) -DSourceFile=$$i $(WARP_IN) > $$i" ;\
 -		$(M4) -DSourceFile=$$i $(WARP_IN) > $$i; \
 -		chmod -w $$i; \
 -	    done
 +	$(M4) -DSourceFile=$@ $(WARP_IN) > $@ && chmod -w $@
  
  examples: libvolpack.a
  	cd examples; make
-@@ -201,7 +189,7 @@
+@@ -201,7 +189,7 @@ install-binaries: libvolpack.a
  install: install-binaries install-include install-man
  
  install-binaries: libvolpack.a
 -	@for i in $(LIB_DIR) ; \
 +	@for i in $(DESTDIR)$(LIB_DIR) ; \
  	    do \
  	    if [ ! -d $$i ] ; then \
  		echo "Making directory $$i"; \
-@@ -211,11 +199,11 @@
+@@ -211,11 +199,11 @@ install-binaries: libvolpack.a
  		fi; \
  	    done;
  	@echo "Installing libvolpack.a"
 -	@$(INSTALL_DATA) libvolpack.a $(LIB_DIR)
 -	@$(RANLIB) $(LIB_DIR)/libvolpack.a
 +	@$(INSTALL_DATA) libvolpack.a $(DESTDIR)$(LIB_DIR)
 +	@$(RANLIB) $(DESTDIR)$(LIB_DIR)/libvolpack.a
  
  install-include:
 -	@for i in $(INCLUDE_DIR) ; \
 +	@for i in $(DESTDIR)$(INCLUDE_DIR) ; \
  	    do \
  	    if [ ! -d $$i ] ; then \
  		echo "Making directory $$i"; \
-@@ -225,10 +213,10 @@
+@@ -225,10 +213,10 @@ install-include:
  		fi; \
  	    done;
  	@echo "Installing volpack.h"
 -	@$(INSTALL_DATA) volpack.h $(INCLUDE_DIR)
 +	@$(INSTALL_DATA) volpack.h $(DESTDIR)$(INCLUDE_DIR)
  
  install-man:
 -	@for i in $(MAN_DIR) $(MAN3_DIR) ; \
 +	@for i in $(DESTDIR)$(MAN_DIR) $(DESTDIR)$(MAN3_DIR) ; \
  	    do \
  	    if [ ! -d $$i ] ; then \
  		echo "Making directory $$i"; \
-@@ -239,10 +227,9 @@
+@@ -239,10 +227,9 @@ install-man:
  	    done;
  	@cd $(SRC_DIR)/man/src; for i in *.3; \
  	    do \
 -	    echo "Installing man/src/$$i"; \
 -	    rm -f $(MAN3_DIR)/$$i; \
 -	    cp $$i $(MAN3_DIR); \
 -	    chmod 444 $(MAN3_DIR)/$$i; \
 +	    echo "Installing man/src/volpack-$$i"; \
 +	    cp $$i $(DESTDIR)$(MAN3_DIR)/volpack-$$i; \
 +	    chmod 444 $(DESTDIR)$(MAN3_DIR)/volpack-$$i; \
  	    done;
  
  Makefile: $(SRC_DIR)/Makefile.in