- Update to 2.3.4

PR:		ports/126992
Submitted by:	Yoshiaki Uchikawa <yoshiaki at kt.rim.or.jp>

- Eliminate the need of different plist files by using PLIST_SUB

6 files changed, 28 insertions, 272 deletions

diff --git a/math/pari/Makefile b/math/pari/Makefile
index 4c4c0fbe4d6c..e2b8dd8cb0c1 100644
--- a/math/pari/Makefile
+++ b/math/pari/Makefile
@@ -24,30 +24,31 @@ PLIST_SUB=	MAJOR_VERSION=${MAJOR_VERSION} MINOR_VERSION=${MINOR_VERSION} REV_VER
 
 MAJOR_VERSION=	2
 MINOR_VERSION=	3
-REV_VERSION=	3
+REV_VERSION=	4
 
 MAN1=		gp.1 gphelp.1 gp-${MAJOR_VERSION}.${MINOR_VERSION}.1 tex2mail.1
 MLINKS=		gp.1 pari.1
 
 .include <bsd.port.pre.mk>
 
-post-install:
-	@if [ -L ${PREFIX}/man/man1/pari.1 ]; then \
-		${RM} -f ${PREFIX}/man/man1/pari.1 ;\
-	fi
-
 HAVE_EMACS!=	${WHICH} emacs || ${ECHO} nope
 HAVE_PERL!=	${WHICH} perl || ${ECHO} nope
+
 .if ${HAVE_EMACS} != "nope"
-.if ${HAVE_PERL} != "nope"
-PLIST=		${PKGDIR}/pkg-plist.emacs.perl
+PLIST_SUB+=	EMACS=""
 .else
-PLIST=		${PKGDIR}/pkg-plit.emacs.noperl
+PLIST_SUB+=	EMACS="@comment "
 .endif
-.else
+
 .if ${HAVE_PERL} != "nope"
-PLIST=		${PKGDIR}/pkg-plist.perl
-.endif
+PLIST_SUB+=	PERL=""
+.else
+PLIST_SUB+=	PERL="@comment "
 .endif
 
+post-install:
+	@if [ -L ${PREFIX}/man/man1/pari.1 ]; then \
+		${RM} -f ${PREFIX}/man/man1/pari.1 ;\
+	fi
+
 .include <bsd.port.post.mk>
diff --git a/math/pari/distinfo b/math/pari/distinfo
index dbc0975aab15..0b35d441fac6 100644
--- a/math/pari/distinfo
+++ b/math/pari/distinfo
@@ -1,3 +1,3 @@
-MD5 (pari-2.3.3.tar.gz) = 6f858b5f634eaba018d99319ace4747e
-SHA256 (pari-2.3.3.tar.gz) = 829e61bccb96a1d11c3a52631b25be3913470146a3747dae154917acd4d53280
-SIZE (pari-2.3.3.tar.gz) = 2016896
+MD5 (pari-2.3.4.tar.gz) = 35c896266e4257793387ba22d5d76078
+SHA256 (pari-2.3.4.tar.gz) = 284b241f65ea011942b50655c2e8036cdde66e3a9973d08acd50835debaf545d
+SIZE (pari-2.3.4.tar.gz) = 2024690
diff --git a/math/pari/pkg-plist b/math/pari/pkg-plist
index b1242759f90e..569f3144ad1d 100644
--- a/math/pari/pkg-plist
+++ b/math/pari/pkg-plist
@@ -28,11 +28,11 @@ lib/pari/pari.cfg
 %%DOCSDIR%%/CHANGES
 %%DOCSDIR%%/COMPAT
 %%DOCSDIR%%/COPYING
-%%DOCSDIR%%/CVS.txt
 %%DOCSDIR%%/MACHINES
 %%DOCSDIR%%/NEW
 %%DOCSDIR%%/README
-%%DOCSDIR%%/TODO
+%%PERL%%%%DOCSDIR%%/PARI/822.pm
+%%PERL%%%%DOCSDIR%%/pari.desc
 %%DOCSDIR%%/misc/README
 %%DOCSDIR%%/misc/color.dft
 %%DOCSDIR%%/misc/gpalias
@@ -69,9 +69,19 @@ lib/pari/pari.cfg
 %%DOCSDIR%%/examples/rho.gp
 %%DOCSDIR%%/examples/squfof.gp
 %%DOCSDIR%%/examples/taylor.gp
+%%EMACS%%share/emacs/site-lisp/pari/pari-conf.el
+%%EMACS%%share/emacs/site-lisp/pari/pari-completion.el
+%%EMACS%%share/emacs/site-lisp/pari/pari-fontification.el
+%%EMACS%%share/emacs/site-lisp/pari/pari-help.el
+%%EMACS%%share/emacs/site-lisp/pari/pari-messages.el
+%%EMACS%%share/emacs/site-lisp/pari/pari.el
+%%EMACS%%share/emacs/site-lisp/pari/pariemacs.txt
+%%EMACS%%share/emacs/site-lisp/pari/sli-tools.el
 @dirrm include/pari
 @dirrm lib/pari
 @dirrm %%DOCSDIR%%/misc
 @dirrm %%DOCSDIR%%/doc
 @dirrm %%DOCSDIR%%/examples
+%%PERL%%@dirrm %%DOCSDIR%%/PARI
 @dirrm %%DOCSDIR%%
+%%EMACS%%@dirrm share/emacs/site-lisp/pari
diff --git a/math/pari/pkg-plist.emacs.noperl b/math/pari/pkg-plist.emacs.noperl
deleted file mode 100644
index 70e6f88db768..000000000000
--- a/math/pari/pkg-plist.emacs.noperl
+++ /dev/null
@@ -1,86 +0,0 @@
-bin/gp-%%MAJOR_VERSION%%.%%MINOR_VERSION%%
-bin/gp
-bin/tex2mail
-bin/gphelp
-include/pari/paricfg.h
-include/pari/pariinl.h
-include/pari/pari.h
-include/pari/parinf.h
-include/pari/pariold.h
-include/pari/paripriv.h
-include/pari/paritune.h
-include/pari/paritype.h
-include/pari/paricast.h
-include/pari/paricom.h
-include/pari/parierr.h
-include/pari/parigen.h
-include/pari/paristio.h
-include/pari/parisys.h
-include/pari/pariport.h
-include/pari/paridecl.h
-include/pari/genpari.h
-lib/libpari.so.%%MAJOR_VERSION%%.%%MINOR_VERSION%%.%%REV_VERSION%%
-lib/libpari.so.%%MAJOR_VERSION%%
-lib/libpari.so
-lib/pari/pari.cfg
-%%DOCSDIR%%/AUTHORS
-%%DOCSDIR%%/Announce.2.1
-%%DOCSDIR%%/CHANGES
-%%DOCSDIR%%/COMPAT
-%%DOCSDIR%%/COPYING
-%%DOCSDIR%%/CVS.txt
-%%DOCSDIR%%/MACHINES
-%%DOCSDIR%%/NEW
-%%DOCSDIR%%/README
-%%DOCSDIR%%/TODO
-%%DOCSDIR%%/misc/README
-%%DOCSDIR%%/misc/color.dft
-%%DOCSDIR%%/misc/gpalias
-%%DOCSDIR%%/misc/gpflog
-%%DOCSDIR%%/misc/gprc.dft
-%%DOCSDIR%%/misc/new.dic
-%%DOCSDIR%%/misc/pari.xpm
-%%DOCSDIR%%/misc/xgp
-%%DOCSDIR%%/doc/Makefile
-%%DOCSDIR%%/doc/translations
-%%DOCSDIR%%/doc/appa.tex
-%%DOCSDIR%%/doc/appb.tex
-%%DOCSDIR%%/doc/appc.tex
-%%DOCSDIR%%/doc/paricfg.tex
-%%DOCSDIR%%/doc/parimacro.tex
-%%DOCSDIR%%/doc/pdfmacs.tex
-%%DOCSDIR%%/doc/refcard.tex
-%%DOCSDIR%%/doc/tutorial.tex
-%%DOCSDIR%%/doc/users.tex
-%%DOCSDIR%%/doc/usersch1.tex
-%%DOCSDIR%%/doc/usersch2.tex
-%%DOCSDIR%%/doc/usersch3.tex
-%%DOCSDIR%%/doc/usersch4.tex
-%%DOCSDIR%%/doc/usersch5.tex
-%%DOCSDIR%%/examples/EXPLAIN
-%%DOCSDIR%%/examples/Inputrc
-%%DOCSDIR%%/examples/Makefile
-%%DOCSDIR%%/examples/bench.gp
-%%DOCSDIR%%/examples/cl.gp
-%%DOCSDIR%%/examples/classno.gp
-%%DOCSDIR%%/examples/contfrac.gp
-%%DOCSDIR%%/examples/extgcd.c
-%%DOCSDIR%%/examples/lucas.gp
-%%DOCSDIR%%/examples/rho.gp
-%%DOCSDIR%%/examples/squfof.gp
-%%DOCSDIR%%/examples/taylor.gp
-share/emacs/site-lisp/pari/pari-conf.el
-share/emacs/site-lisp/pari/pari-completion.el
-share/emacs/site-lisp/pari/pari-fontification.el
-share/emacs/site-lisp/pari/pari-help.el
-share/emacs/site-lisp/pari/pari-messages.el
-share/emacs/site-lisp/pari/pari.el
-share/emacs/site-lisp/pari/pariemacs.txt
-share/emacs/site-lisp/pari/sli-tools.el
-@dirrm include/pari
-@dirrm lib/pari
-@dirrm %%DOCSDIR%%/misc
-@dirrm %%DOCSDIR%%/doc
-@dirrm %%DOCSDIR%%/examples
-@dirrm %%DOCSDIR%%
-@dirrm share/emacs/site-lisp/pari
diff --git a/math/pari/pkg-plist.emacs.perl b/math/pari/pkg-plist.emacs.perl
deleted file mode 100644
index dbda30011bb5..000000000000
--- a/math/pari/pkg-plist.emacs.perl
+++ /dev/null
@@ -1,89 +0,0 @@
-bin/gp-%%MAJOR_VERSION%%.%%MINOR_VERSION%%
-bin/gp
-bin/tex2mail
-bin/gphelp
-include/pari/paricfg.h
-include/pari/pariinl.h
-include/pari/pari.h
-include/pari/parinf.h
-include/pari/pariold.h
-include/pari/paripriv.h
-include/pari/paritune.h
-include/pari/paritype.h
-include/pari/paricast.h
-include/pari/paricom.h
-include/pari/parierr.h
-include/pari/parigen.h
-include/pari/paristio.h
-include/pari/parisys.h
-include/pari/pariport.h
-include/pari/paridecl.h
-include/pari/genpari.h
-lib/libpari.so.%%MAJOR_VERSION%%.%%MINOR_VERSION%%.%%REV_VERSION%%
-lib/libpari.so.%%MAJOR_VERSION%%
-lib/libpari.so
-lib/pari/pari.cfg
-%%DOCSDIR%%/AUTHORS
-%%DOCSDIR%%/Announce.2.1
-%%DOCSDIR%%/CHANGES
-%%DOCSDIR%%/COMPAT
-%%DOCSDIR%%/COPYING
-%%DOCSDIR%%/CVS.txt
-%%DOCSDIR%%/MACHINES
-%%DOCSDIR%%/NEW
-%%DOCSDIR%%/README
-%%DOCSDIR%%/TODO
-%%DOCSDIR%%/PARI/822.pm
-%%DOCSDIR%%/pari.desc
-%%DOCSDIR%%/misc/README
-%%DOCSDIR%%/misc/color.dft
-%%DOCSDIR%%/misc/gpalias
-%%DOCSDIR%%/misc/gpflog
-%%DOCSDIR%%/misc/gprc.dft
-%%DOCSDIR%%/misc/new.dic
-%%DOCSDIR%%/misc/pari.xpm
-%%DOCSDIR%%/misc/xgp
-%%DOCSDIR%%/doc/Makefile
-%%DOCSDIR%%/doc/translations
-%%DOCSDIR%%/doc/appa.tex
-%%DOCSDIR%%/doc/appb.tex
-%%DOCSDIR%%/doc/appc.tex
-%%DOCSDIR%%/doc/paricfg.tex
-%%DOCSDIR%%/doc/parimacro.tex
-%%DOCSDIR%%/doc/pdfmacs.tex
-%%DOCSDIR%%/doc/refcard.tex
-%%DOCSDIR%%/doc/tutorial.tex
-%%DOCSDIR%%/doc/users.tex
-%%DOCSDIR%%/doc/usersch1.tex
-%%DOCSDIR%%/doc/usersch2.tex
-%%DOCSDIR%%/doc/usersch3.tex
-%%DOCSDIR%%/doc/usersch4.tex
-%%DOCSDIR%%/doc/usersch5.tex
-%%DOCSDIR%%/examples/EXPLAIN
-%%DOCSDIR%%/examples/Inputrc
-%%DOCSDIR%%/examples/Makefile
-%%DOCSDIR%%/examples/bench.gp
-%%DOCSDIR%%/examples/cl.gp
-%%DOCSDIR%%/examples/classno.gp
-%%DOCSDIR%%/examples/contfrac.gp
-%%DOCSDIR%%/examples/extgcd.c
-%%DOCSDIR%%/examples/lucas.gp
-%%DOCSDIR%%/examples/rho.gp
-%%DOCSDIR%%/examples/squfof.gp
-%%DOCSDIR%%/examples/taylor.gp
-share/emacs/site-lisp/pari/pari-conf.el
-share/emacs/site-lisp/pari/pari-completion.el
-share/emacs/site-lisp/pari/pari-fontification.el
-share/emacs/site-lisp/pari/pari-help.el
-share/emacs/site-lisp/pari/pari-messages.el
-share/emacs/site-lisp/pari/pari.el
-share/emacs/site-lisp/pari/pariemacs.txt
-share/emacs/site-lisp/pari/sli-tools.el
-@dirrm include/pari
-@dirrm lib/pari
-@dirrm %%DOCSDIR%%/misc
-@dirrm %%DOCSDIR%%/doc
-@dirrm %%DOCSDIR%%/examples
-@dirrm %%DOCSDIR%%/PARI
-@dirrm %%DOCSDIR%%
-@dirrm share/emacs/site-lisp/pari
diff --git a/math/pari/pkg-plist.perl b/math/pari/pkg-plist.perl
deleted file mode 100644
index faf1e0da5881..000000000000
--- a/math/pari/pkg-plist.perl
+++ /dev/null
@@ -1,80 +0,0 @@
-bin/gp-%%MAJOR_VERSION%%.%%MINOR_VERSION%%
-bin/gp
-bin/tex2mail
-bin/gphelp
-include/pari/paricfg.h
-include/pari/pariinl.h
-include/pari/pari.h
-include/pari/parinf.h
-include/pari/pariold.h
-include/pari/paripriv.h
-include/pari/paritune.h
-include/pari/paritype.h
-include/pari/paricast.h
-include/pari/paricom.h
-include/pari/parierr.h
-include/pari/parigen.h
-include/pari/paristio.h
-include/pari/parisys.h
-include/pari/pariport.h
-include/pari/paridecl.h
-include/pari/genpari.h
-lib/libpari.so.%%MAJOR_VERSION%%.%%MINOR_VERSION%%.%%REV_VERSION%%
-lib/libpari.so.%%MAJOR_VERSION%%
-lib/libpari.so
-lib/pari/pari.cfg
-%%DOCSDIR%%/AUTHORS
-%%DOCSDIR%%/Announce.2.1
-%%DOCSDIR%%/CHANGES
-%%DOCSDIR%%/COMPAT
-%%DOCSDIR%%/COPYING
-%%DOCSDIR%%/CVS.txt
-%%DOCSDIR%%/MACHINES
-%%DOCSDIR%%/NEW
-%%DOCSDIR%%/README
-%%DOCSDIR%%/TODO
-%%DOCSDIR%%/PARI/822.pm
-%%DOCSDIR%%/pari.desc
-%%DOCSDIR%%/misc/README
-%%DOCSDIR%%/misc/color.dft
-%%DOCSDIR%%/misc/gpalias
-%%DOCSDIR%%/misc/gpflog
-%%DOCSDIR%%/misc/gprc.dft
-%%DOCSDIR%%/misc/new.dic
-%%DOCSDIR%%/misc/pari.xpm
-%%DOCSDIR%%/misc/xgp
-%%DOCSDIR%%/doc/Makefile
-%%DOCSDIR%%/doc/translations
-%%DOCSDIR%%/doc/appa.tex
-%%DOCSDIR%%/doc/appb.tex
-%%DOCSDIR%%/doc/appc.tex
-%%DOCSDIR%%/doc/paricfg.tex
-%%DOCSDIR%%/doc/parimacro.tex
-%%DOCSDIR%%/doc/pdfmacs.tex
-%%DOCSDIR%%/doc/refcard.tex
-%%DOCSDIR%%/doc/tutorial.tex
-%%DOCSDIR%%/doc/users.tex
-%%DOCSDIR%%/doc/usersch1.tex
-%%DOCSDIR%%/doc/usersch2.tex
-%%DOCSDIR%%/doc/usersch3.tex
-%%DOCSDIR%%/doc/usersch4.tex
-%%DOCSDIR%%/doc/usersch5.tex
-%%DOCSDIR%%/examples/EXPLAIN
-%%DOCSDIR%%/examples/Inputrc
-%%DOCSDIR%%/examples/Makefile
-%%DOCSDIR%%/examples/bench.gp
-%%DOCSDIR%%/examples/cl.gp
-%%DOCSDIR%%/examples/classno.gp
-%%DOCSDIR%%/examples/contfrac.gp
-%%DOCSDIR%%/examples/extgcd.c
-%%DOCSDIR%%/examples/lucas.gp
-%%DOCSDIR%%/examples/rho.gp
-%%DOCSDIR%%/examples/squfof.gp
-%%DOCSDIR%%/examples/taylor.gp
-@dirrm include/pari
-@dirrm lib/pari
-@dirrm %%DOCSDIR%%/misc
-@dirrm %%DOCSDIR%%/doc
-@dirrm %%DOCSDIR%%/examples
-@dirrm %%DOCSDIR%%/PARI
-@dirrm %%DOCSDIR%%