[gentoo-commits] proj/eselect-php:master commit in: /

[gentoo-commits] proj/eselect-php:master commit in: /

[Brian Evans]

commit:     f5ebd802731de439298b330e64294f47662a1dd7
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 11 13:56:20 2017 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Jul 11 13:56:20 2017 +0000
URL:        https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=f5ebd802

Add .gitignore

 .gitignore | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..d738a79
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,13 @@
+# These should not be committed ever
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache/
+config.log
+config.status
+configure
+doc/php-fpm.example.init
+install-sh
+missing
+src/php.eselect
+src/php.eselect.in

[gentoo-commits] proj/eselect-php:master commit in: /

[Michael Orlitzky]

commit:     6a331954f206e4a0e0dfbed60f721a1ee53ffe82
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  5 20:12:45 2023 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Tue Dec  5 20:12:45 2023 +0000
URL:        https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=6a331954

autogen.sh: remove file

I think we can assume familiarity with "autoreconf -fi" these days.

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 autogen.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index 89dcaff..0000000
--- a/autogen.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh -x
-exec autoreconf -fi

[gentoo-commits] proj/eselect-php:master commit in: /

[Michael Orlitzky]

commit:     8fe9b4bfedfc574baca57c70f519d39a3f778010
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 26 22:54:15 2023 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed Jul 26 22:54:54 2023 +0000
URL:        https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=8fe9b4bf

configure.ac: update to version 0.9.9

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index cc40547..408ff80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([eselect-php],[0.9.8])
+AC_INIT([eselect-php],[0.9.9])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([-Wall foreign no-dist-gzip dist-xz tar-ustar])
 

[gentoo-commits] proj/eselect-php:master commit in: /

[Brian Evans]

commit:     1c6a7ababe3737463a24453e18e40df3d01a7774
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 25 15:16:36 2021 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Oct 25 15:16:36 2021 +0000
URL:        https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=1c6a7aba

Bump version to 0.9.8

Signed-off-by: Brian Evans <grknight <AT> gentoo.org>

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index fc78d0b..cc40547 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([eselect-php],[0.9.7])
+AC_INIT([eselect-php],[0.9.8])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([-Wall foreign no-dist-gzip dist-xz tar-ustar])
 

[gentoo-commits] proj/eselect-php:master commit in: /

[Michael Orlitzky]

commit:     1fea0949fc7f9847dc0b291d47c3407444d5bb8e
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 17 12:05:21 2021 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Tue Aug 17 12:05:43 2021 +0000
URL:        https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=1fea0949

configure.ac: rename AC_HELP_STRING -> AS_HELP_STRING.

This change is suggested by "autoupdate" with autoconf-2.71.

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 84e8276..fc78d0b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([eselect-php], [0.9.7])
+AC_INIT([eselect-php],[0.9.7])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([-Wall foreign no-dist-gzip dist-xz tar-ustar])
 
@@ -34,7 +34,7 @@ AC_ARG_ENABLE(
   AM_CONDITIONAL([FPM], [test x$fpm = xtrue])
 
 piddir=${piddir="@LOCALSTATEDIR@"}
-AC_ARG_WITH(piddir, AC_HELP_STRING([--with-piddir=DIR],
+AC_ARG_WITH(piddir, AS_HELP_STRING([--with-piddir=DIR],
 	[where php-fpm PID files are placed [LOCALSTATEDIR]]),
 	if test x$withval != x -a x$withval != xno -a x$withval != xyes; then
 		piddir="$withval"

[gentoo-commits] proj/eselect-php:master commit in: /

[Brian Evans]

commit:     e4f4b66850fe3e59de9728d9230b7c286194ccb4
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  8 02:24:15 2020 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Dec  8 02:24:15 2020 +0000
URL:        https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=e4f4b668

Version bump to 0.9.7

Signed-off-by: Brian Evans <grknight <AT> gentoo.org>

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 3246bee..84e8276 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([eselect-php], [0.9.6])
+AC_INIT([eselect-php], [0.9.7])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([-Wall foreign no-dist-gzip dist-xz tar-ustar])
 

[gentoo-commits] proj/eselect-php:master commit in: /

[Michael Orlitzky]

commit:     3b66d2648d5bd51f0df64d9dbba9dfa8082cdcff
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 22 22:55:53 2020 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Thu Jan 23 15:05:49 2020 +0000
URL:        https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=3b66d264

configure.ac: update to version 0.9.6.

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index bebbeca..1b935fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([eselect-php], [0.9.5])
+AC_INIT([eselect-php], [0.9.6])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([-Wall foreign no-dist-gzip dist-xz tar-ustar])
 

[gentoo-commits] proj/eselect-php:master commit in: /

[Michael Orlitzky]

commit:     b341d98c011d3a829c2a5b40a6c5b83680d6d98e
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 22 23:21:45 2020 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Thu Jan 23 15:05:58 2020 +0000
URL:        https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=b341d98c

Makefile.am: remove redundant $(srcdir)s.

The $(srcdir) in Makefile.am is implicit. Let's keep it that way.

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 Makefile.am | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index e425c84..df6430a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,33 +1,33 @@
 eselectdir = $(datadir)/eselect/modules
-nodist_eselect_DATA = $(srcdir)/src/php.eselect
+nodist_eselect_DATA = src/php.eselect
 
 # Without EXTRA_DIST, these files don't wind up in the tarball.
-EXTRA_DIST = $(srcdir)/openrc \
-             $(srcdir)/src/70_mod_php.conf.in \
-             $(srcdir)/src/php-fpm-launcher.in \
-             $(srcdir)/src/php-fpm.logrotate.in
+EXTRA_DIST = openrc \
+             src/70_mod_php.conf.in \
+             src/php-fpm-launcher.in \
+             src/php-fpm.logrotate.in
 
 if APACHE2
   # Without these set, we won't try to install the conf file.
   apacheconfdir = $(sysconfdir)/apache2/modules.d
-  nodist_apacheconf_DATA = $(srcdir)/src/70_mod_php.conf
+  nodist_apacheconf_DATA = src/70_mod_php.conf
 endif
 
 if FPM
   # Same as the APACHE2 conditional.
   initdir = $(sysconfdir)/init.d
-  nodist_init_SCRIPTS = $(srcdir)/openrc/init.d/php-fpm
+  nodist_init_SCRIPTS = openrc/init.d/php-fpm
 
   confdir = $(sysconfdir)/conf.d
-  nodist_conf_DATA = $(srcdir)/openrc/conf.d/php-fpm
+  nodist_conf_DATA = openrc/conf.d/php-fpm
 
-  nodist_libexec_SCRIPTS = $(srcdir)/src/php-fpm-launcher
+  nodist_libexec_SCRIPTS = src/php-fpm-launcher
 
   logrotatedir = $(sysconfdir)/logrotate.d
-  nodist_logrotate_DATA = $(srcdir)/src/php-fpm.logrotate
+  nodist_logrotate_DATA = src/php-fpm.logrotate
 
   tmpfilesdir = $(prefix)/lib/tmpfiles.d
-  dist_tmpfiles_DATA = $(srcdir)/src/php-fpm.conf
+  dist_tmpfiles_DATA = src/php-fpm.conf
 endif
 
 # The next few rules allow us to replace bindir, libdir, etc.
@@ -48,8 +48,8 @@ $(nodist_eselect_DATA) $(nodist_apacheconf_DATA) $(nodist_init_SCRIPTS) $(nodist
 	  $(edit) $${srcdir}$@.in > $@.tmp
 	mv $@.tmp $@
 
-$(srcdir)/src/php.eselect: $(srcdir)/src/php.eselect.in
-$(srcdir)/src/php-fpm-launcher: $(srcdir)/src/php-fpm-launcher.in
-$(srcdir)/src/php-fpm.logrotate: $(srcdir)/src/php-fpm.logrotate.in
-$(srcdir)/src/70_mod_php.conf: $(srcdir)/src/70_mod_php.conf.in
-$(srcdir)/openrc/init.d/php-fpm: $(srcdir)/openrc/init.d/php-fpm.in
+src/php.eselect: src/php.eselect.in
+src/php-fpm-launcher: src/php-fpm-launcher.in
+src/php-fpm.logrotate: src/php-fpm.logrotate.in
+src/70_mod_php.conf: src/70_mod_php.conf.in
+openrc/init.d/php-fpm: openrc/init.d/php-fpm.in

[gentoo-commits] proj/eselect-php:master commit in: /

[Michael Orlitzky]

commit:     b3a0380c97e279311c3c6ffa145f6ea31e429539
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 22 00:29:31 2020 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed Jan 22 14:59:04 2020 +0000
URL:        https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=b3a0380c

Makefile.am: substitute @LIBEXECDIR <AT>  in "*.in" files.

We're already substituting a few other GNU directories, and we'll
need the libexecdir in the future.

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile.am b/Makefile.am
index 1d3122a..f351b49 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,6 +25,7 @@ endif
 # "Installation Directory Variables" section.
 edit = sed -e 's|@BINDIR[@]|$(bindir)|g' \
            -e 's|@LIBDIR[@]|$(libdir)|g' \
+           -e 's|@LIBEXECDIR[@]|$(libexecdir)|g' \
            -e 's|@LOCALSTATEDIR[@]|$(localstatedir)|g' \
            -e 's|@SYSCONFDIR[@]|$(sysconfdir)|g'
 

[gentoo-commits] proj/eselect-php:master commit in: /

[Michael Orlitzky]

commit:     9069823300165d28fb1253e7d516d08c122aacdb
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 22 01:05:36 2020 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed Jan 22 14:59:32 2020 +0000
URL:        https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=90698233

configure.ac: use "ustar" format for the release tarballs.

The default tar format used by autotools is the historical v7 format,
which sucks. Let's use the improved "ustar" format instead. The
automake documentation has more information if this is the sort of
thing that interests you.

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 715e7e2..bebbeca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_INIT([eselect-php], [0.9.5])
 AC_CONFIG_AUX_DIR([build-aux])
-AM_INIT_AUTOMAKE([-Wall foreign no-dist-gzip dist-xz])
+AM_INIT_AUTOMAKE([-Wall foreign no-dist-gzip dist-xz tar-ustar])
 
 AC_PROG_LN_S
 AC_PROG_MKDIR_P

[gentoo-commits] proj/eselect-php:master commit in: /

[Michael Orlitzky]

commit:     de0b86066071596bf780b8ba3855fef8a2fbc094
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 22 01:03:56 2020 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed Jan 22 14:59:25 2020 +0000
URL:        https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=de0b8606

configure.ac: place build artifacts in the "build-aux" directory.

During the build, autotools generates a bunch of files that need a
place to live. By default, most of them (the "missing" script, for
example) wind up in the project root. This commit sets

  AC_CONFIG_AUX_DIR([build-aux])

in configure.ac so that the aforementioned files are placed in the
build-aux directory instead.

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 .gitignore   | 3 +--
 configure.ac | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5a461dd..97ae412 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,12 +3,11 @@ Makefile
 Makefile.in
 aclocal.m4
 autom4te.cache/
+build-aux/
 config.log
 config.status
 configure
 openrc/init.d/php-fpm
 openrc/init.d/php-fpm.in
-install-sh
-missing
 src/php.eselect
 src/php.eselect.in

diff --git a/configure.ac b/configure.ac
index 5c27275..715e7e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,5 @@
 AC_INIT([eselect-php], [0.9.5])
+AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([-Wall foreign no-dist-gzip dist-xz])
 
 AC_PROG_LN_S

[gentoo-commits] proj/eselect-php:master commit in: /

[Michael Orlitzky]

commit:     c2053ec0f5ae468da0f80076dc81bed88346c7f0
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 13 17:43:59 2018 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Fri Apr 13 17:43:59 2018 +0000
URL:        https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=c2053ec0

configure.ac: update to version 0.9.5.

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 9197432..5c27275 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([eselect-php], [0.9.4])
+AC_INIT([eselect-php], [0.9.5])
 AM_INIT_AUTOMAKE([-Wall foreign no-dist-gzip dist-xz])
 
 AC_PROG_LN_S

[gentoo-commits] proj/eselect-php:master commit in: /

[Michael Orlitzky]

commit:     14a9eff36b572509af2099b69fe233dd80bf8b90
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 26 15:55:21 2017 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed Jul 26 15:55:21 2017 +0000
URL:        https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=14a9eff3

configure.ac: update to version 0.9.4.

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index a55baf8..9197432 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([eselect-php], [0.9.3])
+AC_INIT([eselect-php], [0.9.4])
 AM_INIT_AUTOMAKE([-Wall foreign no-dist-gzip dist-xz])
 
 AC_PROG_LN_S

[gentoo-commits] proj/eselect-php:master commit in: /

[Michael Orlitzky]

commit:     0b67931ad054c8d109ea89faa8844b1f5a02e8ec
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 26 00:17:53 2017 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed Jul 26 00:17:53 2017 +0000
URL:        https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=0b67931a

Install the php-fpm init scripts conditional on --enable-fpm.

 Makefile.am  | 13 +++++++++----
 configure.ac | 12 ++++++++++++
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 15b0ca8..08359dc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,5 @@
 eselectdir = $(datadir)/eselect/modules
 nodist_eselect_DATA = $(srcdir)/src/php.eselect
-initdir = $(sysconfdir)/init.d
-confdir = $(sysconfdir)/conf.d
-nodist_init_SCRIPTS = $(srcdir)/openrc/php-fpm
-nodist_conf_DATA = $(srcdir)/openrc/php-fpm.conf
 
 # Without EXTRA_DIST, these files don't wind up in the tarball.
 EXTRA_DIST = $(srcdir)/src/70_mod_php.conf.in openrc/*.*
@@ -14,6 +10,15 @@ if APACHE2
   nodist_apacheconf_DATA = $(srcdir)/src/70_mod_php.conf
 endif
 
+if FPM
+  # Same as the APACHE2 conditional.
+  initdir = $(sysconfdir)/init.d
+  nodist_init_SCRIPTS = $(srcdir)/openrc/php-fpm
+
+  confdir = $(sysconfdir)/conf.d
+  nodist_conf_DATA = $(srcdir)/openrc/php-fpm.conf
+endif
+
 # The next few rules allow us to replace bindir, libdir, etc.
 # within our script and conf file. The example is taken
 # from the autoconf documentation and can be found in the

diff --git a/configure.ac b/configure.ac
index 5e6ccfc..02aeaf2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,6 +20,18 @@ AC_ARG_ENABLE(
   esac],[apache2=false])
   AM_CONDITIONAL([APACHE2], [test x$apache2 = xtrue])
 
+# --enable-fpm flag, disabled by default, that decides whether or
+# not we install the php-fpm init script and config file.
+AC_ARG_ENABLE(
+	[fpm],
+	[  --enable-fpm    install the php-fpm init script [[default=no]]],
+	[case "${enableval}" in
+    yes) fpm=true ;;
+    no)  fpm=false ;;
+    *) AC_MSG_ERROR([bad value ${enableval} for --enable-fpm]) ;;
+  esac],[fpm=false])
+  AM_CONDITIONAL([FPM], [test x$fpm = xtrue])
+
 piddir=${piddir="@LOCALSTATEDIR@"}
 AC_ARG_WITH(piddir, AC_HELP_STRING([--with-piddir=DIR],
 	[where php-fpm PID files are placed [LOCALSTATEDIR]]),

[gentoo-commits] proj/eselect-php:master commit in: /

[Michael Orlitzky]

commit:     73eb1177d214d7d103b21162b45b45ed6117209f
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 25 23:50:31 2017 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Tue Jul 25 23:50:31 2017 +0000
URL:        https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=73eb1177

Makefile.am: install the php-fpm.conf file with "make install".

 Makefile.am | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index 2b3bf67..1abef9e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,9 @@
 eselectdir = $(datadir)/eselect/modules
 nodist_eselect_DATA = $(srcdir)/src/php.eselect
 initdir = $(sysconfdir)/init.d
+confdir = $(sysconfdir)/conf.d
 nodist_init_DATA = $(srcdir)/openrc/php-fpm
+nodist_conf_DATA = $(srcdir)/openrc/php-fpm.conf
 
 # Without EXTRA_DIST, these files don't wind up in the tarball.
 EXTRA_DIST = $(srcdir)/src/70_mod_php.conf.in openrc/*.*

[gentoo-commits] proj/eselect-php:master commit in: /

[Michael Orlitzky]

commit:     cb16f05a22acaf933a4204f6fa1d6bc3eb1a966a
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 26 00:03:35 2017 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed Jul 26 00:03:35 2017 +0000
URL:        https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=cb16f05a

Makefile.am: mark openrc/php-fpm as a script and not as data.

 Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 1abef9e..15b0ca8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ eselectdir = $(datadir)/eselect/modules
 nodist_eselect_DATA = $(srcdir)/src/php.eselect
 initdir = $(sysconfdir)/init.d
 confdir = $(sysconfdir)/conf.d
-nodist_init_DATA = $(srcdir)/openrc/php-fpm
+nodist_init_SCRIPTS = $(srcdir)/openrc/php-fpm
 nodist_conf_DATA = $(srcdir)/openrc/php-fpm.conf
 
 # Without EXTRA_DIST, these files don't wind up in the tarball.
@@ -23,7 +23,7 @@ edit = sed -e 's|@BINDIR[@]|$(bindir)|g' \
            -e 's|@LOCALSTATEDIR[@]|$(localstatedir)|g' \
            -e 's|@SYSCONFDIR[@]|$(sysconfdir)|g'
 
-$(nodist_eselect_DATA) $(nodist_apacheconf_DATA) $(nodist_init_DATA): Makefile
+$(nodist_eselect_DATA) $(nodist_apacheconf_DATA) $(nodist_init_SCRIPTS): Makefile
 	rm -f $@ $@.tmp
 	srcdir=''; \
 	  test -f ./$@.in || srcdir=$(srcdir)/; \

[gentoo-commits] proj/eselect-php:master commit in: /

[Michael Orlitzky]

commit:     cf07efeed862bb784ed397d8f7d56fa71b9da182
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 25 23:20:45 2017 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Tue Jul 25 23:20:45 2017 +0000
URL:        https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=cf07efee

configure.ac: update the version to 0.9.3.

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index ac55443..c7702d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([eselect-php], [0.9.2])
+AC_INIT([eselect-php], [0.9.3])
 AM_INIT_AUTOMAKE([-Wall foreign no-dist-gzip dist-xz])
 
 AC_PROG_LN_S

[gentoo-commits] proj/eselect-php:master commit in: /

[Michael Orlitzky]

commit:     116484c1e52c30d5737d7d3d6527853ce6f541f3
Author:     Michael Orlitzky <michael <AT> orlitzky <DOT> com>
AuthorDate: Wed Jul 19 14:05:38 2017 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed Jul 19 14:05:38 2017 +0000
URL:        https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=116484c1

Add intermediate file doc/php-fpm.example.init.in to gitignore.

 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index d738a79..9561ed8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ config.log
 config.status
 configure
 doc/php-fpm.example.init
+doc/php-fpm.example.init.in
 install-sh
 missing
 src/php.eselect

[gentoo-commits] proj/eselect-php:master commit in: /

[Michael Orlitzky]

commit:     cfcabb4ed80ba8c3332f84cf90764de491f5fd39
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 26 21:05:17 2016 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Tue Jul 26 21:26:27 2016 +0000
URL:        https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=cfcabb4e

Bump version to 0.9.2 in configure.ac.

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 851f574..d642dbd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([eselect-php], [0.9.1])
+AC_INIT([eselect-php], [0.9.2])
 AM_INIT_AUTOMAKE([-Wall foreign no-dist-gzip dist-xz])
 
 AC_PROG_LN_S

[gentoo-commits] proj/eselect-php:master commit in: /

[Michael Orlitzky]

commit:     699c006f0a4a70a45b62bf117fa606317d391a2e
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 22 20:52:23 2016 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 20:52:23 2016 +0000
URL:        https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=699c006f

Bump to v0.9.1 in configure.ac.

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index d5e5e28..851f574 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([eselect-php], [0.9.0])
+AC_INIT([eselect-php], [0.9.1])
 AM_INIT_AUTOMAKE([-Wall foreign no-dist-gzip dist-xz])
 
 AC_PROG_LN_S

[gentoo-commits] proj/eselect-php:master commit in: /

[Michael Orlitzky]

commit:     c9db6f77c9c3de6eed60bdc366a6c5c0ffc1eeef
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 22 19:58:55 2016 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 19:58:55 2016 +0000
URL:        https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=c9db6f77

Add 70_mod_php.conf.in to EXTRA_DIST in Makefile.am.

Without the extra hint, automake was omitting 70_mod_php.conf.in from
the tarball.

 Makefile.am | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index f7ffabe..d9220bd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,9 @@
 eselectdir = $(datadir)/eselect/modules
 nodist_eselect_DATA = $(srcdir)/src/php.eselect
 
+# Without this, the conf input file doesn't wind up in the tarball.
+EXTRA_DIST = $(srcdir)/src/70_mod_php.conf.in
+
 if APACHE2
   # Without these set, we won't try to install the conf file.
   apacheconfdir = $(sysconfdir)/apache2/modules.d

[gentoo-commits] proj/eselect-php:master commit in: /

[Michael Orlitzky]

commit:     1e20ed8f6a9e80e65f0193925128536ab6512908
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 22 19:45:56 2016 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 19:45:56 2016 +0000
URL:        https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=1e20ed8f

Bump to v0.9.0 in configure.ac.

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index f977807..d5e5e28 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([eselect-php], [0.8.5])
+AC_INIT([eselect-php], [0.9.0])
 AM_INIT_AUTOMAKE([-Wall foreign no-dist-gzip dist-xz])
 
 AC_PROG_LN_S

[gentoo-commits] proj/eselect-php:master commit in: /

[Michael Orlitzky]

commit:     014afaaab8d4343d2da0869392c1a262023b8712
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 22 19:39:58 2016 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 19:39:58 2016 +0000
URL:        https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=014afaaa

Add --enable-apache2 flag to the configure script.

The latest eselect-php ebuild allows users to avoid 70_mod_php.conf by
setting USE="-apache2". Now that the conf file is part of eselect-php,
we replicate that ability with --enable-apache2=no, or in fact by
default. To install the apache conf file, one passes --enable-apache2
to the configure script.

 Makefile.am  |  7 +++++--
 configure.ac | 14 ++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 1d1132e..f7ffabe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,11 @@
 eselectdir = $(datadir)/eselect/modules
 nodist_eselect_DATA = $(srcdir)/src/php.eselect
 
-apacheconfdir = $(sysconfdir)/apache2/modules.d
-nodist_apacheconf_DATA = $(srcdir)/src/70_mod_php.conf
+if APACHE2
+  # Without these set, we won't try to install the conf file.
+  apacheconfdir = $(sysconfdir)/apache2/modules.d
+  nodist_apacheconf_DATA = $(srcdir)/src/70_mod_php.conf
+endif
 
 # The next few rules allow us to replace bindir, libdir, and
 # localstatedir within our script and conf file. The example is taken

diff --git a/configure.ac b/configure.ac
index c118e0e..f977807 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,6 +7,20 @@ AC_PROG_SED
 AC_PATH_PROG(SORT,sort)
 AC_PATH_PROG(UNIQ,uniq)
 
+
+# --enable-apache2 flag, disabled by default, that decides whether or
+# not we install the apache2 module configuration file.
+AC_ARG_ENABLE(
+	[apache2],
+	[  --enable-apache2    install the apache2 conf file [[default=no]]],
+	[case "${enableval}" in
+    yes) apache2=true ;;
+    no)  apache2=false ;;
+    *) AC_MSG_ERROR([bad value ${enableval} for --enable-apache2]) ;;
+  esac],[apache2=false])
+  AM_CONDITIONAL([APACHE2], [test x$apache2 = xtrue])
+
+
 # List of output files.
 AC_CONFIG_FILES([Makefile src/php.eselect.in])
 

[gentoo-commits] proj/eselect-php:master commit in: /

[Michael Orlitzky]

commit:     98c5fa928e49c51db0986dcab40e574ce6e63168
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  9 17:16:42 2016 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat Jan  9 17:16:42 2016 +0000
URL:        https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=98c5fa92

Bump to v0.8.5 in configure.ac.

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 10ddc1e..2f1f609 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([eselect-php], [0.8.4])
+AC_INIT([eselect-php], [0.8.5])
 AM_INIT_AUTOMAKE([-Wall foreign no-dist-gzip dist-xz])
 
 AC_PROG_LN_S

[gentoo-commits] proj/eselect-php:master commit in: /

[Michael Orlitzky]

commit:     447404f429f8f75e235c62193d3405fa9c94da16
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  9 02:22:22 2016 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat Jan  9 02:22:22 2016 +0000
URL:        https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=447404f4

Bump to v0.8.4 in configure.ac.

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 895473a..10ddc1e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([eselect-php], [0.8.3])
+AC_INIT([eselect-php], [0.8.4])
 AM_INIT_AUTOMAKE([-Wall foreign no-dist-gzip dist-xz])
 
 AC_PROG_LN_S

[gentoo-commits] proj/eselect-php:master commit in: /

[Michael Orlitzky]

commit:     2da045112618edb10f79eec6545baff827470bfe
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  8 19:24:31 2016 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Fri Jan  8 19:24:31 2016 +0000
URL:        https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=2da04511

Bump to v0.8.3 in configure.ac.

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index aa7bf70..895473a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([eselect-php], [0.8.1])
+AC_INIT([eselect-php], [0.8.3])
 AM_INIT_AUTOMAKE([-Wall foreign no-dist-gzip dist-xz])
 
 AC_PROG_LN_S

[gentoo-commits] proj/eselect-php:master commit in: /

[Michael Orlitzky]

commit:     4c1be8773c8ac9dfec44564e0ac09e16a2b720a2
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 11 00:31:32 2015 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Fri Dec 11 00:31:32 2015 +0000
URL:        https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=4c1be877

Bump version to 0.8.1 in configure.ac.

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index d8f339c..d892d13 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([eselect-php], [0.8.0])
+AC_INIT([eselect-php], [0.8.1])
 AM_INIT_AUTOMAKE([-Wall foreign no-dist-gzip dist-xz])
 
 AC_PROG_LN_S