diff options
author | joerg <joerg@pkgsrc.org> | 2008-06-20 01:09:05 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2008-06-20 01:09:05 +0000 |
commit | 3b0d97b0de8516db29699676c860489da3f7f0e1 (patch) | |
tree | bb388f6b2532587595653e67cce25229ed050cb8 /textproc | |
parent | 10abca39942a8f34d088f39ccc073fee44271274 (diff) | |
download | pkgsrc-3b0d97b0de8516db29699676c860489da3f7f0e1.tar.gz |
Add DESTDIR support.
Diffstat (limited to 'textproc')
39 files changed, 148 insertions, 90 deletions
diff --git a/textproc/asciidoc/Makefile b/textproc/asciidoc/Makefile index 70dc74543af..dd3c0b632cd 100644 --- a/textproc/asciidoc/Makefile +++ b/textproc/asciidoc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2008/06/10 13:06:57 gdt Exp $ +# $NetBSD: Makefile,v 1.15 2008/06/20 01:09:37 joerg Exp $ # DISTNAME= asciidoc-8.2.6 @@ -10,6 +10,8 @@ MAINTAINER= gdt@NetBSD.org HOMEPAGE= http://www.methods.co.nz/asciidoc/ COMMENT= ASCII to formatted document converter +PKG_DESTDIR_SUPPORT= user-destdir + DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl DEPENDS+= getopt-[0-9]*:../../misc/getopt @@ -29,24 +31,23 @@ INSTALLATION_DIRS= bin share/asciidoc share/asciidoc/filters \ share/asciidoc/docbook-xsl share/asciidoc/stylesheets \ share/asciidoc/javascripts \ share/asciidoc/images/icons/callouts \ - ${PKGMANDIR}/man1 + ${PKGMANDIR}/man1 ${DOCDIR} DOCDIR= ${PREFIX}/share/doc/asciidoc do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/asciidoc.py ${PREFIX}/bin/asciidoc - ${INSTALL_SCRIPT} ${WRKSRC}/a2x ${PREFIX}/bin/a2x - ${INSTALL_MAN} ${WRKSRC}/doc/asciidoc.1 ${PREFIX}/${PKGMANDIR}/man1/ - ${INSTALL_MAN} ${WRKSRC}/doc/a2x.1 ${PREFIX}/${PKGMANDIR}/man1/ - ${INSTALL_DATA_DIR} ${DOCDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/asciidoc.txt ${DOCDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/asciidoc.html ${DOCDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/asciidoc.py ${DESTDIR}${PREFIX}/bin/asciidoc + ${INSTALL_SCRIPT} ${WRKSRC}/a2x ${DESTDIR}${PREFIX}/bin/a2x + ${INSTALL_MAN} ${WRKSRC}/doc/asciidoc.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/ + ${INSTALL_MAN} ${WRKSRC}/doc/a2x.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/ + ${INSTALL_DATA} ${WRKSRC}/doc/asciidoc.txt ${DESTDIR}${DOCDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/asciidoc.html ${DESTDIR}${DOCDIR} cd ${WRKSRC} && pax -wr -pma *.conf filters/*.py \ filters/*.conf docbook-xsl/*.xsl stylesheets/*.css \ javascripts/*.js images/icons/callouts/* images/icons/*.png \ images/icons/README \ - ${PREFIX}/share/asciidoc/. + ${DESTDIR}${PREFIX}/share/asciidoc/. do-test: cd ${WRKSRC} && ./asciidoc.py -v doc/asciidoc.txt diff --git a/textproc/aspell-danish/Makefile b/textproc/aspell-danish/Makefile index 12d45ef4a99..3c05604b14b 100644 --- a/textproc/aspell-danish/Makefile +++ b/textproc/aspell-danish/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/03/04 21:30:44 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2008/06/20 01:09:37 joerg Exp $ # DISTNAME= aspell-da-1.4.52 @@ -12,8 +12,12 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://da.speling.org/ COMMENT= Danish language support for aspell +PKG_DESTDIR_SUPPORT= user-destdir + USE_TOOLS+= perl REPLACE_PERL= unsq +INSTALLATION_DIRS= lib/aspell share/aspell + .include "../../textproc/aspell/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/aspell-danish/distinfo b/textproc/aspell-danish/distinfo index a3fb6de2f2d..12ea2951af0 100644 --- a/textproc/aspell-danish/distinfo +++ b/textproc/aspell-danish/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.5 2006/01/29 01:42:27 wiz Exp $ +$NetBSD: distinfo,v 1.6 2008/06/20 01:09:37 joerg Exp $ SHA1 (aspell-da-1.4.52.tar.bz2) = e9acf2419f8ddb920cc7bb32fc1388f7bb1cfe1d RMD160 (aspell-da-1.4.52.tar.bz2) = 1ef36e81a8063afbacdc4e04e89c3c57df28b344 Size (aspell-da-1.4.52.tar.bz2) = 340624 bytes -SHA1 (patch-aa) = 49b65e8d033decd401138b597469f2962f6a3e13 +SHA1 (patch-aa) = 9b883091d82c21361efae4df88539bed7721407a diff --git a/textproc/aspell-danish/patches/patch-aa b/textproc/aspell-danish/patches/patch-aa index 7a667113ca7..d05bc7abe7f 100644 --- a/textproc/aspell-danish/patches/patch-aa +++ b/textproc/aspell-danish/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 2006/01/29 01:42:27 wiz Exp $ +$NetBSD: patch-aa,v 1.4 2008/06/20 01:09:37 joerg Exp $ --- Makefile.orig 2005-12-02 16:10:09.000000000 +0000 +++ Makefile @@ -8,8 +8,8 @@ $NetBSD: patch-aa,v 1.3 2006/01/29 01:42:27 wiz Exp $ -dictdir=`aspell dump config | grep '^\# dict-dir current: ' | cut -d' ' -f4` -datadir=`aspell dump config | grep '^\# data-dir current: ' | cut -d' ' -f4` -+dictdir=`aspell config dict-dir` -+datadir=`aspell config data-dir` ++dictdir=${DESTDIR}`aspell config dict-dir` ++datadir=${DESTDIR}`aspell config data-dir` all: $(sprog) $(sprog).dat $(sprog)_phonet.dat diff --git a/textproc/aspell-faroese/Makefile b/textproc/aspell-faroese/Makefile index 192659d41ff..591b716f995 100644 --- a/textproc/aspell-faroese/Makefile +++ b/textproc/aspell-faroese/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/03/04 21:30:44 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2008/06/20 01:09:37 joerg Exp $ # DISTNAME= aspell-fo-0.2.24 @@ -12,8 +12,12 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://fo.speling.org/ COMMENT= Faroese language support for aspell +PKG_DESTDIR_SUPPORT= user-destdir + USE_TOOLS+= perl REPLACE_PERL= unsq +INSTALLATION_DIRS= lib/aspell share/aspell + .include "../../textproc/aspell/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/aspell-faroese/distinfo b/textproc/aspell-faroese/distinfo index acecfb7bd06..b7aa57ce88a 100644 --- a/textproc/aspell-faroese/distinfo +++ b/textproc/aspell-faroese/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.5 2006/01/29 01:59:02 wiz Exp $ +$NetBSD: distinfo,v 1.6 2008/06/20 01:09:37 joerg Exp $ SHA1 (aspell-fo-0.2.24.tar.bz2) = fb9da90644a39434ba4ac070aa6049bac855976e RMD160 (aspell-fo-0.2.24.tar.bz2) = 43b8cfeb40bbfb5c11fb90a68599ebf5c1e49fa6 Size (aspell-fo-0.2.24.tar.bz2) = 180736 bytes -SHA1 (patch-aa) = 82fd679bcaad49f7e8af6ed23f16c67de66803a1 +SHA1 (patch-aa) = fe4d861c642c3af29c45ff11a1a5a88165a34a0f diff --git a/textproc/aspell-faroese/patches/patch-aa b/textproc/aspell-faroese/patches/patch-aa index 9395b71dd3b..9f8930f64bc 100644 --- a/textproc/aspell-faroese/patches/patch-aa +++ b/textproc/aspell-faroese/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 2006/01/29 01:59:02 wiz Exp $ +$NetBSD: patch-aa,v 1.4 2008/06/20 01:09:37 joerg Exp $ --- Makefile.orig 2005-12-22 14:56:50.000000000 +0000 +++ Makefile @@ -8,8 +8,8 @@ $NetBSD: patch-aa,v 1.3 2006/01/29 01:59:02 wiz Exp $ -dictdir=`aspell dump config | grep '^\# dict-dir current: ' | cut -d' ' -f4` -datadir=`aspell dump config | grep '^\# data-dir current: ' | cut -d' ' -f4` -+dictdir=`aspell config dict-dir` -+datadir=`aspell config data-dir` ++dictdir=${DESTDIR}`aspell config dict-dir` ++datadir=${DESTDIR}`aspell config data-dir` all: $(sprog) $(sprog).dat $(sprog)_phonet.dat diff --git a/textproc/aspell-slovak/Makefile b/textproc/aspell-slovak/Makefile index 92eadbc7f2e..25edd19f1d2 100644 --- a/textproc/aspell-slovak/Makefile +++ b/textproc/aspell-slovak/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2007/02/22 19:01:25 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2008/06/20 01:09:37 joerg Exp $ # DISTNAME= aspell-sk-0.52-0 @@ -12,6 +12,8 @@ MAINTAINER= salo@NetBSD.org HOMEPAGE= http://sk-spell.sk.cx/ COMMENT= Slovak language support for aspell +PKG_DESTDIR_SUPPORT= user-destdir + HAS_CONFIGURE= YES .include "../../textproc/aspell/buildlink3.mk" diff --git a/textproc/bibclean/Makefile b/textproc/bibclean/Makefile index c42a953b2ed..fcb84c9d205 100644 --- a/textproc/bibclean/Makefile +++ b/textproc/bibclean/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/03/04 21:30:45 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2008/06/20 01:09:37 joerg Exp $ # DISTNAME= bibclean-2.11.4 @@ -11,12 +11,14 @@ HOMEPAGE= http://www.math.utah.edu/pub/bibclean/ COMMENT= Prettyprinter and syntax checker for BibTeX bibliography databases PKG_INSTALLATION_TYPES= overwrite pkgviews +PKG_DESTDIR_SUPPORT= user-destdir USE_LANGUAGES= c c++ GNU_CONFIGURE= YES +INSTALLATION_DIRS= share/doc/bibclean + post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bibclean - ${INSTALL_DATA} ${WRKSRC}/doc/bibclean.dvi ${PREFIX}/share/doc/bibclean/ + ${INSTALL_DATA} ${WRKSRC}/doc/bibclean.dvi ${DESTDIR}${PREFIX}/share/doc/bibclean/ .include "../../mk/bsd.pkg.mk" diff --git a/textproc/bibclean/distinfo b/textproc/bibclean/distinfo index 4f55665659b..867beaf9d60 100644 --- a/textproc/bibclean/distinfo +++ b/textproc/bibclean/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2005/02/24 14:48:40 agc Exp $ +$NetBSD: distinfo,v 1.3 2008/06/20 01:09:37 joerg Exp $ SHA1 (bibclean-2.11.4.tar.gz) = 8a51c0e8182d303e336137d6bc601276b1b86c77 RMD160 (bibclean-2.11.4.tar.gz) = 9a68c05599911ee0c4c89f5a7c3c4c9d8b3b7fb2 Size (bibclean-2.11.4.tar.gz) = 2165967 bytes -SHA1 (patch-aa) = 0c8f31d7e41494b90d9fc9ce816a037a5ace1641 +SHA1 (patch-aa) = 218420e2b1939eee54ae5142e0424020b30f9bad diff --git a/textproc/bibclean/patches/patch-aa b/textproc/bibclean/patches/patch-aa index 0c960a316c5..bbf32a20e4e 100644 --- a/textproc/bibclean/patches/patch-aa +++ b/textproc/bibclean/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/07/24 14:29:45 wiz Exp $ +$NetBSD: patch-aa,v 1.2 2008/06/20 01:09:37 joerg Exp $ --- Makefile.in.orig Thu Jul 13 23:32:58 2000 +++ Makefile.in @@ -46,9 +46,9 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/07/24 14:29:45 wiz Exp $ - $(CHMOD) 775 $(bindir)/bibclean - $(CP) bibclean.ini $(bindir)/.bibcleanrc - $(CHMOD) 664 $(bindir)/.bibcleanrc -+ -$(INSTALL_PROGRAM_DIR) $(bindir) -+ $(INSTALL_PROGRAM) bibclean $(bindir)/bibclean -+ $(INSTALL_DATA) $(srcdir)/bibclean.ini $(bindir)/.bibcleanrc ++ $(INSTALL_PROGRAM_DIR) ${DESTDIR}$(bindir) ++ $(INSTALL_PROGRAM) bibclean ${DESTDIR}$(bindir)/bibclean ++ $(INSTALL_DATA) $(srcdir)/bibclean.ini ${DESTDIR}$(bindir)/.bibcleanrc install-man: bibclean.man - if test -f $(mandir)/bibclean.$(manext) ; \ @@ -60,8 +60,8 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/07/24 14:29:45 wiz Exp $ - -$(RM) $(mandir)/bibclean-$(VERSION).$(manext) - $(LN) $(mandir)/bibclean.$(manext) $(mandir)/bibclean-$(VERSION).$(manext) - $(CHMOD) 664 $(mandir)/bibclean.$(manext) -+ -$(INSTALL_MAN_DIR) $(mandir) -+ $(INSTALL_MAN) $(srcdir)/bibclean.man $(mandir)/bibclean.$(manext) ++ $(INSTALL_MAN_DIR) ${DESTDIR}$(mandir) ++ $(INSTALL_MAN) $(srcdir)/bibclean.man ${DESTDIR}$(mandir)/bibclean.$(manext) install-ftp: install-ftp.time diff --git a/textproc/biblook/Makefile b/textproc/biblook/Makefile index 5df4fe1c136..b992a1d911c 100644 --- a/textproc/biblook/Makefile +++ b/textproc/biblook/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2007/02/22 19:27:13 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2008/06/20 01:09:37 joerg Exp $ # DISTNAME= biblook @@ -10,6 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://compgeom.cs.uiuc.edu/~jeffe/biblook.html COMMENT= Indexing and searching tools for BibTeX bibliography databases +PKG_DESTDIR_SUPPORT= user-destdir + WRKSRC= ${WRKDIR} MAKE_ENV+= MANDIR=${PREFIX}/${PKGMANDIR}/man1 MAKE_FLAGS+= CC=${CC:Q} @@ -19,4 +21,6 @@ MAKE_FLAGS+= OPT="${CFLAGS} -Dunix" MAKE_FLAGS+= DEF_H_FILES="-DHAVE_STDLIB_H -DHAVE_NETINET_IN_H" MAKE_FLAGS+= DEF_MORE='-DMOREPATH="\"/usr/bin/more\"" -DMORE="\"more\""' +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 + .include "../../mk/bsd.pkg.mk" diff --git a/textproc/biblook/distinfo b/textproc/biblook/distinfo index c54d26feeaa..528cc712d35 100644 --- a/textproc/biblook/distinfo +++ b/textproc/biblook/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.4 2005/10/04 21:40:19 reed Exp $ +$NetBSD: distinfo,v 1.5 2008/06/20 01:09:37 joerg Exp $ SHA1 (biblook.tar.gz) = 2bb056b806db4518c07e245fc86097c12938443b RMD160 (biblook.tar.gz) = 116f8209e7f36d98a770b1fd911ce9a985dc2b45 Size (biblook.tar.gz) = 44691 bytes -SHA1 (patch-aa) = 0a4555904c32474998336803d6bd805d3dd1d5cb +SHA1 (patch-aa) = d6dd58fbb58c173ca23bb16d1d2418e2d8685c26 SHA1 (patch-ab) = 7063e2d7b92a45b1f055ca201fe1d6b11bfec7bc SHA1 (patch-ac) = 4d6ae0e4301a184b40c777712ee91ea739d7fbfe diff --git a/textproc/biblook/patches/patch-aa b/textproc/biblook/patches/patch-aa index b69699af3e3..7dfe23fa1e5 100644 --- a/textproc/biblook/patches/patch-aa +++ b/textproc/biblook/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 2005/10/04 21:40:19 reed Exp $ +$NetBSD: patch-aa,v 1.3 2008/06/20 01:09:37 joerg Exp $ --- Makefile.orig 1995-01-31 12:15:22.000000000 -0800 +++ Makefile 2005-10-04 14:26:20.000000000 -0700 @@ -42,10 +42,10 @@ $NetBSD: patch-aa,v 1.2 2005/10/04 21:40:19 reed Exp $ - -chmod 774 $(MANDIR)/bibindex.$(MANEXT) - -$(CP) biblook.man $(MANDIR)/biblook.$(MANEXT) - -chmod 774 $(MANDIR)/biblook.$(MANEXT) -+ $(INSTALL_PROGRAM) bibindex $(BINDIR) -+ $(INSTALL_PROGRAM) biblook $(BINDIR) -+ $(INSTALL_MAN) bibindex.man $(MANDIR)/bibindex.$(MANEXT) -+ $(INSTALL_MAN) biblook.man $(MANDIR)/biblook.$(MANEXT) ++ $(INSTALL_PROGRAM) bibindex ${DESTDIR}$(BINDIR) ++ $(INSTALL_PROGRAM) biblook ${DESTDIR}$(BINDIR) ++ $(INSTALL_MAN) bibindex.man ${DESTDIR}$(MANDIR)/bibindex.$(MANEXT) ++ $(INSTALL_MAN) biblook.man ${DESTDIR}$(MANDIR)/biblook.$(MANEXT) install-ftp: $(FTPFILES) -for f in $? ; \ diff --git a/textproc/bibparse/Makefile b/textproc/bibparse/Makefile index 7b11c99afa4..ed775a8c516 100644 --- a/textproc/bibparse/Makefile +++ b/textproc/bibparse/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/06/20 22:22:54 minskim Exp $ +# $NetBSD: Makefile,v 1.11 2008/06/20 01:09:37 joerg Exp $ # DISTNAME= bibparse-1.06 @@ -10,6 +10,9 @@ HOMEPAGE= http://www.math.utah.edu/pub/bibparse/ COMMENT= Syntax checking tools for BibTeX bibliography databases PKG_INSTALLATION_TYPES= overwrite pkgviews +PKG_DESTDIR_SUPPORT= user-destdir + +INSTALLATION_DIRS= ${PKGMANDIR}/man1 GNU_CONFIGURE= YES USE_TOOLS+= yacc diff --git a/textproc/bibparse/distinfo b/textproc/bibparse/distinfo index ce61441e4a5..e87b11b42bd 100644 --- a/textproc/bibparse/distinfo +++ b/textproc/bibparse/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.3 2005/02/24 14:48:40 agc Exp $ +$NetBSD: distinfo,v 1.4 2008/06/20 01:09:37 joerg Exp $ SHA1 (bibparse-1.06.tar.gz) = 74e356264cb8c11b212d8a61c503bbf915a0729c RMD160 (bibparse-1.06.tar.gz) = e41a53cf2f72c150252642c344b5b686e91e0e46 Size (bibparse-1.06.tar.gz) = 856432 bytes -SHA1 (patch-aa) = b9fd8a0d82d8ee2d4a0b19b68558184e38572a75 +SHA1 (patch-aa) = 2687b6d275d103368346ab57205e4f889f56bff9 SHA1 (patch-ab) = facf719e4ea6ad2857b08145857246d4ee871138 diff --git a/textproc/bibparse/patches/patch-aa b/textproc/bibparse/patches/patch-aa index 8bee91e1d70..5c541911e81 100644 --- a/textproc/bibparse/patches/patch-aa +++ b/textproc/bibparse/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 2004/12/23 16:30:10 seb Exp $ +$NetBSD: patch-aa,v 1.3 2008/06/20 01:09:37 joerg Exp $ --- Makefile.in.orig 2004-09-23 21:15:48.000000000 +0000 +++ Makefile.in @@ -46,29 +46,29 @@ $NetBSD: patch-aa,v 1.2 2004/12/23 16:30:10 seb Exp $ - -$(MKDIR) $(SHRLIBDIR) - $(CP) bibdup.awk $(SHRLIBDIR)/bibdup.awk - $(CHMOD) 664 $(SHRLIBDIR)/bibdup.awk -+ -$(INSTALL_DATA_DIR) $(SHRLIBDIR) -+ $(INSTALL_DATA) bibdup.awk $(SHRLIBDIR)/bibdup.awk ++ $(INSTALL_DATA_DIR) ${DESTDIR}$(SHRLIBDIR) ++ $(INSTALL_DATA) bibdup.awk ${DESTDIR}$(SHRLIBDIR)/bibdup.awk install-man: uninstall-man -+ -$(INSTALL_MAN_DIR) $(MANDIR)/man$(MANEXT) ++ $(INSTALL_MAN_DIR) $(MANDIR)/man$(MANEXT) for program in $(BASEPROGS) ; \ do \ - $(CP) $$program.man $(MANDIR)/man$(MANEXT)/$$program.1 ; \ - $(CHMOD) 664 $(MANDIR)/man$(MANEXT)/$$program.1 ; \ -+ $(INSTALL_MAN) $$program.man $(MANDIR)/man$(MANEXT)/$$program.1 ; \ ++ $(INSTALL_MAN) $$program.man ${DESTDIR}$(MANDIR)/man$(MANEXT)/$$program.1 ; \ done install-programs: $(PROGRAMS) bibdup.sh uninstall-programs -+ -$(INSTALL_PROGRAM_DIR) $(BINDIR) ++ $(INSTALL_PROGRAM_DIR) ${DESTDIR}$(BINDIR) for program in $(PROGRAMS) ; \ do \ - $(CP) $$program $(BINDIR)/$$program ; \ - $(CHMOD) 775 $(BINDIR)/$$program ; \ -+ $(INSTALL_PROGRAM) $$program $(BINDIR)/$$program ; \ ++ $(INSTALL_PROGRAM) $$program ${DESTDIR}$(BINDIR)/$$program ; \ done ; \ - $(CP) bibdup.sh $(BINDIR)/bibdup ; \ - $(CHMOD) 775 $(BINDIR)/bibdup -+ $(INSTALL_SCRIPT) bibdup.sh $(BINDIR)/bibdup ++ $(INSTALL_SCRIPT) bibdup.sh ${DESTDIR}$(BINDIR)/bibdup install-show: @echo '' diff --git a/textproc/c2html/Makefile b/textproc/c2html/Makefile index aaff49931d0..a4fc2c7d782 100644 --- a/textproc/c2html/Makefile +++ b/textproc/c2html/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2007/01/29 16:40:58 minskim Exp $ +# $NetBSD: Makefile,v 1.2 2008/06/20 01:09:37 joerg Exp $ DISTNAME= c2html-20070126 CATEGORIES= textproc devel @@ -8,10 +8,12 @@ MAINTAINER= lkundrak@skosi.org HOMEPAGE= http://gavare.se/c2html/ COMMENT= Converts a C source tree to hyperlinked and colored HTML +PKG_DESTDIR_SUPPORT= user-destdir + INSTALLATION_DIRS= bin ${PREFIX}/share/doc/${PKGBASE} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/c2html ${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/${PKGBASE} + ${INSTALL_PROGRAM} ${WRKSRC}/c2html ${DESTDIR}${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} .include "../../mk/bsd.pkg.mk" diff --git a/textproc/cawf/Makefile b/textproc/cawf/Makefile index a3eed22bc3c..a5de8ba021e 100644 --- a/textproc/cawf/Makefile +++ b/textproc/cawf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2007/03/19 16:36:41 tv Exp $ +# $NetBSD: Makefile,v 1.12 2008/06/20 01:09:37 joerg Exp $ # # Possible TODOs: # - set CH based on manual page section number, and real OS name @@ -22,23 +22,23 @@ COMMENT= Simplistic nroff-like formatter in C, like "awf" WRKSRC= ${WRKDIR} PKG_INSTALLATION_TYPES= overwrite pkgviews +PKG_DESTDIR_SUPPORT= user-destdir .include "../../mk/bsd.prefs.mk" CPPFLAGS+= -DUNIX -DUSG -DSTDLIB -DCAWFLIB="\"${PREFIX}/share/cawf\"" -INSTALLATION_DIRS+= bin man/man1 +INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 share/cawf post-extract: ${RM} -f ${WRKSRC}/*.o do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bsfilt ${WRKSRC}/cawf ${PREFIX}/bin/ - ${INSTALL_MAN} ${WRKSRC}/*.1 ${PREFIX}/${PKGMANDIR}/man1/ - ${INSTALL_DATA_DIR} ${PREFIX}/share/cawf - ${INSTALL_DATA} ${WRKSRC}/common ${PREFIX}/share/cawf/ - ${INSTALL_DATA} ${WRKSRC}/device.cf ${PREFIX}/share/cawf/ - ${INSTALL_DATA} ${WRKSRC}/*.dev ${WRKSRC}/*.mac ${PREFIX}/share/cawf/ - ${INSTALL_DATA} ${WRKSRC}/00diffs ${PREFIX}/share/cawf/DIFFS + ${INSTALL_PROGRAM} ${WRKSRC}/bsfilt ${WRKSRC}/cawf ${DESTDIR}${PREFIX}/bin/ + ${INSTALL_MAN} ${WRKSRC}/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/ + ${INSTALL_DATA} ${WRKSRC}/common ${DESTDIR}${PREFIX}/share/cawf/ + ${INSTALL_DATA} ${WRKSRC}/device.cf ${DESTDIR}${PREFIX}/share/cawf/ + ${INSTALL_DATA} ${WRKSRC}/*.dev ${WRKSRC}/*.mac ${DESTDIR}${PREFIX}/share/cawf/ + ${INSTALL_DATA} ${WRKSRC}/00diffs ${DESTDIR}${PREFIX}/share/cawf/DIFFS .include "../../mk/bsd.pkg.mk" diff --git a/textproc/cdif/Makefile b/textproc/cdif/Makefile index ef21b721d6b..3bba1f60460 100644 --- a/textproc/cdif/Makefile +++ b/textproc/cdif/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2008/05/26 22:37:30 tnn Exp $ +# $NetBSD: Makefile,v 1.19 2008/06/20 01:09:37 joerg Exp $ # DISTNAME= cdif-1.15 @@ -10,6 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.srekcah.org/~utashiro/perl/scripts/cdif/ COMMENT= Word context diff +PKG_DESTDIR_SUPPORT= user-destdir + # XXX add cdif-license LICENSE= cdif-license RESTRICTED= Redistribution only for "non-commercial purpose". @@ -34,6 +36,6 @@ do-patch: < ${WRKSRC}/${DISTNAME}.dist > ${WRKSRC}/${DISTNAME} do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME} ${PREFIX}/bin/cdif + ${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME} ${DESTDIR}${PREFIX}/bin/cdif .include "../../mk/bsd.pkg.mk" diff --git a/textproc/gnome-spell/Makefile b/textproc/gnome-spell/Makefile index f89d0f28aef..dffd74f4882 100644 --- a/textproc/gnome-spell/Makefile +++ b/textproc/gnome-spell/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2008/05/30 12:29:00 wiz Exp $ +# $NetBSD: Makefile,v 1.32 2008/06/20 01:09:37 joerg Exp $ DISTNAME= gnome-spell-1.0.8 PKGREVISION= 1 @@ -10,6 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= Spell checking as you type like gtkspell +PKG_DESTDIR_SUPPORT= user-destdir + GNU_CONFIGURE= YES USE_DIRS+= gnome2-1.3 USE_PKGLOCALEDIR= YES diff --git a/textproc/p5-CAM-PDF/Makefile b/textproc/p5-CAM-PDF/Makefile index 4e11ac99346..6087e9717e1 100644 --- a/textproc/p5-CAM-PDF/Makefile +++ b/textproc/p5-CAM-PDF/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2007/07/28 09:54:52 seb Exp $ +# $NetBSD: Makefile,v 1.2 2008/06/20 01:09:38 joerg Exp $ # DISTNAME= CAM-PDF-1.10 @@ -10,6 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://search.cpan.org/dist/CAM-PDF/ COMMENT= Perl 5 PDF manipulation library +PKG_DESTDIR_SUPPORT= user-destdir + USE_LANGUAGES= # empty DEPENDS+= p5-Crypt-RC4>=2.02:../../security/p5-Crypt-RC4 diff --git a/textproc/p5-Convert-ASCII-Armour/Makefile b/textproc/p5-Convert-ASCII-Armour/Makefile index 11929c2d704..6847973ef33 100644 --- a/textproc/p5-Convert-ASCII-Armour/Makefile +++ b/textproc/p5-Convert-ASCII-Armour/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/03/04 21:30:47 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2008/06/20 01:09:38 joerg Exp $ # DISTNAME= Convert-ASCII-Armour-1.4 @@ -12,12 +12,13 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://search.cpan.org/dist/Convert-ASCII-Armour/ COMMENT= Perl5 module to convert binary octets into ASCII armour +PKG_INSTALLATION_TYPES= overwrite pkgviews +PKG_DESTDIR_SUPPORT= user-destdir + DEPENDS+= p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5 DEPENDS+= p5-MIME-Base64-[0-9]*:../../converters/p5-MIME-Base64 DEPENDS+= p5-Compress-Zlib-[0-9]*:../../devel/p5-Compress-Zlib -PKG_INSTALLATION_TYPES= overwrite pkgviews - USE_LANGUAGES= # empty PERL5_PACKLIST= auto/Convert/ASCII/Armour/.packlist diff --git a/textproc/p5-Convert-ASN1/Makefile b/textproc/p5-Convert-ASN1/Makefile index 5bc9612f2dc..0cb9c21337f 100644 --- a/textproc/p5-Convert-ASN1/Makefile +++ b/textproc/p5-Convert-ASN1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2007/05/17 21:09:40 seb Exp $ +# $NetBSD: Makefile,v 1.22 2008/06/20 01:09:38 joerg Exp $ # DISTNAME= Convert-ASN1-0.21 @@ -12,6 +12,7 @@ HOMEPAGE= http://search.cpan.org/dist/Convert-ASN1/ COMMENT= Perl5 module to encode/decode ASN.1 data PKG_INSTALLATION_TYPES= overwrite pkgviews +PKG_DESTDIR_SUPPORT= user-destdir USE_LANGUAGES= # empty PERL5_PACKLIST= auto/Convert/ASN1/.packlist diff --git a/textproc/p5-Convert-BER/Makefile b/textproc/p5-Convert-BER/Makefile index fc1b25e3715..0e4e322c45d 100644 --- a/textproc/p5-Convert-BER/Makefile +++ b/textproc/p5-Convert-BER/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2007/02/22 11:55:23 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2008/06/20 01:09:38 joerg Exp $ # DISTNAME= Convert-BER-1.3101 @@ -11,6 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://search.cpan.org/dist/Convert-BER/ COMMENT= Perl class to encode/decode objects using Basic Encoding Rules +PKG_DESTDIR_SUPPORT= user-destdir + PERL5_PACKLIST= auto/Convert/BER/.packlist .include "../../lang/perl5/module.mk" diff --git a/textproc/p5-Convert-PEM/Makefile b/textproc/p5-Convert-PEM/Makefile index fef126bcce9..6e555f4e8c3 100644 --- a/textproc/p5-Convert-PEM/Makefile +++ b/textproc/p5-Convert-PEM/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/03/04 21:30:47 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2008/06/20 01:09:38 joerg Exp $ # DISTNAME= Convert-PEM-0.07 @@ -11,14 +11,15 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://search.cpan.org/dist/Convert-PEM/ COMMENT= Perl5 module to read/write ASN.1-encoded PEM files +PKG_INSTALLATION_TYPES= overwrite pkgviews +PKG_DESTDIR_SUPPORT= user-destdir + DEPENDS+= p5-MIME-Base64-[0-9]*:../../converters/p5-MIME-Base64 DEPENDS+= p5-Convert-ASN1>=0.10:../../textproc/p5-Convert-ASN1 DEPENDS+= p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5 DEPENDS+= p5-Crypt-DES_EDE3-[0-9]*:../../security/p5-Crypt-DES_EDE3 DEPENDS+= p5-Class-ErrorHandler-[0-9]*:../../devel/p5-Class-ErrorHandler -PKG_INSTALLATION_TYPES= overwrite pkgviews - USE_LANGUAGES= # empty PERL5_PACKLIST= auto/Convert/PEM/.packlist diff --git a/textproc/p5-Cz-Cstools/Makefile b/textproc/p5-Cz-Cstools/Makefile index bf3d9380230..f4ffac17289 100644 --- a/textproc/p5-Cz-Cstools/Makefile +++ b/textproc/p5-Cz-Cstools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/08/06 06:19:31 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2008/06/20 01:09:38 joerg Exp $ # DISTNAME= Cstools-3.42 @@ -12,6 +12,8 @@ MAINTAINER= salo@NetBSD.org HOMEPAGE= http://www.fi.muni.cz/~adelton/perl/ COMMENT= Tools for dealing with Czech and Slovak texts in Perl +PKG_DESTDIR_SUPPORT= user-destdir + DEPENDS+= p5-MIME-tools>=5.411.1:../../mail/p5-MIME-tools DEPENDS+= p5-DBD-XBase>=0.232:../../databases/p5-DBD-XBase diff --git a/textproc/p5-Encode/Makefile b/textproc/p5-Encode/Makefile index 53112c6802e..32642a3fd18 100644 --- a/textproc/p5-Encode/Makefile +++ b/textproc/p5-Encode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2006/10/24 14:09:43 obache Exp $ +# $NetBSD: Makefile,v 1.3 2008/06/20 01:09:38 joerg Exp $ DISTNAME= Encode-2.18 PKGNAME= p5-${DISTNAME} @@ -9,6 +9,8 @@ MAINTAINER= kuli0020@umn.edu HOMEPAGE= http://search.cpan.org/~dankogai/Encode/ COMMENT= Provides interfaces between strings and the rest of the system +PKG_DESTDIR_SUPPORT= user-destdir + PERL5_REQD+= 5.7.3 PERL5_PACKLIST= auto/Encode/.packlist diff --git a/textproc/p5-Filter/Makefile b/textproc/p5-Filter/Makefile index d1a45a80852..5c147c234cf 100644 --- a/textproc/p5-Filter/Makefile +++ b/textproc/p5-Filter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/05/02 03:30:11 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2008/06/20 01:09:38 joerg Exp $ DISTNAME= Filter-1.32 PKGNAME= p5-${DISTNAME} @@ -10,6 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://search.cpan.org/dist/Filter/ COMMENT= Perl5 classes representing a number of source filters +PKG_DESTDIR_SUPPORT= user-destdir + PERL5_PACKLIST= auto/Filter/.packlist .include "../../lang/perl5/module.mk" diff --git a/textproc/regexx/Makefile b/textproc/regexx/Makefile index 5d9c4f513e8..d2b42dd4794 100644 --- a/textproc/regexx/Makefile +++ b/textproc/regexx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/10/04 22:01:00 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2008/06/20 01:09:38 joerg Exp $ # DISTNAME= regexx-0.98.1 @@ -10,6 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://sourceforge.net/projects/regexx/ COMMENT= C++ regular expression library +PKG_DESTDIR_SUPPORT= user-destdir + USE_LANGUAGES= c c++ USE_TOOLS+= gmake USE_LIBTOOL= YES diff --git a/textproc/robodoc/Makefile b/textproc/robodoc/Makefile index 29e00210161..7afb1a0f89f 100644 --- a/textproc/robodoc/Makefile +++ b/textproc/robodoc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/09/09 02:46:08 obache Exp $ +# $NetBSD: Makefile,v 1.13 2008/06/20 01:09:38 joerg Exp $ # DISTNAME= robodoc-3.2.3 @@ -10,6 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://sourceforge.net/projects/robodoc/ COMMENT= Tool to support project documentation within source code +PKG_DESTDIR_SUPPORT= user-destdir + GNU_CONFIGURE= YES USE_TOOLS+= gm4 gmake diff --git a/textproc/ruby-native-hyperestraier/Makefile b/textproc/ruby-native-hyperestraier/Makefile index 827f904031d..3e818c436da 100644 --- a/textproc/ruby-native-hyperestraier/Makefile +++ b/textproc/ruby-native-hyperestraier/Makefile @@ -1,5 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2008/06/19 15:18:31 taca Exp $ +# $NetBSD: Makefile,v 1.3 2008/06/20 01:09:38 joerg Exp $ # +PKG_DESTDIR_SUPPORT= user-destdir .include "../../textproc/hyperestraier/Makefile.common" diff --git a/textproc/ruby-pure-hyperestraier/Makefile b/textproc/ruby-pure-hyperestraier/Makefile index eae6bf70d83..fdaed8760e7 100644 --- a/textproc/ruby-pure-hyperestraier/Makefile +++ b/textproc/ruby-pure-hyperestraier/Makefile @@ -1,5 +1,6 @@ -# $NetBSD: Makefile,v 1.3 2008/06/19 15:18:31 taca Exp $ +# $NetBSD: Makefile,v 1.4 2008/06/20 01:09:38 joerg Exp $ # +PKG_DESTDIR_SUPPORT= user-destdir .include "../../textproc/hyperestraier/Makefile.common" diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile index 22a7d352673..00e9c13cd9b 100644 --- a/textproc/sablotron/Makefile +++ b/textproc/sablotron/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2007/02/22 19:27:17 wiz Exp $ +# $NetBSD: Makefile,v 1.41 2008/06/20 01:09:38 joerg Exp $ DISTNAME= Sablot-1.0.2 PKGNAME= ${DISTNAME:S/Sablot/sablotron/} @@ -10,6 +10,8 @@ MAINTAINER= uithuis@dds.nl HOMEPAGE= http://www.gingerall.com/charlie/ga/xml/p_sab.xml COMMENT= XML toolkit implementing XSLT, DOM, and XPath +PKG_DESTDIR_SUPPORT= user-destdir + BUILD_DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser GNU_CONFIGURE= YES diff --git a/textproc/scew/Makefile b/textproc/scew/Makefile index ad11c217503..a7ddf3de696 100644 --- a/textproc/scew/Makefile +++ b/textproc/scew/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2008/04/19 05:45:55 obache Exp $ +# $NetBSD: Makefile,v 1.7 2008/06/20 01:09:38 joerg Exp $ # DISTNAME= scew-0.3.1 @@ -11,6 +11,7 @@ HOMEPAGE= http://www.nongnu.org/scew/ COMMENT= Light-weight DOM-like object model API for Expat PKG_INSTALLATION_TYPES= overwrite pkgviews +PKG_DESTDIR_SUPPORT= user-destdir GNU_CONFIGURE= YES diff --git a/textproc/source-highlight/Makefile b/textproc/source-highlight/Makefile index 973a2f89f96..8cc1eab57b8 100644 --- a/textproc/source-highlight/Makefile +++ b/textproc/source-highlight/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2008/03/13 16:45:33 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2008/06/20 01:09:38 joerg Exp $ # DISTNAME= source-highlight-2.9 @@ -10,6 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.gnu.org/software/src-highlite/ COMMENT= Highlight syntax of various languages source into HTML document +PKG_DESTDIR_SUPPORT= user-destdir + DEPENDS+= exctags-[0-9]*:../../devel/exctags GNU_CONFIGURE= YES diff --git a/textproc/vis/Makefile b/textproc/vis/Makefile index bc596ae7d35..3e3c8aae74e 100644 --- a/textproc/vis/Makefile +++ b/textproc/vis/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/12/05 20:51:08 rillig Exp $ +# $NetBSD: Makefile,v 1.7 2008/06/20 01:09:38 joerg Exp $ # DISTNAME= vis-0.1 @@ -8,7 +8,11 @@ MASTER_SITES= ftp://ftp.astron.com/pub/people/christos/ MAINTAINER= christos@NetBSD.org COMMENT= Convert strings from/to a visual format +PKG_DESTDIR_SUPPORT= user-destdir + MAKE_ENV+= BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} \ MANOWN=${MANOWN:Q} MANGRP=${MANGRP:Q} +INSTALLATION_DIRS= bin ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1 + .include "../../mk/bsd.pkg.mk" diff --git a/textproc/wbxml2/Makefile b/textproc/wbxml2/Makefile index 0e057019e55..6db28c92ad6 100644 --- a/textproc/wbxml2/Makefile +++ b/textproc/wbxml2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2008/01/12 14:05:17 dillo Exp $ +# $NetBSD: Makefile,v 1.2 2008/06/20 01:09:38 joerg Exp $ # DISTNAME= wbxml2-0.9.2 @@ -9,6 +9,8 @@ MAINTAINER= dillo@NetBSD.org HOMEPAGE= http://wbxmllib.sourceforge.net/ COMMENT= Library to handle WAP binary XML files +PKG_DESTDIR_SUPPORT= user-destdir + USE_TOOLS+= pkg-config USE_TOOLS+= aclocal autoheader automake autoconf USE_LANGUAGES= c c++ diff --git a/textproc/xalan-c/Makefile b/textproc/xalan-c/Makefile index 090b123409c..aba7c725bf0 100644 --- a/textproc/xalan-c/Makefile +++ b/textproc/xalan-c/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2008/01/24 07:17:33 xtraeme Exp $ +# $NetBSD: Makefile,v 1.25 2008/06/20 01:09:38 joerg Exp $ # DISTNAME= Xalan-C_1_10_0-src @@ -11,6 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://xml.apache.org/xalan-c/ COMMENT= XSLT processor of the Apache Project +PKG_DESTDIR_SUPPORT= user-destdir + WRKSRC= ${WRKDIR}/xml-xalan/c USE_TOOLS+= gmake USE_LANGUAGES= c c++ |