CVS commit: pkgsrc/print/mupdf

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Apr  7 12:13:01 UTC 2020

Modified Files:
        pkgsrc/print/mupdf: Makefile options.mk

Log Message:
mupdf: move GL linking into GL option

Noted by leo@, thanks!


To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 pkgsrc/print/mupdf/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/print/mupdf/options.mk

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

Modified files:

Index: pkgsrc/print/mupdf/Makefile
diff -u pkgsrc/print/mupdf/Makefile:1.80 pkgsrc/print/mupdf/Makefile:1.81
--- pkgsrc/print/mupdf/Makefile:1.80    Tue Apr  7 09:37:46 2020
+++ pkgsrc/print/mupdf/Makefile Tue Apr  7 12:13:01 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2020/04/07 09:37:46 wiz Exp $
+# $NetBSD: Makefile,v 1.81 2020/04/07 12:13:01 wiz Exp $
 
 DISTNAME=      mupdf-1.16.1-source
 PKGNAME=       ${DISTNAME:S/-source//}
@@ -19,7 +19,6 @@ INSTALLATION_DIRS+=   bin include lib/pkgc
 INSTALL_MAKE_FLAGS+=   prefix=${PREFIX}
 INSTALL_MAKE_FLAGS+=   mandir=${PREFIX}/${PKGMANDIR}
 LDFLAGS+=              ${COMPILER_RPATH_FLAG}${X11BASE}/lib
-LDFLAGS.NetBSD+=       -lGL # for glCallList
 MAKE_FLAGS+=           LDFLAGS=${LDFLAGS:Q}
 MAKE_FLAGS+=           XCFLAGS=${CFLAGS:Q}
 MAKE_FLAGS+=           build=release

Index: pkgsrc/print/mupdf/options.mk
diff -u pkgsrc/print/mupdf/options.mk:1.10 pkgsrc/print/mupdf/options.mk:1.11
--- pkgsrc/print/mupdf/options.mk:1.10  Sun Jan 26 13:08:39 2020
+++ pkgsrc/print/mupdf/options.mk       Tue Apr  7 12:13:01 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.10 2020/01/26 13:08:39 nia Exp $
+# $NetBSD: options.mk,v 1.11 2020/04/07 12:13:01 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.mupdf
 PKG_SUPPORTED_OPTIONS= curl opengl
@@ -28,6 +28,7 @@ PLIST.curl=   yes
 PLIST.opengl=  yes
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/freeglut/buildlink3.mk"
+LDFLAGS.NetBSD+=       -lGL # for glCallList
 .else
 MAKE_ENV+=     HAVE_GLUT=no
 .endif