diff options
| author | Danny Rawlins <romster@shortcircuit.net.au> | 2008-07-30 00:50:43 +1000 |
|---|---|---|
| committer | Danny Rawlins <romster@shortcircuit.net.au> | 2008-07-30 00:50:43 +1000 |
| commit | cbc99399840b00a9042dbda1aaa847613990930a (patch) | |
| tree | 8ac4696a013e532171243ac6bea9d6b487db5e30 | |
| parent | 0206d43be19c0c76401daa87638030aa1b19fcef (diff) | |
| download | contrib-cbc99399840b00a9042dbda1aaa847613990930a.tar.gz contrib-cbc99399840b00a9042dbda1aaa847613990930a.tar.xz | |
preload: clean up check for help2man
| -rw-r--r-- | preload/.md5sum | 1 | ||||
| -rw-r--r-- | preload/Pkgfile | 12 | ||||
| -rw-r--r-- | preload/preload-0.6.3-check-help2man.patch | 15 |
3 files changed, 19 insertions, 9 deletions
diff --git a/preload/.md5sum b/preload/.md5sum index 46cc33ce9..5773ced83 100644 --- a/preload/.md5sum +++ b/preload/.md5sum @@ -1,3 +1,4 @@ +7732aa62c999e42f03ac6dfa13825e33 preload-0.6.3-check-help2man.patch 1149e26ee70a6f74ae91a547104a9b52 preload-0.6.3-memcached-default.patch 31e0ca4edcd8582049c69e711f6eb223 preload-0.6.3-statedir-fix.patch 4ebb8463b3b7a323ad8b7ffe89578f6e preload-0.6.3.tar.gz diff --git a/preload/Pkgfile b/preload/Pkgfile index 51136b9d5..12dcfd076 100644 --- a/preload/Pkgfile +++ b/preload/Pkgfile @@ -10,22 +10,16 @@ release=1 source=(http://dl.sourceforge.net/sourceforge/preload/preload-$version.tar.gz rc.preload $name-$version-memcached-default.patch - $name-$version-statedir-fix.patch) + $name-$version-statedir-fix.patch + $name-$version-check-help2man.patch) build() { cd preload-$version patch -p 1 -i $SRC/$name-$version-memcached-default.patch patch -p 1 -i $SRC/$name-$version-statedir-fix.patch + patch -p 1 -i $SRC/$name-$version-check-help2man.patch autoreconf - # preload(8) is generated by help2man if available, otherwise - # it only contains "help2man is required to generate this file." - ##rm -rv usr/man - if [ -z "$(pkginfo -i |grep '^help2man ')" ]; then - echo 'Install help2man.' - exit 1 - fi - ./configure \ --prefix=/usr \ --mandir=/usr/man \ diff --git a/preload/preload-0.6.3-check-help2man.patch b/preload/preload-0.6.3-check-help2man.patch new file mode 100644 index 000000000..fba5e1d89 --- /dev/null +++ b/preload/preload-0.6.3-check-help2man.patch @@ -0,0 +1,15 @@ +diff -pruN preload-0.6.3.orig/configure.ac preload-0.6.3/configure.ac +--- preload-0.6.3.orig/configure.ac 2008-07-29 23:58:51.018143308 +1000 ++++ preload-0.6.3/configure.ac 2008-07-30 00:29:37.524144736 +1000 +@@ -24,6 +24,11 @@ AC_SUBST(MAILING_LIST) + AC_PROG_CC + AC_PROG_INSTALL + ++AC_CHECK_PROG([have_help2man],[help2man],[yes],[no],[/usr/bin]) ++if test $have_help2man = no; then ++ AC_MSG_ERROR([Missing help2man.]) ++fi ++ + # Checks for header files. + AC_HEADER_STDC + AC_HEADER_TIME |