[pkgsrc/trunk]: pkgsrc/net/ntp4 Address PR pkg/24607 by Georg Schwarz to make...

[jschauma <jschauma%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7aa50239958c
branches:  trunk
changeset: 476453:7aa50239958c
user:      jschauma <jschauma%pkgsrc.org@localhost>
date:      Thu Jun 10 20:03:11 2004 +0000

description:
Address PR pkg/24607 by Georg Schwarz to make this build and install under
IRIX:
- add flexibility to PLIST
- add configure arguments to point to openssl if not builtin
- don't use '-print0' to find(1).  IRIX' find does not have this capability,
  and since we know for a fact that it will not be needed, we can leave it
  out in this case.

diffstat:

 net/ntp4/Makefile |  30 +++++++++++++++++++++++-------
 net/ntp4/PLIST    |   7 ++++---
 2 files changed, 27 insertions(+), 10 deletions(-)

diffs (76 lines):

diff -r 9149c7b573a9 -r 7aa50239958c net/ntp4/Makefile
--- a/net/ntp4/Makefile Thu Jun 10 18:08:13 2004 +0000
+++ b/net/ntp4/Makefile Thu Jun 10 20:03:11 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2004/05/08 07:37:40 snj Exp $
+# $NetBSD: Makefile,v 1.35 2004/06/10 20:03:11 jschauma Exp $
 #
 
 DISTNAME=      ntp-4.2.0
@@ -27,15 +27,18 @@
 RCD_SCRIPTS=   ntpd ntpdate
 
 post-install:
-       (cd ${WRKSRC} &&                                                        \
-           ${PAX} -rw -pe -s "/html/ntp4/" html ${DOCDIR};                     \
-           ${PAX} -rw -pe -s "/conf/ntp4/" conf ${EXAMPLESDIR});               \
-       ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${ALL_NTP_DOCS};                    \
-       ${FIND} ${ALL_NTP_DOCS} -type d -print0 | ${XARGS} -0 ${CHMOD} ${PKGDIRMODE}; \
-       ${FIND} ${ALL_NTP_DOCS} -type f -print0 | ${XARGS} -0 ${CHMOD} ${SHAREMODE};
+       (cd ${WRKSRC} &&                                                \
+           ${PAX} -rw -pe -s "/html/ntp4/" html ${DOCDIR};             \
+           ${PAX} -rw -pe -s "/conf/ntp4/" conf ${EXAMPLESDIR});       \
+       ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${ALL_NTP_DOCS};            \
+       ${FIND} ${ALL_NTP_DOCS} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}; \
+       ${FIND} ${ALL_NTP_DOCS} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE};
 
 .include "../../mk/bsd.prefs.mk"
 
+TIMETRIM=      ""
+NO_TIMETRIM=   "@comment "
+
 .if ${OPSYS} == "NetBSD"
 #
 # Use POSIX nanosecond timers when available, but not otherwise.
@@ -51,7 +54,20 @@
 # Don't pick up libwww's -lmd5, until buildlink can be fixed.
 #
 CONFIGURE_ENV+=        ac_cv_lib_md5_MD5Init=no
+.elif ${OPSYS} == "IRIX"
+TIMETRIM=      "@comment "
+NO_TIMETRIM=   ""
 .endif
 
+PLIST_SUBST+=  TIMETRIM=${TIMETRIM} NO_TIMETRIM=${NO_TIMETRIM}
+
 .include "../../security/openssl/buildlink3.mk"
+.include "../../mk/buildlink3/bsd.builtin.mk"
+
+.if !empty(USE_BUILTIN.openssl:M[nN][oO])
+CONFIGURE_ARGS+=       --with-openssl-incdir=${SSLBASE}/include
+CONFIGURE_ARGS+=       --with-openssl-libdir=${SSLBASE}/lib
+CONFIGURE_ARGS+=       --with-crypto=openssl
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff -r 9149c7b573a9 -r 7aa50239958c net/ntp4/PLIST
--- a/net/ntp4/PLIST    Thu Jun 10 18:08:13 2004 +0000
+++ b/net/ntp4/PLIST    Thu Jun 10 20:03:11 2004 +0000
@@ -1,13 +1,14 @@
-@comment $NetBSD: PLIST,v 1.4 2003/10/24 04:52:26 fredb Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/06/10 20:03:11 jschauma Exp $
 bin/ntp-keygen
 bin/ntp-wait
 bin/ntpd
 bin/ntpdate
 bin/ntpdc
 bin/ntpq
-bin/ntptime
+${TIMETRIM}bin/ntptime
 bin/ntptrace
-bin/tickadj
+${TIMETRIM}bin/tickadj
+${NO_TIMETRIM}bin/timetrim
 share/doc/html/ntp4/accopt.html
 share/doc/html/ntp4/assoc.html
 share/doc/html/ntp4/audio.html