diff --git multimedia/pHash/Makefile multimedia/pHash/Makefile
index 506a748..795554a 100644
--- multimedia/pHash/Makefile
+++ multimedia/pHash/Makefile
@@ -10,12 +10,15 @@ MASTER_SITES=	http://phash.org/releases/ \
 MAINTAINER=	cyberbotx@cyberbotx.com
 COMMENT=	Open source perceptual hash library
 
-USES=		gmake:lite libtool
+LICENSE=	GPLv3 # or any later version
+
+USES=		gmake libtool pathfix
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	PTHREAD_LIBS="-lpthread"
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	FFTW JPEG PNG
+OPTIONS_DEFINE=	DEBUG FFTW JPEG OPENMP PNG
 OPTIONS_MULTI=	HASHING
 OPTIONS_MULTI_HASHING=	AUDIO IMAGE VIDEO
 OPTIONS_DEFAULT=	FFTW JPEG PNG AUDIO IMAGE VIDEO
@@ -23,12 +26,17 @@ AUDIO_DESC=	Enable audio hashing
 IMAGE_DESC=	Enable image hashing
 VIDEO_DESC=	Enable video hashing
 
+DEBUG_CONFIGURE_ENABLE=	debug
+
 FFTW_CONFIGURE_WITH=	fftw
 FFTW_LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3
 
 JPEG_CONFIGURE_WITH=	libjpeg
 JPEG_USES=		jpeg
 
+OPENMP_CONFIGURE_ENABLE=openmp
+OPENMP_USES=		compiler:openmp
+
 PNG_CONFIGURE_WITH=	libpng
 PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
 
@@ -39,9 +47,11 @@ AUDIO_LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile \
 
 IMAGE_CONFIGURE_ENABLE=	image-hash
 IMAGE_BUILD_DEPENDS=	${LOCALBASE}/include/CImg.h:${PORTSDIR}/graphics/cimg
+IMAGE_RUN_DEPENDS=	${LOCALBASE}/include/CImg.h:${PORTSDIR}/graphics/cimg
 
 VIDEO_CONFIGURE_ENABLE=	video-hash
 VIDEO_BUILD_DEPENDS=	${LOCALBASE}/include/CImg.h:${PORTSDIR}/graphics/cimg
+VIDEO_RUN_DEPENDS=	${LOCALBASE}/include/CImg.h:${PORTSDIR}/graphics/cimg
 VIDEO_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
 
 .include <bsd.port.mk>
diff --git multimedia/pHash/files/patch-Makefile.in multimedia/pHash/files/patch-Makefile.in
deleted file mode 100644
index 071dbb2..0000000
--- multimedia/pHash/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2013-04-23 18:48:25 UTC
-+++ Makefile.in
-@@ -291,7 +291,7 @@ top_srcdir = @top_srcdir@
- include_HEADERS = pHash-config.h
- SUBDIRS = src bindings examples
- EXTRA_DIST = $(subdirs) libpHash.spec
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = ${PREFIX}/libdata/pkgconfig
- pkgconfig_DATA = pHash.pc
- LIBTOOL_DEPS = @LIBTOOL_DEPS@
- all: config.h pHash-config.h
diff --git multimedia/pHash/files/patch-src_pHash.cpp multimedia/pHash/files/patch-src_pHash.cpp
index a51960f..5528ff0 100644
--- multimedia/pHash/files/patch-src_pHash.cpp
+++ multimedia/pHash/files/patch-src_pHash.cpp
@@ -1,11 +1,22 @@
 --- src/pHash.cpp.orig	2013-04-13 17:23:12 UTC
 +++ src/pHash.cpp
-@@ -34,7 +34,7 @@
+@@ -34,14 +34,18 @@
  int ph_num_threads()
  {
  	int numCPU = 1;
 -#ifdef __GLIBC__
-+#if defined(__GLIBC__) || defined(__FreeBSD__)
++#ifdef _SC_NPROCESSORS_ONLN
  		numCPU = sysconf( _SC_NPROCESSORS_ONLN );
  #else
  		int mib[2];
+ 		size_t len; 
+ 
+ 		mib[0] = CTL_HW;
++#ifdef HW_AVAILCPU
+ 		mib[1] = HW_AVAILCPU;
++#else
++		mib[1] = HW_NCPU;
++#endif
+ 
+ 		sysctl(mib, 2, &numCPU, &len, NULL, 0);
+ 
diff --git multimedia/php-pHash/Makefile multimedia/php-pHash/Makefile
index 29d5781..4823c5d 100644
--- multimedia/php-pHash/Makefile
+++ multimedia/php-pHash/Makefile
@@ -11,7 +11,9 @@ PKGNAMEPREFIX=	php-
 MAINTAINER=	cyberbotx@cyberbotx.com
 COMMENT=	PHP extension for the pHash perceptual hash library
 
-BUILD_DEPENDS=	${LOCALBASE}/include/CImg.h:${PORTSDIR}/graphics/cimg
+LICENSE=	PHP30
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
 LIB_DEPENDS=	libpHash.so:${PORTSDIR}/multimedia/pHash
 
 USE_PHP=	yes
@@ -19,14 +21,11 @@ USE_PHPIZE=	yes
 USE_PHPEXT=	yes
 USE_PHP_BUILD=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/bindings/php
+WRKSRC_SUBDIR=	bindings/php
 
 # The tarball contains stale pre-built files that interfere with building this
 # ourselves.
 post-configure:
 	@(cd ${WRKSRC} && ${MAKE_CMD} clean)
 
-pre-install:
-	@${STRIP_CMD} ${WRKSRC}/modules/pHash.so
-
 .include <bsd.port.mk>