diff options
| author | kim <kim@pkgsrc.org> | 2014-08-09 11:27:31 +0000 |
|---|---|---|
| committer | kim <kim@pkgsrc.org> | 2014-08-09 11:27:31 +0000 |
| commit | 353825252fdfe544c9bf60b1e613311a5c05ffba (patch) | |
| tree | a7517d13f5e1f6387ffc2e28908ecdeaa1c66c7b /sysutils/rtty | |
| parent | 143728e4431962ba4e10c049bd563f9a2612b2d4 (diff) | |
| download | pkgsrc-353825252fdfe544c9bf60b1e613311a5c05ffba.tar.gz | |
Tricky tricky Makefile here. Add some clarification for future reference.
Bump PKGREVISION due to binary package change in previous commit (modes).
Diffstat (limited to 'sysutils/rtty')
| -rw-r--r-- | sysutils/rtty/Makefile | 16 | ||||
| -rw-r--r-- | sysutils/rtty/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/rtty/patches/patch-aa | 10 |
3 files changed, 17 insertions, 13 deletions
diff --git a/sysutils/rtty/Makefile b/sysutils/rtty/Makefile index 89605a9d6d5..981f8301bc0 100644 --- a/sysutils/rtty/Makefile +++ b/sysutils/rtty/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.31 2014/08/09 10:38:18 kim Exp $ +# $NetBSD: Makefile,v 1.32 2014/08/09 11:27:31 kim Exp $ DISTNAME= rtty-3.2 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://gatekeeper.hpl.hp.com/archive/pub/misc/vixie/ \ ftp://gatekeeper.hpl.hp.com/pub/misc/vixie/ @@ -19,11 +19,15 @@ CFLAGS.SunOS+= -Du_int16_t=uint16_t -Du_int32_t=uint32_t MAKE_ENV+= LIBS="-lcrypt" .endif -# Use pre-patch so that all patches can be made against what is there -# in the work directory after failed compiles. Also feels more logical -# to have "make patch" complete *all* patching. +# If you need to regenerate patch-aa for Makefile, you should save +# your changes, run "make clean patch", apply your changes again, +# regenerate the diff for patch-aa. Same applies for any other files +# with /usr/local in them, should they acquire patches. +# +# This cannot be moved to pre-patch, because ${PREFIX} can differ +# between installations. -pre-patch: +pre-configure: ${CHMOD} u+w ${WRKDIR}/* for f in `echo ${WRKDIR}/* | ${XARGS} ${GREP} -l '/usr/local'`; do \ ${ECHO} patching $$f ; \ diff --git a/sysutils/rtty/distinfo b/sysutils/rtty/distinfo index d70e61ad4cc..bc51869674a 100644 --- a/sysutils/rtty/distinfo +++ b/sysutils/rtty/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.5 2014/08/09 10:38:18 kim Exp $ +$NetBSD: distinfo,v 1.6 2014/08/09 11:27:31 kim Exp $ SHA1 (rtty-3.2.tar.gz) = 62587ee4eec0b551b2b38341f20fddebde1ee8a1 RMD160 (rtty-3.2.tar.gz) = 03863b5fbaf27a6f254c620e91c3dcd364df926a Size (rtty-3.2.tar.gz) = 23445 bytes -SHA1 (patch-aa) = 666df59625dbe76ffb01bb12d7433860060ec032 +SHA1 (patch-aa) = 11cf781b562bfe35c1003db6f3ac94653c1f8e06 SHA1 (patch-ab) = 32644f9383ef43b45421fc100382509e2e6b2e34 SHA1 (patch-ac) = 8b1b1be9eb471f68d62b4454f9bd74dddb471d75 SHA1 (patch-ad) = dee546ca499fa4fb534f137d58fcbbb800b244d3 diff --git a/sysutils/rtty/patches/patch-aa b/sysutils/rtty/patches/patch-aa index e1117e1a84b..3a3c9f560bd 100644 --- a/sysutils/rtty/patches/patch-aa +++ b/sysutils/rtty/patches/patch-aa @@ -1,9 +1,9 @@ -$NetBSD: patch-aa,v 1.5 2014/08/09 10:38:18 kim Exp $ +$NetBSD: patch-aa,v 1.6 2014/08/09 11:27:31 kim Exp $ ---- Makefile.orig 2014-08-09 08:48:45.000000000 +0000 -+++ Makefile 2014-08-09 08:52:19.000000000 +0000 +--- Makefile.orig 1996-08-23 23:46:42.000000000 +0000 ++++ Makefile 2014-08-09 11:25:47.000000000 +0000 @@ -23,7 +23,7 @@ - DESTPATH = $(DESTROOT)/usr/pkg/rtty + DESTPATH = $(DESTROOT)/usr/local/rtty DESTBIN = $(DESTPATH)/bin -CC = cc @@ -19,7 +19,7 @@ $NetBSD: patch-aa,v 1.5 2014/08/09 10:38:18 kim Exp $ +CDEFS = -DDEBUG -UWANT_TCPIP -UNEED_BITYPES_H -UNEED_STRDUP \ -UNO_SOCKADDR_LEN -UNO_HSTRERROR # --CFLAGS = $(CDEBUG) $(CDEFS) -I/usr/pkg/include +-CFLAGS = $(CDEBUG) $(CDEFS) -I/usr/local/include -LIBS = +CFLAGS+= $(CDEBUG) $(CDEFS) +#LIBS = |