Thu Jun 2 12:25:48 2016 UTC ()
We share patches with net/tkined, which needs to patch a tkined.1 man
page we explicitely remove, to avoid conflict.

Unfortunately, there is only one PATCHDIR... so keep around tkined.1
till after patching.


(hauke)
diff -r1.38 -r1.39 pkgsrc/net/tcl-scotty/Makefile

cvs diff -r1.38 -r1.39 pkgsrc/net/tcl-scotty/Makefile (expand / switch to unified diff)

--- pkgsrc/net/tcl-scotty/Makefile 2016/05/02 03:57:35 1.38
+++ pkgsrc/net/tcl-scotty/Makefile 2016/06/02 12:25:47 1.39
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.38 2016/05/02 03:57:35 dholland Exp $ 1# $NetBSD: Makefile,v 1.39 2016/06/02 12:25:47 hauke Exp $
2# 2#
3 3
4DISTNAME= scotty-${DIST_VERS} 4DISTNAME= scotty-${DIST_VERS}
5PKGNAME= tcl-scotty-${DIST_VERS} 5PKGNAME= tcl-scotty-${DIST_VERS}
6PKGREVISION= 11 6PKGREVISION= 12
7CATEGORIES= net tcl 7CATEGORIES= net tcl
8MASTER_SITES= ftp://ftp.ibr.cs.tu-bs.de/pub/local/tkined/ 8MASTER_SITES= ftp://ftp.ibr.cs.tu-bs.de/pub/local/tkined/
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://www.ibr.cs.tu-bs.de/projects/scotty/ 11HOMEPAGE= https://www.ibr.cs.tu-bs.de/projects/scotty/
12COMMENT= Network management extensions to TCL 12COMMENT= Network management extensions to TCL
13 13
14MAKE_JOBS_SAFE= no 14MAKE_JOBS_SAFE= no
15 15
16LICENSE= 2-clause-bsd 16LICENSE= 2-clause-bsd
17 17
18DIST_VERS= 2.1.11 18DIST_VERS= 2.1.11
19 19
@@ -32,26 +32,26 @@ MAKE_FLAGS+= CFLAGS=${CFLAGS:Q} GDMO_LIB @@ -32,26 +32,26 @@ MAKE_FLAGS+= CFLAGS=${CFLAGS:Q} GDMO_LIB
32 32
33USE_LIBTOOL= yes 33USE_LIBTOOL= yes
34USE_TOOLS+= lex yacc 34USE_TOOLS+= lex yacc
35 35
36PLIST_SUBST+= MACHINE="${MACHINE}" 36PLIST_SUBST+= MACHINE="${MACHINE}"
37 37
38INSTALL_TARGET= tnm-install install-man sinstall 38INSTALL_TARGET= tnm-install install-man sinstall
39 39
40SPECIAL_PERMS+= bin/ntping ${SETUID_ROOT_PERMS} 40SPECIAL_PERMS+= bin/ntping ${SETUID_ROOT_PERMS}
41SPECIAL_PERMS+= bin/straps ${SETUID_ROOT_PERMS} 41SPECIAL_PERMS+= bin/straps ${SETUID_ROOT_PERMS}
42 42
43post-extract: 43post-extract:
44 cd ${WRKSRC}/${BUILD_DIRS} && ${RM} -f ../doc/http.n 44 cd ${WRKSRC}/${BUILD_DIRS} && ${RM} -f ../doc/http.n
45 cd ${WRKSRC}/${BUILD_DIRS} && ${RM} -f ../doc/tkined.1 
46 45
47pre-install: 46pre-install:
 47 cd ${WRKSRC}/${BUILD_DIRS} && ${RM} -f ../doc/tkined.1
48 cd ${WRKSRC}/${BUILD_DIRS} && ${INSTALL} ../tnm/ntping/ntping.8 ../doc 48 cd ${WRKSRC}/${BUILD_DIRS} && ${INSTALL} ../tnm/ntping/ntping.8 ../doc
49 49
50post-install: 50post-install:
51 cd ${DESTDIR}/${PREFIX}/bin && ${LN} -f -s scotty${DIST_VERS} scotty 51 cd ${DESTDIR}/${PREFIX}/bin && ${LN} -f -s scotty${DIST_VERS} scotty
52 cd ${DESTDIR}/${PREFIX}/lib/tcl/tnm${DIST_VERS}; umask 022; \ 52 cd ${DESTDIR}/${PREFIX}/lib/tcl/tnm${DIST_VERS}; umask 022; \
53 sed -e 's:${DESTDIR}/::' <pkgIndex.tcl >pkgIndex.tcl.new; \ 53 sed -e 's:${DESTDIR}/::' <pkgIndex.tcl >pkgIndex.tcl.new; \
54 rm -f pkgIndex.tcl; mv pkgIndex.tcl.new pkgIndex.tcl 54 rm -f pkgIndex.tcl; mv pkgIndex.tcl.new pkgIndex.tcl
55 55
56.include "../../lang/tcl/buildlink3.mk" 56.include "../../lang/tcl/buildlink3.mk"
57.include "../../mk/bsd.pkg.mk" 57.include "../../mk/bsd.pkg.mk"