From https://bugzilla.samba.org/show_bug.cgi?id=11594
When building rsync from its distfile,
perl ./mkproto.pl ./*.c ./lib/compat.c
will always run, even though up-to-date versions of proto.h and
proto.h-tstamp are provided by the distfile.
The reason is the following target:
proto.h-tstamp: $(srcdir)/*.c $(srcdir)/lib/compat.c config.h
perl $(srcdir)/mkproto.pl $(srcdir)/*.c $(srcdir)/lib/compat.c
which declares config.h (created by the configure script, obviously
always newer than the proto.h file provided by the distfile) as its
source without actually using the file.
Removing config.h from the list of proto.h-tstamp sources eliminates
the need for perl when building rsync from its distfile.
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/rsync/Makefile,v
retrieving revision 1.101
diff -u -r1.101 Makefile
--- Makefile 11 Oct 2015 10:56:44 -0000 1.101
+++ Makefile 13 Nov 2015 13:24:36 -0000
@@ -14,7 +14,6 @@
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 share/doc/rsync
-USE_TOOLS+= perl
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-included-popt
CONFIGURE_ARGS+= --with-rsyncd-conf=${PKG_SYSCONFDIR}/rsyncd.conf
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/net/rsync/distinfo,v
retrieving revision 1.42
diff -u -r1.42 distinfo
--- distinfo 4 Nov 2015 00:35:34 -0000 1.42
+++ distinfo 13 Nov 2015 13:24:36 -0000
@@ -4,6 +4,7 @@
RMD160 (rsync-3.1.1.tar.gz) = de7ad955cb05d481a963aa30423790f3d82efe7b
SHA512 (rsync-3.1.1.tar.gz) = ec0e46ff532a09a711282aaa822f5f1c133593ee6c1c474acd67284619236e6a202f0f369d3e67a95ceb3a3b1c39ea7fb609d6d6fb950f3be6e0f6372e903e21
Size (rsync-3.1.1.tar.gz) = 890124 bytes
+SHA1 (patch-Makefile.in) = df3479e93de86524a391433a3d6e6108a797835a
SHA1 (patch-ab) = 98aa07a50314e3309b48f803d6febb1138eae1f2
SHA1 (patch-config.h.in) = 81c927bc687a0194e1a227e6ff02181d638498bd
SHA1 (patch-configure.ac) = 1df4fd9a67d08790eb7d433eadbc9b5590ba1257
Index: patches/patch-Makefile.in
===================================================================
RCS file: patches/patch-Makefile.in
diff -N patches/patch-Makefile.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Makefile.in 13 Nov 2015 13:24:37 -0000
@@ -0,0 +1,15 @@
+$NetBSD$
+
+https://bugzilla.samba.org/show_bug.cgi?id=11594
+
+--- Makefile.in.orig 2013-06-15 23:40:10.000000000 +0000
++++ Makefile.in
+@@ -205,7 +205,7 @@ proto: proto.h-tstamp
+ proto.h: proto.h-tstamp
+ @if test -f proto.h; then :; else cp -p $(srcdir)/proto.h .; fi
+
+-proto.h-tstamp: $(srcdir)/*.c $(srcdir)/lib/compat.c config.h
++proto.h-tstamp: $(srcdir)/*.c $(srcdir)/lib/compat.c
+ perl $(srcdir)/mkproto.pl $(srcdir)/*.c $(srcdir)/lib/compat.c
+
+ man: rsync.1 rsyncd.conf.5 man-copy
Attachment:
signature.asc
Description: PGP signature