[Midnightbsd-cvs] mports [18402] trunk/graphics/frei0r: fix depends

[laffer1 at midnightbsd.org]

Revision: 18402
          http://svnweb.midnightbsd.org/mports/?rev=18402
Author:   laffer1
Date:     2015-03-28 05:46:54 -0400 (Sat, 28 Mar 2015)
Log Message:
-----------
fix depends

Modified Paths:
--------------
    trunk/graphics/frei0r/Makefile
    trunk/graphics/frei0r/distinfo

Added Paths:
-----------
    trunk/graphics/frei0r/files/
    trunk/graphics/frei0r/files/patch-doc__Makefile.in

Modified: trunk/graphics/frei0r/Makefile
===================================================================
--- trunk/graphics/frei0r/Makefile	2015-03-28 09:45:33 UTC (rev 18401)
+++ trunk/graphics/frei0r/Makefile	2015-03-28 09:46:54 UTC (rev 18402)
@@ -4,6 +4,7 @@
 PORTNAME=	frei0r
 PORTVERSION=	1.3
 DISTVERSIONPREFIX=	plugins-
+PORTREVISION?=	1
 CATEGORIES=	graphics
 MASTER_SITES?=	http://piksel.no/${PORTNAME}/releases/ \
 		ftp://ftp.dyne.org/${PORTNAME}/releases/ \
@@ -15,9 +16,11 @@
 
 .if !defined(BUILDING_FREI0R_METAPORT)
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnomehack pkgconfig
-MAKE_JOBS_SAFE=	yes
+USES=		pathfix pkgconfig
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 .if defined(BUILDING_FREI0R_OPENCV) && defined(BUILDING_FREI0R_GAVL)
@@ -25,27 +28,29 @@
 .endif
 
 .if defined(BUILDING_FREI0R_OPENCV)
-PORTREVISION=	1
+PORTREVISION=	3
 COMMENT=	Frei0r OpenCV plugins
-PKGNAMESUFFIX=  -plugins-opencv
-LIB_DEPENDS+=	opencv_legacy.2:${PORTSDIR}/graphics/opencv
+PKGNAMESUFFIX=	-plugins-opencv
+LIB_DEPENDS+=	libopencv_legacy.so:${PORTSDIR}/graphics/opencv
 FREI0R_PLUGINS=	facebl0r facedetect
 .elif defined(BUILDING_FREI0R_GAVL)
-PORTREVISION=	1
+PORTREVISION=	2
 COMMENT=	Frei0r gavl plugins
-PKGNAMESUFFIX=  -plugins-gavl
-LIB_DEPENDS+=	gavl.1:${PORTSDIR}/multimedia/gavl
+PKGNAMESUFFIX=	-plugins-gavl
+LIB_DEPENDS+=	libgavl.so:${PORTSDIR}/multimedia/gavl
 FREI0R_PLUGINS=	rgbparade scale0tilt vectorscope
 .else
 
 PORTDOCS=	*
 
-OPTIONS=	APIDOC "Install full documentation (requires doxygen)" off \
-		MMX "Enable MMX CPU instructions" off
+OPTIONS_DEFINE=	APIDOC DOCS
+OPTIONS_DEFINE_amd64=	MMX
+APIDOC_DESC=	Install full documentation (requires doxygen)
+MMX_DESC=	MMX CPU instructions
 
 .include <bsd.mport.options.mk>
 
-. if !defined(NOPORTDOCS) && defined(WITH_APIDOC)
+. if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MAPIDOC}
 BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
 . endif
 
@@ -53,6 +58,7 @@
 
 .if defined(FREI0R_PLUGINS)
 CPPFLAGS+=	"-I${LOCALBASE}/include"
+LDFLAGS+=	-L${LOCALBASE}/lib
 PLIST=		${WRKSRC}/PLIST
 ALL_TARGET=
 BUILD_WRKSRC=	${WRKSRC}/src
@@ -60,15 +66,8 @@
 ALL_TARGET+=	${FILE}.la
 PLIST_FILES+=	lib/frei0r-1/${FILE}.so
 . endfor
-PLIST_FILES+=	"@dirrmtry lib/frei0r-1"
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if !defined(WITH_MMX) && ${ARCH} != "amd64"
-CONFIGURE_ARGS+=--disable-cpuflags
-.endif
-
 post-patch:
 .if !defined(BUILDING_FREI0R_GAVL)
 	@${REINPLACE_CMD} -e 's/HAVE_GAVL=true/HAVE_GAVL=false/g' \
@@ -79,10 +78,10 @@
 		${WRKSRC}/configure
 .endif
 .if !defined(FREI0R_PLUGINS)
-. if !defined(NOPORTDOCS) && defined(WITH_APIDOC)
+. if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MAPIDOC}
 	@${REINPLACE_CMD} -e '/^SUBDIRS/s|include|include doc|' ${WRKSRC}/Makefile.in
 . endif
-. if defined(NOPORTDOCS)
+. if ! ${PORT_OPTIONS:MDOCS}
 	@${REINPLACE_CMD} -e '/^install-data-am/s| install-docsDATA||' \
 		${WRKSRC}/Makefile.in
 . endif
@@ -103,6 +102,6 @@
 	@${TOUCH} ${WRKSRC}/aclocal.m4 ${WRKSRC}/Makefile.in \
 		${WRKSRC}/configure ${WRKSRC}/config.h.in
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
 
 .endif # !defined(BUILDING_FREI0R_METAPORT)

Modified: trunk/graphics/frei0r/distinfo
===================================================================
--- trunk/graphics/frei0r/distinfo	2015-03-28 09:45:33 UTC (rev 18401)
+++ trunk/graphics/frei0r/distinfo	2015-03-28 09:46:54 UTC (rev 18402)
@@ -1,3 +1,2 @@
 SHA256 (frei0r-plugins-1.3.tar.gz) = b25da901115aa7f960cf5e541057266fddf132a7521d628e6cb344c9f16c0236
-RMD160 (frei0r-plugins-1.3.tar.gz) = abc279996bb5ffe83f796e1699c9b1cdbece60ec
 SIZE (frei0r-plugins-1.3.tar.gz) = 1092809

Added: trunk/graphics/frei0r/files/patch-doc__Makefile.in
===================================================================
--- trunk/graphics/frei0r/files/patch-doc__Makefile.in	                        (rev 0)
+++ trunk/graphics/frei0r/files/patch-doc__Makefile.in	2015-03-28 09:46:54 UTC (rev 18402)
@@ -0,0 +1,18 @@
+--- doc/Makefile.in.orig	2014-10-30 13:59:09 UTC
++++ doc/Makefile.in
+@@ -418,12 +418,12 @@
+ 	-cp -ra html $(distdir)/doc/
+ 
+ install-data:
+-	install -c -m 644 -d $(htmldocs_DATA) $(htmldocsdir)
++	install -c -m 644 -d $(htmldocs_DATA) $(DESTDIR)$(htmldocsdir)
+ 
+ # Modify the install hook, so we can install directories
+ install-htmldocsDATA:
+-	mkdir -p $(htmldocsdir)
+-	cp -r ./html $(htmldocsdir)/
++	mkdir -p $(DESTDIR)$(htmldocsdir)
++	cp -r ./html $(DESTDIR)$(htmldocsdir)/
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.


Property changes on: trunk/graphics/frei0r/files/patch-doc__Makefile.in
___________________________________________________________________
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