diff options
| -rw-r--r-- | www-apps/indefero/Manifest | 4 | ||||
| -rw-r--r-- | www-apps/indefero/files/indefero-gentoo-pluf.diff | 13 | ||||
| -rw-r--r-- | www-apps/indefero/files/indefero-gentoo.diff | 28 | ||||
| -rw-r--r-- | www-apps/indefero/indefero-1.2.ebuild | 25 |
4 files changed, 45 insertions, 25 deletions
diff --git a/www-apps/indefero/Manifest b/www-apps/indefero/Manifest index 3dcb85c..ac213e6 100644 --- a/www-apps/indefero/Manifest +++ b/www-apps/indefero/Manifest @@ -1,7 +1,7 @@ AUX bootstrap.php 603 RMD160 4cc6da7db1aeaa2f380458a61f67be651a49abc2 SHA1 4b38c6121046403d805298d18cfb20b7ff807ea0 SHA256 c13948fca2e56b98458f95908c84a4162600a5ee81664e317f0557131ff1c7c9 AUX dbsetup.sh 82 RMD160 f47572b05bc754f5842e0d4d7d2dd1406ef06901 SHA1 34ab3646fdb49df946c248f07265d121a383673c SHA256 107f0fcaafe83038bc64588e0bc4b6087a3f0f44c0cff2f29143086d36e290bd -AUX indefero-gentoo-pluf.diff 511 RMD160 201be20a73ed0897206a6a2a253650e5a708f079 SHA1 cf923b4de6acaa2c4bc9d14b706b4226b73ca612 SHA256 de340e928be33f4301d78b0e7e521f9ec8b6947e40726bd5f872e374f219567b +AUX indefero-gentoo.diff 1044 RMD160 2cd12655fbab28b5d1c253fbe4f07642484f2cc2 SHA1 a33d542f87085bc0f1bb96b1303b8be341c148bd SHA256 7d6adff939812b17933e050bd525d7958d8de6590e1ed127c2ce69a8e96b670f AUX postinstall-en-1.2.txt 1100 RMD160 aaec96897ca9c3a6333075fbed1b60cc447def52 SHA1 b8ebb42e4b6f183098b7191e54acc652fd7ca56d SHA256 8f1782fe00c04e239ce2c24c0f3a65d9169e580f7a955b5d3898fa795a448f38 DIST indefero-1.2.zip 954890 RMD160 3d9272e1f95673ec7c0b9522494f70fe4c3c6af4 SHA1 962b7b542b62b5d9a3ffa4072e0c2f37be8dcbd6 SHA256 f67f542f6f253945d4b5ec7a2b81d842a63aa23200adef1cb2dede3d7bd15ef1 -EBUILD indefero-1.2.ebuild 1300 RMD160 aad7bbc89ef6c06289db81e2f8ead94c9b5615e9 SHA1 3659ca4658ed1cb22785f43ac6d7348e397f7493 SHA256 6d0d7b0af7285aa642bb4e5c34b695164f23798781629230bd0ff08dc505c437 +EBUILD indefero-1.2.ebuild 1429 RMD160 96d21a1dbc2cba5878c091243b1bce0c12c43c0b SHA1 d4425dcc157fd32e1bb8d158889ad22ac1ebfdb4 SHA256 f23e4a19c73f2a25d1c9a9ab7af25724785856e68878fb9ef32b682610743614 MISC metadata.xml 252 RMD160 0d6b4d4e9e2fc0a9fc73289b6f3234195a3a1405 SHA1 6d719654a220ceff01851fa059936c79ca6bf9be SHA256 50fba57de1e11a48fbf58020c096095ebf9ec5defa2b5bcda9ed44e5be159d3f diff --git a/www-apps/indefero/files/indefero-gentoo-pluf.diff b/www-apps/indefero/files/indefero-gentoo-pluf.diff deleted file mode 100644 index aa8a152..0000000 --- a/www-apps/indefero/files/indefero-gentoo-pluf.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/IDF/conf/path.php-dist b/src/IDF/conf/path.php-dist -index d8c90ca..9c566e4 100644 ---- a/src/IDF/conf/path.php-dist -+++ b/src/IDF/conf/path.php-dist -@@ -29,7 +29,7 @@ - * PLUF_PATH: path to the folder containing the Pluf.php file. - * IDF_PATH: path to the folder containing the IDF folder. - */ --define('PLUF_PATH', dirname(__FILE__).'/../../../../pluf/src'); -+define('PLUF_PATH', '/usr/share/php/pluf/'); - define('IDF_PATH', dirname(__FILE__).'/../..'); - - set_include_path(get_include_path() diff --git a/www-apps/indefero/files/indefero-gentoo.diff b/www-apps/indefero/files/indefero-gentoo.diff new file mode 100644 index 0000000..70a41e2 --- /dev/null +++ b/www-apps/indefero/files/indefero-gentoo.diff @@ -0,0 +1,28 @@ +diff --git a/www/index.php b/www/index.php +index a1aebf5..c4229ec 100644 +--- a/www/index.php ++++ b/www/index.php +@@ -21,8 +21,8 @@ + # + # ***** END LICENSE BLOCK ***** */ + +-require dirname(__FILE__).'/../src/IDF/conf/path.php'; ++require dirname(__FILE__).'/src/IDF/conf/path.php'; + require 'Pluf.php'; +-Pluf::start(dirname(__FILE__).'/../src/IDF/conf/idf.php'); ++Pluf::start(dirname(__FILE__).'/src/IDF/conf/idf.php'); + Pluf_Dispatcher::loadControllers(Pluf::f('idf_views')); + Pluf_Dispatcher::dispatch(Pluf_HTTP_URL::getAction()); +diff --git a/src/IDF/conf/path.php-dist b/src/IDF/conf/path.php-dist +index d8c90ca..9c566e4 100644 +--- a/src/IDF/conf/path.php-dist ++++ b/src/IDF/conf/path.php-dist +@@ -29,7 +29,7 @@ + * PLUF_PATH: path to the folder containing the Pluf.php file. + * IDF_PATH: path to the folder containing the IDF folder. + */ +-define('PLUF_PATH', dirname(__FILE__).'/../../../../pluf/src'); ++define('PLUF_PATH', '/usr/share/php/pluf/'); + define('IDF_PATH', dirname(__FILE__).'/../..'); + + set_include_path(get_include_path() diff --git a/www-apps/indefero/indefero-1.2.ebuild b/www-apps/indefero/indefero-1.2.ebuild index 71e058d..fd21fe9 100644 --- a/www-apps/indefero/indefero-1.2.ebuild +++ b/www-apps/indefero/indefero-1.2.ebuild @@ -21,31 +21,36 @@ RDEPEND="${DEPEND} S="${WORKDIR}/${PN}" src_prepare(){ - #Expect pluf to be installed in the normal location. - epatch "${FILESDIR}/${PN}-gentoo-pluf.diff" - cp "${FILESDIR}/dbsetup.sh" src/ - cp "${FILESDIR}/bootstrap.php" www/ + #Expect pluf to be installed in the normal location and adjust the index.php + #to be where we want it. + epatch "${FILESDIR}/${PN}-gentoo.diff" + cp "${FILESDIR}/dbsetup.sh" src/ || die + cp "${FILESDIR}/bootstrap.php" . || die + mv www/* . || die } src_compile(){ :; } src_install(){ webapp_src_preinst - rm COPYING INSTALL.mdtext release-script run-tests .gitignore .gitattributes + rm COPYING INSTALL.mdtext release-script run-tests .gitignore \ + .gitattributes Makefile || die dodoc doc/* NEWS.mdtext AUTHORS CONTRIBUTE.mdtext - rm -rf doc NEWS.mdtext AUTHORS CONTRIBUTE.mdtext + rm -rf test doc NEWS.mdtext AUTHORS CONTRIBUTE.mdtext || die - mv src/IDF/conf/idf.php-dist src/IDF/conf/idf.php - mv src/IDF/conf/path.php-dist src/IDF/conf/path.php + mv src/IDF/conf/idf.php-dist src/IDF/conf/idf.php || die + mv src/IDF/conf/path.php-dist src/IDF/conf/path.php || die + + insinto "${MY_HTDOCSDIR}" + doins -R . - cp -R . "${D}/${MY_HTDOCSDIR}" webapp_configfile "${MY_HTDOCSDIR}/src/IDF/conf/idf.php" webapp_postinst_txt en "${FILESDIR}/postinstall-en-${PV}.txt" webapp_src_install } pkg_postinst(){ - webapp_pkg_postinst elog "The postinstall document contains all of the information" elog "needed to get ${PN} running." + webapp_pkg_postinst } |