CVS commit: pkgsrc/devel/libextractor

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Jul  8 15:02:42 UTC 2019

Modified Files:
        pkgsrc/devel/libextractor: Makefile

Log Message:
libextractor: Fix various dependencies.

- Add msgfmt msgmerge xgettext to USE_TOOLS, it needs these
- Fix building with libjpeg-turbo by using the correct buildlink
- Use newer multimedia/mp4v2 over multimedia/libmp4v2 to avoid conflicts
  This is confusing. I think we mainly keep libmp4v2 around for KDE4.
  But the packages could be named better.


To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 pkgsrc/devel/libextractor/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/libextractor/Makefile
diff -u pkgsrc/devel/libextractor/Makefile:1.75 pkgsrc/devel/libextractor/Makefile:1.76
--- pkgsrc/devel/libextractor/Makefile:1.75     Tue Feb 19 00:09:21 2019
+++ pkgsrc/devel/libextractor/Makefile  Mon Jul  8 15:02:42 2019
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.75 2019/02/19 00:09:21 gdt Exp $
+# $NetBSD: Makefile,v 1.76 2019/07/08 15:02:42 nia Exp $
 
 DISTNAME=      libextractor-1.9
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GNU:=libextractor/}
 
@@ -15,6 +16,7 @@ USE_LIBTOOL=          yes
 USE_LANGUAGES=         c c++03
 USE_PKGLOCALEDIR=      yes
 USE_TOOLS+=            gmake pkg-config
+USE_TOOLS+=            msgfmt msgmerge xgettext
 GNU_CONFIGURE=         yes
 INFO_FILES=            yes
 PTHREAD_OPTS+=         require
@@ -36,12 +38,12 @@ DEPENDS+= ImageMagick-[0-9]*:../../graph
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/exiv2/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../multimedia/libmp4v2/buildlink3.mk"
 .include "../../multimedia/libmpeg2/buildlink3.mk"
+.include "../../multimedia/mp4v2/buildlink3.mk"
 .include "../../www/tidy/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"