Index: head/audio/hydrogen/Makefile
===================================================================
--- head/audio/hydrogen/Makefile	(revision 396258)
+++ head/audio/hydrogen/Makefile	(revision 396259)
@@ -1,66 +1,65 @@
 # Created by: Jean-Yves Lefort <jylefort@brutele.be>
 # $FreeBSD$
 
 PORTNAME=	hydrogen
 PORTVERSION=	0.9.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 
 MAINTAINER=	FreeBSD@ShaneWare.Biz
 COMMENT=	Advanced drum machine
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
 
 CONFLICTS=	hydrogen-devel-0.*
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hydrogen-music
 
 USE_QT4=	corelib gui qmake_build linguist_build moc_build network \
 		qt3support rcc_build sql uic_build xml
-USES=		cmake:outsource desktop-file-utils pkgconfig
+USES=		cmake:outsource desktop-file-utils libarchive pkgconfig
 CMAKE_ARGS+=	-DTHREADS_HAVE_PTHREAD_ARG:BOOL=ON -DWANT_DEBUG:BOOL=OFF \
 		-DLIBSNDFILE_INCLUDE_DIR:STRING=${LOCALBASE}/include \
 		-DWANT_OSS:BOOL=ON
 USE_LDCONFIG=	yes
-LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=		ALSA JACK LADSPA LASH PORTAUDIO PULSEAUDIO RDF
 OPTIONS_DEFAULT=	JACK LADSPA RDF
 
 ALSA_CMAKE_ON=		-DWANT_ALSA:BOOL=ON
 ALSA_CMAKE_OFF=		-DWANT_ALSA:BOOL=OFF
 ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
 ALSA_RUN_DEPENDS=	alsa-plugins>=0:${PORTSDIR}/audio/alsa-plugins
 
 JACK_CMAKE_ON=		-DWANT_JACK:BOOL=ON -DWANT_JACKSESSION:BOOL=ON
 JACK_CMAKE_OFF=		-DWANT_JACK:BOOL=OFF -DWANT_JACKSESSION:BOOL=OFF
 JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
 
 LADSPA_CMAKE_ON=	-DWANT_LADSPA:BOOL=ON \
 			-DLADSPA_LIBRARIES:STRING=${LOCALBASE}/lib/ladspa
 LADSPA_CMAKE_OFF=	-DWANT_LADSPA:BOOL=OFF
 LADSPA_BUILD_DEPENDS=	ladspa>=0:${PORTSDIR}/audio/ladspa
 LADSPA_RUN_DEPENDS=	analyseplugin:${PORTSDIR}/audio/ladspa
 
 LASH_CMAKE_ON=		-DWANT_LASH:BOOL=ON
 LASH_CMAKE_OFF=		-DWANT_LASH:BOOL=OFF
 LASH_LIB_DEPENDS=	liblash.so:${PORTSDIR}/audio/lash
 
 PORTAUDIO_CMAKE_ON=	-DWANT_PORTAUDIO:BOOL=ON
 PORTAUDIO_CMAKE_OFF=	-DWANT_PORTAUDIO:BOOL=OFF
 PORTAUDIO_LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio
 
 PULSEAUDIO_CMAKE_ON=	-DWANT_PULSEAUDIO:BOOL=ON
 PULSEAUDIO_CMAKE_OFF=	-DWANT_PULSEAUDIO:BOOL=OFF
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
 
 RDF_DESC=		RDF File support
 RDF_CMAKE_ON=		-DWANT_LRDF:BOOL=ON \
 			-DLRDF_INCLUDE_DIR:STRING=${LOCALBASE}/include/raptor2
 RDF_CMAKE_OFF=		-DWANT_LRDF:BOOL=OFF
 RDF_LIB_DEPENDS=	liblrdf.so:${PORTSDIR}/textproc/liblrdf
 
 .include <bsd.port.mk>
Index: head/audio/hydrogen/files/patch-cmake__FindHelper.cmake
===================================================================
--- head/audio/hydrogen/files/patch-cmake__FindHelper.cmake	(nonexistent)
+++ head/audio/hydrogen/files/patch-cmake__FindHelper.cmake	(revision 396259)
@@ -0,0 +1,54 @@
+Sent upstream: https://github.com/hydrogen-music/hydrogen/pull/290
+
+cmake: Call find_path and find_library even if pkg-config calls work.
+
+Instead of calling pkg_check_modules() with the same prefix as the calls
+to find_library() and find_path(), pass PC_${prefix} to the former.
+
+This way, we are able to use the paths that might have been found by
+pkg-config as hints to the find_library and find_path calls. Doing so
+helps systems where the dependent libraries (libarchive, libsndfile etc)
+are not in the default linker path, as the linker is now called with the
+libraries' absolute path:
+
+c++ file1.o file2.o [...] -o hydrogen /usr/lib/libsndfile.so ...
+
+instead of
+
+c++ file1.o file2.o [...] -o hydrogen -lsndfile ...
+
+as the latter requires one to manually pass "-L/usr/local/lib" to CMake
+when configuring Hydrogen.
+
+While here, use HINTS instead of PATHS when calling the find_*()
+functions, as CMake's documentation says that "paths computed by system
+introspection" should use HINTS, not PATHS, which is for hardcoded
+paths.
+--- cmake/FindHelper.cmake.orig	2014-09-09 18:39:33 UTC
++++ cmake/FindHelper.cmake
+@@ -23,7 +23,7 @@ macro(FIND_HELPER prefix pkg_name header
+             FIND_PACKAGE(PkgConfig)
+         endif()
+         if(PKG_CONFIG_FOUND)
+-            pkg_check_modules(${prefix} ${pkg_name})
++            pkg_check_modules(PC_${prefix} ${pkg_name})
+             #MESSAGE(STATUS  " LDFLAGS       ${${prefix}_LDFLAGS}" )
+             #MESSAGE(STATUS  " CFLAGS        ${${prefix}_CFLAGS}" )
+             #MESSAGE(STATUS  " INCLUDEDIRS   ${${prefix}_INCLUDE_DIRS}" )
+@@ -36,12 +36,14 @@ macro(FIND_HELPER prefix pkg_name header
+ 
+         find_path(${prefix}_INCLUDE_DIR
+             NAMES ${header}
+-            PATHS ${${prefix}_INCLUDE_DIRS} ${${prefix}_INCLUDEDIR} ${${prefix}_INCLUDE_PATHS} ENV ${prefix}_INCLUDE
++            HINTS ${PC_${prefix}_INCLUDE_DIRS} ${PC_${prefix}_INCLUDEDIR} ${PC_${prefix}_INCLUDE_PATHS}
++            ENV ${prefix}_INCLUDE
+         )
+ 
+         find_library(${prefix}_LIBRARIES
+             NAMES ${lib}
+-            PATHS ${${prefix}_LIBDIR} ${${prefix}_LIBRARY_DIRS} ${${prefix}_LIB_PATHS} ENV ${prefix}_PATH
++            HINTS ${PC_${prefix}_LIBDIR} ${PC_${prefix}_LIBRARY_DIRS} ${PC_${prefix}_LIB_PATHS}
++            ENV ${prefix}_PATH
+         )
+     endif()
+ 

Property changes on: head/audio/hydrogen/files/patch-cmake__FindHelper.cmake
___________________________________________________________________
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