CVS commit: pkgsrc/devel/got-portable

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Thu Jul  6 15:18:36 UTC 2023

Modified Files:
        pkgsrc/devel/got-portable: Makefile

Log Message:
devel/got-portable: switch uuid library to libuuid on macOS.

Solves problem related to conflicting type definitions when linking
against ossp-uuid on macOS.
Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/got-portable/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/got-portable/Makefile
diff -u pkgsrc/devel/got-portable/Makefile:1.8 pkgsrc/devel/got-portable/Makefile:1.9
--- pkgsrc/devel/got-portable/Makefile:1.8      Mon Jul  3 11:29:03 2023
+++ pkgsrc/devel/got-portable/Makefile  Thu Jul  6 15:18:36 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2023/07/03 11:29:03 vins Exp $
+# $NetBSD: Makefile,v 1.9 2023/07/06 15:18:36 vins Exp $
 
 DISTNAME=      got-portable-0.90
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel
 MASTER_SITES=  https://gameoftrees.org/releases/portable/
 
@@ -19,27 +19,24 @@ ONLY_FOR_PLATFORM+= FreeBSD-*-*
 ONLY_FOR_PLATFORM+=    DragonFly-*-*
 
 USE_TOOLS+=    pkg-config yacc
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "Linux" || ${OPSYS} == "Darwin"
+USE_TOOLS+=    bison
+.endif
+
 GNU_CONFIGURE= yes
 
 INSTALLATION_DIRS=     bin libexec
 INSTALLATION_DIRS+=    ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
 
-.include "../../mk/bsd.prefs.mk"
-
 .if ${OPSYS} == "Linux"
 USE_TOOLS+=    bison
 # compatibility macros and functions for Linux.
 .  include "../../devel/libbsd/buildlink3.mk"
 .endif
 
-.if ${OPSYS} == "Darwin"
-USE_TOOLS+=    bison
-# define uuid library to use
-.  include "../../devel/ossp-uuid/buildlink3.mk"
-.else
-.  include "../../devel/libuuid/buildlink3.mk"
-.endif
-
 # need libcrypto.so.1.1
 BUILDLINK_API_DEPENDS.openssl+=   openssl>=1.1.1d
 .include "../../security/openssl/buildlink3.mk"
@@ -48,5 +45,6 @@ BUILDLINK_API_DEPENDS.openssl+=   openss
 .include "../../devel/ncursesw/buildlink3.mk"
 
 .include "../../devel/libevent/buildlink3.mk"
+.include "../../devel/libuuid/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"