Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
...
  • 2 commits
  • 3 files changed
  • 0 commit comments
  • 1 contributor
Commits on May 27, 2012
dholland Avoid setting .PATH with '..' when the name of the containing directory
is the same as the name of a build product. I think this is what's been
confusing make.
aa95aec
dholland Needs more REPLACE_PERL, and USE_TOOLS+=perl needs to be perl:run. 4a9608f
Showing with 29 additions and 3 deletions.
  1. +6 −2 misc/dpkg/Makefile
  2. +2 −1 sysutils/pfstat/distinfo
  3. +21 −0 sysutils/pfstat/patches/patch-pfstatd_Makefile
View
8 misc/dpkg/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2012/05/26 14:27:20 christos Exp $
+# $NetBSD: Makefile,v 1.23 2012/05/27 20:53:42 dholland Exp $
#
DISTNAME= dpkg_1.16.3
PKGNAME= dpkg-1.16.3
+PKGREVISION= 1
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/d/dpkg/}
EXTRACT_SUFX= .tar.bz2
@@ -22,10 +23,13 @@ BUILD_DEFS+= VARBASE
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
USE_LANGUAGES= c c++
-USE_TOOLS+= gmake msgfmt perl
+USE_TOOLS+= gmake msgfmt perl:run
USE_NCURSES= yes # needs tigetstr()
REPLACE_PERL= scripts/*.pl
+REPLACE_PERL+= dselect/methods/ftp/install
+REPLACE_PERL+= dselect/methods/ftp/setup
+REPLACE_PERL+= dselect/methods/ftp/update
CONFIGURE_ARGS+= --with-zlib
CONFIGURE_ARGS+= --disable-start-stop-daemon
View
3 sysutils/pfstat/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2011/04/15 11:27:04 obache Exp $
+$NetBSD: distinfo,v 1.7 2012/05/27 20:46:14 dholland Exp $
SHA1 (pfstat-2.5.tar.gz) = fdc6acae98ac2c102dedd2c82104c66d1c0af3ee
RMD160 (pfstat-2.5.tar.gz) = bba652d4f27b41554422410e924a421a1a0fe2a0
@@ -9,3 +9,4 @@ SHA1 (patch-ab) = 24ab0271e0302e03f3b00feb9e4b20f97f932435
SHA1 (patch-ac) = 451e8a66d108dab39277f7d8d93150150f822879
SHA1 (patch-ad) = 35350590919a13e4cb1cb44f1d5b2f6846699c56
SHA1 (patch-ae) = 7a538480b79752b763c0c72945ff80bdbdb00a31
+SHA1 (patch-pfstatd_Makefile) = bbcb7738a83e93cfb7053bf5cd09a3da0af5e1ea
View
21 sysutils/pfstat/patches/patch-pfstatd_Makefile
@@ -0,0 +1,21 @@
+$NetBSD: patch-pfstatd_Makefile,v 1.1 2012/05/27 20:46:14 dholland Exp $
+
+Don't use .PATH: ${.CURDIR}/.. as it causes erratic behavior.
+(For example, because ../pfstatd exists, make may latch onto that
+as the path for "pfstatd" instead of the pfstatd executable.)
+
+--- pfstatd/Makefile~ 2007-01-11 16:01:58.000000000 +0000
++++ pfstatd/Makefile
+@@ -3,8 +3,11 @@
+ PROG= pfstatd
+ SRCS= pfstatd.c pf.c
+ MAN= pfstatd.8
+-.PATH: ${.CURDIR}/..
++#.PATH: ${.CURDIR}/..
+ CFLAGS+= -Wall
+ CFLAGS+= -I${.CURDIR}/..
+
+ .include <bsd.prog.mk>
++
++pf.c: ../pf.c
++ cp ../pf.c pf.c

No commit comments for this range

Something went wrong with that request. Please try again.