Sun May 5 21:56:22 2013 UTC ()
Use PREFIX instead of LOCALBASE. Commented patches/patch-aa and regenerated
distinfo. patches/patch-ab still needs commenting. Resolves SUBST issue
cited in PR pkg/47387.


(rodent)
diff -r1.24 -r1.25 pkgsrc/devel/exctags/Makefile
diff -r1.11 -r1.12 pkgsrc/devel/exctags/distinfo
diff -r1.5 -r1.6 pkgsrc/devel/exctags/patches/patch-aa
cvs diff -r1.24 -r1.25 pkgsrc/devel/exctags/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/exctags/Makefile 2013/03/22 05:07:50 1.24
+++ pkgsrc/devel/exctags/Makefile 2013/05/05 21:56:22 1.25
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.24 2013/03/22 05:07:50 rodent Exp $ 1# $NetBSD: Makefile,v 1.25 2013/05/05 21:56:22 rodent Exp $
2# 2#
3 3
4DISTNAME= ctags-5.8 4DISTNAME= ctags-5.8
5PKGNAME= ex${DISTNAME} 5PKGNAME= ex${DISTNAME}
6CATEGORIES= devel 6CATEGORIES= devel
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ctags/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ctags/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://ctags.sourceforge.net/ 10HOMEPAGE= http://ctags.sourceforge.net/
11COMMENT= Exuberant (feature-filled) tagfile generator for vi, emacs and clones 11COMMENT= Exuberant (feature-filled) tagfile generator for vi, emacs and clones
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14PKG_INSTALLATION_TYPES= overwrite pkgviews 14PKG_INSTALLATION_TYPES= overwrite pkgviews
@@ -20,26 +20,26 @@ CONFIGURE_ARGS+= --enable-custom-config= @@ -20,26 +20,26 @@ CONFIGURE_ARGS+= --enable-custom-config=
20 20
21CPPFLAGS+= -DETAGS="\"exetags\"" 21CPPFLAGS+= -DETAGS="\"exetags\""
22# Makefile ignores CPPFLAGS 22# Makefile ignores CPPFLAGS
23CFLAGS+= ${CPPFLAGS} 23CFLAGS+= ${CPPFLAGS}
24 24
25SUBST_CLASSES+= man 25SUBST_CLASSES+= man
26SUBST_STAGE.man= post-patch 26SUBST_STAGE.man= post-patch
27SUBST_FILES.man= ctags.1 27SUBST_FILES.man= ctags.1
28SUBST_SED.man= -e 's|^ctags \\-|exctags \\-|' 28SUBST_SED.man= -e 's|^ctags \\-|exctags \\-|'
29SUBST_SED.man+= -e 's|fBctags|fBexctags|g' 29SUBST_SED.man+= -e 's|fBctags|fBexctags|g'
30SUBST_SED.man+= -e 's|fBetags|fBexetags|g' 30SUBST_SED.man+= -e 's|fBetags|fBexetags|g'
31SUBST_SED.man+= -e 's|"ctags|"exctags|g' 31SUBST_SED.man+= -e 's|"ctags|"exctags|g'
32SUBST_SED.man+= -e 's|"etags|"exetags|g' 32SUBST_SED.man+= -e 's|"etags|"exetags|g'
33SUBST_SED.man+= -e 's|/usr/local|${LOCALBASE}|g' 33SUBST_SED.man+= -e 's|/usr/local|${PREFIX}|g'
34 34
35SUBST_CLASSES+= rename 35SUBST_CLASSES+= rename
36SUBST_STAGE.rename= post-patch 36SUBST_STAGE.rename= post-patch
37SUBST_FILES.rename= c.c eiffel.c general.h lregex.c lua.c main.c \ 37SUBST_FILES.rename= c.c eiffel.c general.h lregex.c lua.c main.c \
38 options.c parse.c routines.c 38 options.c parse.c routines.c
39SUBST_SED.rename= -e 's|__unused__|__unused_|g' 39SUBST_SED.rename= -e 's|__unused__|__unused_|g'
40 40
41INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} \ 41INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} \
42 libdir=${DESTDIR}${PREFIX}/lib \ 42 libdir=${DESTDIR}${PREFIX}/lib \
43 mandir=${DESTDIR}${PREFIX}/${PKGMANDIR} 43 mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
44 44
45.include "../../mk/bsd.pkg.mk" 45.include "../../mk/bsd.pkg.mk"
cvs diff -r1.11 -r1.12 pkgsrc/devel/exctags/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/exctags/distinfo 2010/01/22 22:30:05 1.11
+++ pkgsrc/devel/exctags/distinfo 2013/05/05 21:56:22 1.12
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.11 2010/01/22 22:30:05 tonio Exp $ 1$NetBSD: distinfo,v 1.12 2013/05/05 21:56:22 rodent Exp $
2 2
3SHA1 (ctags-5.8.tar.gz) = 482da1ecd182ab39bbdc09f2f02c9fba8cd20030 3SHA1 (ctags-5.8.tar.gz) = 482da1ecd182ab39bbdc09f2f02c9fba8cd20030
4RMD160 (ctags-5.8.tar.gz) = 191495869fbfa2f77a9619a4920eba26d02eface 4RMD160 (ctags-5.8.tar.gz) = 191495869fbfa2f77a9619a4920eba26d02eface
5Size (ctags-5.8.tar.gz) = 479927 bytes 5Size (ctags-5.8.tar.gz) = 479927 bytes
6SHA1 (patch-aa) = 5c8fd497146cf49925210d551072e230b3b06a74 6SHA1 (patch-aa) = 41dc0fdc949fc3a62409b17790002dc9d70cc9db
7SHA1 (patch-ab) = 5659b06f692cc210af42e4cf73d8598cedb12086 7SHA1 (patch-ab) = 5659b06f692cc210af42e4cf73d8598cedb12086
cvs diff -r1.5 -r1.6 pkgsrc/devel/exctags/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/devel/exctags/patches/patch-aa 2007/02/23 00:14:09 1.5
+++ pkgsrc/devel/exctags/patches/patch-aa 2013/05/05 21:56:22 1.6
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-aa,v 1.5 2007/02/23 00:14:09 wiz Exp $ 1$NetBSD: patch-aa,v 1.6 2013/05/05 21:56:22 rodent Exp $
 2
 3Change names of install programmes as to not conflict with other packages.
2 4
3--- Makefile.in.orig 2003-07-27 22:09:58.000000000 +0000 5--- Makefile.in.orig 2003-07-27 22:09:58.000000000 +0000
4+++ Makefile.in 6+++ Makefile.in
5@@ -6,8 +6,8 @@ 7@@ -6,8 +6,8 @@
6 # These are the names of the installed programs, in case you wish to change 8 # These are the names of the installed programs, in case you wish to change
7 # them. 9 # them.
8 # 10 #
9-CTAGS_PROG = ctags 11-CTAGS_PROG = ctags
10-ETAGS_PROG = etags 12-ETAGS_PROG = etags
11+CTAGS_PROG = exctags 13+CTAGS_PROG = exctags
12+ETAGS_PROG = exetags 14+ETAGS_PROG = exetags
13  15
14 # Set this to the path to your shell (must run Bourne shell commands). 16 # Set this to the path to your shell (must run Bourne shell commands).