Mon Oct 3 05:30:07 2011 UTC ()
Use SUBST to convert the local function called pipe2() into trn_pip2(),
so that it doesn't clash with a system symbol with the same name.


(agc)
diff -r1.32 -r1.33 pkgsrc/news/trn/Makefile
cvs diff -r1.32 -r1.33 pkgsrc/news/trn/Makefile (expand / switch to unified diff)

--- pkgsrc/news/trn/Makefile 2010/03/13 05:46:55 1.32
+++ pkgsrc/news/trn/Makefile 2011/10/03 05:30:07 1.33
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.32 2010/03/13 05:46:55 obache Exp $ 1# $NetBSD: Makefile,v 1.33 2011/10/03 05:30:07 agc Exp $
2 2
3DISTNAME= trn-4.0-test76 3DISTNAME= trn-4.0-test76
4PKGNAME= trn-4.76 4PKGNAME= trn-4.76
5PKGREVISION= 3 5PKGREVISION= 3
6CATEGORIES= news 6CATEGORIES= news
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=trn/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=trn/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://trn.sourceforge.net/ 10HOMEPAGE= http://trn.sourceforge.net/
11COMMENT= Threaded version of rn, the classic news reader 11COMMENT= Threaded version of rn, the classic news reader
12LICENSE= trn-license 12LICENSE= trn-license
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
@@ -66,14 +66,19 @@ CONFIGURE_ARGS+= -d -e -D bin=${PREFIX:Q @@ -66,14 +66,19 @@ CONFIGURE_ARGS+= -d -e -D bin=${PREFIX:Q
66 -D d_nntp \ 66 -D d_nntp \
67 -U d_local \ 67 -U d_local \
68 -D libs=' ' \ 68 -D libs=' ' \
69 -D usevfork=false \ 69 -D usevfork=false \
70 -D inews=${PREFIX:Q}'/bin/inews' \ 70 -D inews=${PREFIX:Q}'/bin/inews' \
71 -D useinews=${PREFIX:Q}'/bin/inews' 71 -D useinews=${PREFIX:Q}'/bin/inews'
72 72
73post-install: 73post-install:
74 @${RM} -f ${DESTDIR}${PREFIX}/bin/rn ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/rn.1 \ 74 @${RM} -f ${DESTDIR}${PREFIX}/bin/rn ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/rn.1 \
75 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/rn.1.gz 75 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/rn.1.gz
76 @${LN} -s trn ${DESTDIR}${PREFIX}/bin/rn 76 @${LN} -s trn ${DESTDIR}${PREFIX}/bin/rn
77 @${LN} -s trn.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/rn.1 77 @${LN} -s trn.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/rn.1
78 78
 79SUBST_CLASSES+= pipe2
 80SUBST_STAGE.pipe2= pre-configure
 81SUBST_FILES.pipe2= filter.c
 82SUBST_SED.pipe2+= -e 's|pipe2|trn_pipe2|g'
 83
79.include "../../mk/bsd.pkg.mk" 84.include "../../mk/bsd.pkg.mk"