CVS commit: pkgsrc/sysutils/adtool

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Jul 10 08:07:49 UTC 2024

Modified Files:
        pkgsrc/sysutils/adtool: Makefile distinfo
        pkgsrc/sysutils/adtool/patches: patch-ab

Log Message:
adtool: Cope with removal of OPSYS from MAKE_ENV.

(When did this happen? Was it intentional?)


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/sysutils/adtool/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/sysutils/adtool/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/adtool/patches/patch-ab

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

Modified files:

Index: pkgsrc/sysutils/adtool/Makefile
diff -u pkgsrc/sysutils/adtool/Makefile:1.22 pkgsrc/sysutils/adtool/Makefile:1.23
--- pkgsrc/sysutils/adtool/Makefile:1.22        Tue Oct 24 22:11:02 2023
+++ pkgsrc/sysutils/adtool/Makefile     Wed Jul 10 08:07:48 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2023/10/24 22:11:02 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2024/07/10 08:07:48 nia Exp $
 #
 
 DISTNAME=      adtool-1.3.3
@@ -16,6 +16,11 @@ USE_LIBTOOL=         yes
 USE_PKGLOCALEDIR=      yes
 PTHREAD_OPTS+=         require
 
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} != "DragonFly"
+LIBS+=                 -lresolv
+.endif
+
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
 
 EGDIR=                 ${PREFIX}/share/examples/adtool

Index: pkgsrc/sysutils/adtool/distinfo
diff -u pkgsrc/sysutils/adtool/distinfo:1.7 pkgsrc/sysutils/adtool/distinfo:1.8
--- pkgsrc/sysutils/adtool/distinfo:1.7 Tue Oct 26 11:19:19 2021
+++ pkgsrc/sysutils/adtool/distinfo     Wed Jul 10 08:07:48 2024
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2021/10/26 11:19:19 nia Exp $
+$NetBSD: distinfo,v 1.8 2024/07/10 08:07:48 nia Exp $
 
 BLAKE2s (adtool-1.3.3.tar.gz) = 7ddd0492c33258031081a72971e0df2e6f22212ab75de785c177ff1683c8700e
 SHA512 (adtool-1.3.3.tar.gz) = 800a9fd19481b2c986991c27674e24b40bd6f4d58d7cbcf94532acb88f6c36de1f18d4165d6a2dcffd7d5baeac86aaf6f0ff1ef1b46d93ffc28b826b3d857251
 Size (adtool-1.3.3.tar.gz) = 334767 bytes
-SHA1 (patch-ab) = d229fc43c29c48711aac27b4dfda5b89c5a649ba
+SHA1 (patch-ab) = 99048449dbef66c8768b46e32a5b877421719c9e

Index: pkgsrc/sysutils/adtool/patches/patch-ab
diff -u pkgsrc/sysutils/adtool/patches/patch-ab:1.2 pkgsrc/sysutils/adtool/patches/patch-ab:1.3
--- pkgsrc/sysutils/adtool/patches/patch-ab:1.2 Wed Dec 10 09:43:29 2014
+++ pkgsrc/sysutils/adtool/patches/patch-ab     Wed Jul 10 08:07:48 2024
@@ -1,18 +1,12 @@
-$NetBSD: patch-ab,v 1.2 2014/12/10 09:43:29 mef Exp $
+$NetBSD: patch-ab,v 1.3 2024/07/10 08:07:48 nia Exp $
 
-Don't hard-code -lpthread. Don't link with -lresolv on DragonFly.
-(above is by @joerg from cvs log. But -pthread does not exist anymore)
-
---- src/tools/Makefile.in.orig 2009-08-15 22:19:24.000000000 +0900
-+++ src/tools/Makefile.in      2014-12-10 18:16:10.000000000 +0900
-@@ -141,6 +141,11 @@ target_alias = @target_alias@
+--- src/tools/Makefile.in.orig 2009-08-15 13:19:24.000000000 +0000
++++ src/tools/Makefile.in
+@@ -141,6 +141,8 @@ target_alias = @target_alias@
  INCLUDES = -I@top_srcdir@/src/lib
  AM_CFLAGS = @CFLAGS@
  
 +AM_LDFLAGS = -lldap -llber -lldap_r ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} @LDFLAGS@
-+.if ${OPSYS} != "DragonFly"
-+AM_LDFLAGS += -lresolv
-+.endif
 +
  bin_PROGRAMS = adtool