Signed-off-by: Allan McRae <[email protected]>
---

It would be now very easy to modify this to allow putting a file
in this directory to add a new pass...


 scripts/Makefile.am                            |  12 ++
 scripts/libmakepkg/.gitignore                  |  12 ++
 scripts/libmakepkg/tidy.sh.in                  |  60 ++++++++++
 scripts/libmakepkg/tidy/build_references.sh.in |  36 ++++++
 scripts/libmakepkg/tidy/docs.sh.in             |  35 ++++++
 scripts/libmakepkg/tidy/emptydirs.sh.in        |  35 ++++++
 scripts/libmakepkg/tidy/libtool.sh.in          |  35 ++++++
 scripts/libmakepkg/tidy/missing_backup.sh.in   |  36 ++++++
 scripts/libmakepkg/tidy/optipng.sh.in          |  41 +++++++
 scripts/libmakepkg/tidy/purge.sh.in            |  42 +++++++
 scripts/libmakepkg/tidy/staticlibs.sh.in       |  40 +++++++
 scripts/libmakepkg/tidy/strip.sh.in            |  64 +++++++++++
 scripts/libmakepkg/tidy/upx.sh.in              |  41 +++++++
 scripts/libmakepkg/tidy/zipman.sh.in           |  58 ++++++++++
 scripts/makepkg.sh.in                          | 146 +------------------------
 scripts/po/POTFILES.in                         |  11 ++
 16 files changed, 559 insertions(+), 145 deletions(-)
 create mode 100644 scripts/libmakepkg/tidy.sh.in
 create mode 100644 scripts/libmakepkg/tidy/build_references.sh.in
 create mode 100644 scripts/libmakepkg/tidy/docs.sh.in
 create mode 100644 scripts/libmakepkg/tidy/emptydirs.sh.in
 create mode 100644 scripts/libmakepkg/tidy/libtool.sh.in
 create mode 100644 scripts/libmakepkg/tidy/missing_backup.sh.in
 create mode 100644 scripts/libmakepkg/tidy/optipng.sh.in
 create mode 100644 scripts/libmakepkg/tidy/purge.sh.in
 create mode 100644 scripts/libmakepkg/tidy/staticlibs.sh.in
 create mode 100644 scripts/libmakepkg/tidy/strip.sh.in
 create mode 100644 scripts/libmakepkg/tidy/upx.sh.in
 create mode 100644 scripts/libmakepkg/tidy/zipman.sh.in

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 1ad8050..8894e56 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -48,6 +48,18 @@ LIBMAKEPKG = \
        libmakepkg/util/option.sh
 
 LIBMAKEPKG_IN = \
+       libmakepkg/tidy.sh \
+       libmakepkg/tidy/build_references.sh \
+       libmakepkg/tidy/docs.sh \
+       libmakepkg/tidy/emptydirs.sh \
+       libmakepkg/tidy/libtool.sh \
+       libmakepkg/tidy/missing_backup.sh \
+       libmakepkg/tidy/optipng.sh \
+       libmakepkg/tidy/purge.sh \
+       libmakepkg/tidy/staticlibs.sh \
+       libmakepkg/tidy/strip.sh \
+       libmakepkg/tidy/upx.sh \
+       libmakepkg/tidy/zipman.sh \
        libmakepkg/util.sh
 
 LIBMAKEPKG_DIST = \
diff --git a/scripts/libmakepkg/.gitignore b/scripts/libmakepkg/.gitignore
index d1c680d..7072d8b 100644
--- a/scripts/libmakepkg/.gitignore
+++ b/scripts/libmakepkg/.gitignore
@@ -1 +1,13 @@
+tidy.sh
+tidy/build_references.sh
+tidy/docs.sh
+tidy/emptydirs.sh
+tidy/libtool.sh
+tidy/missing_backup.sh
+tidy/optipng.sh
+tidy/purge.sh
+tidy/staticlibs.sh
+tidy/strip.sh
+tidy/upx.sh
+tidy/zipman.sh
 util.sh
diff --git a/scripts/libmakepkg/tidy.sh.in b/scripts/libmakepkg/tidy.sh.in
new file mode 100644
index 0000000..483afcb
--- /dev/null
+++ b/scripts/libmakepkg/tidy.sh.in
@@ -0,0 +1,60 @@
+#!/bin/bash
+#
+#   tidy.sh - functions for modifying/removing installed files before
+#   package creation
+#
+#   Copyright (c) 2015 Pacman Development Team <[email protected]>
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+[ -n "$LIBMAKEPKG_TIDY_SH" ] && return
+LIBMAKEPKG_TIDY_SH=1
+
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
+
+source "$LIBRARY/util/message.sh"
+
+for lib in "$LIBRARY/tidy/"*.sh; do
+       source "$lib"
+done
+
+
+packaging_options=('strip' 'docs' 'libtool' 'staticlibs' 'emptydirs' 'zipman'
+                   'purge' 'upx' 'optipng' 'debug')
+readonly -a packaging_options
+
+
+tidy_install() {
+       cd_safe "$pkgdir"
+       msg "$(gettext "Tidying install...")"
+
+       # options that remove unwanted files
+       tidy_docs
+       tidy_purge
+       tidy_libtool
+       tidy_staticlibs
+       tidy_emptydirs
+
+       # warn about packaging issues
+       # TODO: move these to another module
+       warn_missing_backup
+       warn_build_references
+
+       # options that reduce file sizes
+       tidy_zipman
+       tidy_strip
+       tidy_upx
+       tidy_optipng
+}
diff --git a/scripts/libmakepkg/tidy/build_references.sh.in 
b/scripts/libmakepkg/tidy/build_references.sh.in
new file mode 100644
index 0000000..2611869
--- /dev/null
+++ b/scripts/libmakepkg/tidy/build_references.sh.in
@@ -0,0 +1,36 @@
+#!/bin/bash
+#
+#   build_references.sh - Warn about files containing references to build 
directories
+#
+#   Copyright (c) 2013-2015 Pacman Development Team <[email protected]>
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+[ -n "$LIBMAKEPKG_TIDY_BUILD_REFERENCES_SH" ] && return
+LIBMAKEPKG_TIDY_BUILD_REFERENCES_SH=1
+
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
+
+source "$LIBRARY/util/message.sh"
+
+
+warn_build_references() {
+       if find "${pkgdir}" -type f -print0 | xargs -0 grep -q -I "${srcdir}" ; 
then
+               warning "$(gettext "Package contains reference to %s")" 
"\$srcdir"
+       fi
+       if find "${pkgdir}" -type f -print0 | xargs -0 grep -q -I 
"${pkgdirbase}" ; then
+               warning "$(gettext "Package contains reference to %s")" 
"\$pkgdir"
+       fi
+}
diff --git a/scripts/libmakepkg/tidy/docs.sh.in 
b/scripts/libmakepkg/tidy/docs.sh.in
new file mode 100644
index 0000000..09b7234
--- /dev/null
+++ b/scripts/libmakepkg/tidy/docs.sh.in
@@ -0,0 +1,35 @@
+#!/bin/bash
+#
+#   docs.sh - Remove documentation files from the package
+#
+#   Copyright (c) 2008-2015 Pacman Development Team <[email protected]>
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+[ -n "$LIBMAKEPKG_TIDY_DOCS_SH" ] && return
+LIBMAKEPKG_TIDY_DOCS_SH=1
+
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
+
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/option.sh"
+
+
+tidy_docs() {
+       if check_option "docs" "n" && [[ -n ${DOC_DIRS[*]} ]]; then
+               msg2 "$(gettext "Removing doc files...")"
+               rm -rf -- ${DOC_DIRS[@]}
+       fi
+}
diff --git a/scripts/libmakepkg/tidy/emptydirs.sh.in 
b/scripts/libmakepkg/tidy/emptydirs.sh.in
new file mode 100644
index 0000000..8cdb4b0
--- /dev/null
+++ b/scripts/libmakepkg/tidy/emptydirs.sh.in
@@ -0,0 +1,35 @@
+#!/bin/bash
+#
+#   emptydirs.sh - Remove empty directories from the package
+#
+#   Copyright (c) 2013-2015 Pacman Development Team <[email protected]>
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+[ -n "$LIBMAKEPKG_TIDY_EMPTYDIRS_SH" ] && return
+LIBMAKEPKG_TIDY_EMPTYDIRS_SH=1
+
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
+
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/option.sh"
+
+
+tidy_emptydirs() {
+       if check_option "emptydirs" "n"; then
+               msg2 "$(gettext "Removing empty directories...")"
+               find . -depth -type d -exec rmdir '{}' + 2>/dev/null
+       fi
+}
diff --git a/scripts/libmakepkg/tidy/libtool.sh.in 
b/scripts/libmakepkg/tidy/libtool.sh.in
new file mode 100644
index 0000000..e1dafe6
--- /dev/null
+++ b/scripts/libmakepkg/tidy/libtool.sh.in
@@ -0,0 +1,35 @@
+#!/bin/bash
+#
+#   libtool.sh - Remove libtool files from the package
+#
+#   Copyright (c) 2013-2015 Pacman Development Team <[email protected]>
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+[ -n "$LIBMAKEPKG_TIDY_LIBTOOL_SH" ] && return
+LIBMAKEPKG_TIDY_LIBTOOL_SH=1
+
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
+
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/option.sh"
+
+
+tidy_libtool() {
+       if check_option "libtool" "n"; then
+               msg2 "$(gettext "Removing "%s" files...")" "libtool"
+               find . ! -type d -name "*.la" -exec rm -f -- '{}' +
+       fi
+}
diff --git a/scripts/libmakepkg/tidy/missing_backup.sh.in 
b/scripts/libmakepkg/tidy/missing_backup.sh.in
new file mode 100644
index 0000000..fae04a2
--- /dev/null
+++ b/scripts/libmakepkg/tidy/missing_backup.sh.in
@@ -0,0 +1,36 @@
+#!/bin/bash
+#
+#   missing_backup.sh - Warn about missing files in the backup array
+#
+#   Copyright (c) 2013-2015 Pacman Development Team <[email protected]>
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+[ -n "$LIBMAKEPKG_TIDY_MISSING_BACKUP_SH" ] && return
+LIBMAKEPKG_TIDY_MISSING_BACKUP_SH=1
+
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
+
+source "$LIBRARY/util/message.sh"
+
+
+warn_missing_backup() {
+       local file
+       for file in "${backup[@]}"; do
+               if [[ ! -f $file ]]; then
+                       warning "$(gettext "%s entry file not in package : 
%s")" "backup" "$file"
+               fi
+       done
+}
diff --git a/scripts/libmakepkg/tidy/optipng.sh.in 
b/scripts/libmakepkg/tidy/optipng.sh.in
new file mode 100644
index 0000000..1cd74f5
--- /dev/null
+++ b/scripts/libmakepkg/tidy/optipng.sh.in
@@ -0,0 +1,41 @@
+#!/bin/bash
+#
+#   optipng.sh - Compress PNG files using optpng
+#
+#   Copyright (c) 2015 Pacman Development Team <[email protected]>
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+[ -n "$LIBMAKEPKG_TIDY_OPTIPNG_SH" ] && return
+LIBMAKEPKG_TIDY_OPTIPNG_SH=1
+
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
+
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/option.sh"
+
+
+tidy_optipng() {
+       if check_option "optipng" "y"; then
+               msg2 "$(gettext "Optimizing PNG images...")"
+               local png
+               find . -type f -iname "*.png" 2>/dev/null | while read -r png ; 
do
+                       if [[ $(file --brief --mime-type "$png") = 'image/png' 
]]; then
+                               optipng "${OPTIPNGFLAGS[@]}" "$png" &>/dev/null 
||
+                                       warning "$(gettext "Could not optimize 
PNG image : %s")" "${png/$pkgdir\//}"
+                       fi
+               done
+       fi
+}
diff --git a/scripts/libmakepkg/tidy/purge.sh.in 
b/scripts/libmakepkg/tidy/purge.sh.in
new file mode 100644
index 0000000..dbc0381
--- /dev/null
+++ b/scripts/libmakepkg/tidy/purge.sh.in
@@ -0,0 +1,42 @@
+#!/bin/bash
+#
+#   purge.sh - Remove unwanted files from the package
+#
+#   Copyright (c) 2008-2015 Pacman Development Team <[email protected]>
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+[ -n "$LIBMAKEPKG_TIDY_PURGE_SH" ] && return
+LIBMAKEPKG_TIDY_PURGE_SH=1
+
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
+
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/option.sh"
+
+
+tidy_purge() {
+       if check_option "purge" "y" && [[ -n ${PURGE_TARGETS[*]} ]]; then
+               msg2 "$(gettext "Purging unwanted files...")"
+               local pt
+               for pt in "${PURGE_TARGETS[@]}"; do
+                       if [[ ${pt} = "${pt//\/}" ]]; then
+                               find . ! -type d -name "${pt}" -exec rm -f -- 
'{}' +
+                       else
+                               rm -f ${pt}
+                       fi
+               done
+       fi
+}
diff --git a/scripts/libmakepkg/tidy/staticlibs.sh.in 
b/scripts/libmakepkg/tidy/staticlibs.sh.in
new file mode 100644
index 0000000..7dbe801
--- /dev/null
+++ b/scripts/libmakepkg/tidy/staticlibs.sh.in
@@ -0,0 +1,40 @@
+#!/bin/bash
+#
+#   staticlibs.sh - Remove static library files from the package
+#
+#   Copyright (c) 2013-2015 Pacman Development Team <[email protected]>
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+[ -n "$LIBMAKEPKG_TIDY_STATICLIBS_SH" ] && return
+LIBMAKEPKG_TIDY_STATICLIBS_SH=1
+
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
+
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/option.sh"
+
+
+tidy_staticlibs() {
+       if check_option "staticlibs" "n"; then
+               msg2 "$(gettext "Removing static library files...")"
+               local l
+               while read -rd '' l; do
+                       if [[ -f "${l%.a}.so" || -h "${l%.a}.so" ]]; then
+                               rm "$l"
+                       fi
+               done < <(find . ! -type d -name "*.a" -print0)
+       fi
+}
diff --git a/scripts/libmakepkg/tidy/strip.sh.in 
b/scripts/libmakepkg/tidy/strip.sh.in
new file mode 100644
index 0000000..4fe334b
--- /dev/null
+++ b/scripts/libmakepkg/tidy/strip.sh.in
@@ -0,0 +1,64 @@
+#!/bin/bash
+#
+#   strip.sh - Strip debugging symbols from binary files
+#
+#   Copyright (c) 2007-2015 Pacman Development Team <[email protected]>
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+[ -n "$LIBMAKEPKG_TIDY_STRIP_SH" ] && return
+LIBMAKEPKG_TIDY_STRIP_SH=1
+
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
+
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/option.sh"
+
+
+tidy_strip() {
+       if check_option "strip" "y"; then
+               msg2 "$(gettext "Stripping unneeded symbols from binaries and 
libraries...")"
+               # make sure library stripping variables are defined to prevent 
excess stripping
+               [[ -z ${STRIP_SHARED+x} ]] && STRIP_SHARED="-S"
+               [[ -z ${STRIP_STATIC+x} ]] && STRIP_STATIC="-S"
+
+               if check_option "debug" "y"; then
+                       dbgdir="$pkgdir-@DEBUGSUFFIX@/usr/lib/debug"
+                       mkdir -p "$dbgdir"
+               fi
+
+               local binary strip_flags
+               find . -type f -perm -u+w -print0 2>/dev/null | while read -rd 
'' binary ; do
+                       case "$(file -bi "$binary")" in
+                               *application/x-sharedlib*)  # Libraries (.so)
+                                       strip_flags="$STRIP_SHARED";;
+                               *application/x-archive*)    # Libraries (.a)
+                                       strip_flags="$STRIP_STATIC";;
+                               *application/x-object*)
+                                       case "$binary" in
+                                               *.ko)                   # 
Kernel module
+                                                       
strip_flags="$STRIP_SHARED";;
+                                               *)
+                                                       continue;;
+                                       esac;;
+                               *application/x-executable*) # Binaries
+                                       strip_flags="$STRIP_BINARIES";;
+                               *)
+                                       continue ;;
+                       esac
+                       strip_file "$binary" ${strip_flags}
+               done
+       fi
+}
diff --git a/scripts/libmakepkg/tidy/upx.sh.in 
b/scripts/libmakepkg/tidy/upx.sh.in
new file mode 100644
index 0000000..9012cd3
--- /dev/null
+++ b/scripts/libmakepkg/tidy/upx.sh.in
@@ -0,0 +1,41 @@
+#!/bin/bash
+#
+#   upx.sh - Compress package binaries with UPX
+#
+#   Copyright (c) 2011-2015 Pacman Development Team <[email protected]>
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+[ -n "$LIBMAKEPKG_TIDY_UPX_SH" ] && return
+LIBMAKEPKG_TIDY_UPX_SH=1
+
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
+
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/option.sh"
+
+
+tidy_upx() {
+       if check_option "upx" "y"; then
+               msg2 "$(gettext "Compressing binaries with %s...")" "UPX"
+               local binary
+               find . -type f -perm -u+w 2>/dev/null | while read -r binary ; 
do
+                       if [[ $(file --brief --mime-type "$binary") = 
'application/x-executable' ]]; then
+                               upx "${UPXFLAGS[@]}" "$binary" &>/dev/null ||
+                                               warning "$(gettext "Could not 
compress binary : %s")" "${binary/$pkgdir\//}"
+                       fi
+               done
+       fi
+}
diff --git a/scripts/libmakepkg/tidy/zipman.sh.in 
b/scripts/libmakepkg/tidy/zipman.sh.in
new file mode 100644
index 0000000..8557789
--- /dev/null
+++ b/scripts/libmakepkg/tidy/zipman.sh.in
@@ -0,0 +1,58 @@
+#!/bin/bash
+#
+#   zipman.sh - Compress man and info pages
+#
+#   Copyright (c) 2011-2015 Pacman Development Team <[email protected]>
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+[ -n "$LIBMAKEPKG_TIDY_ZIPMAN_SH" ] && return
+LIBMAKEPKG_TIDY_ZIPMAN_SH=1
+
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
+
+source "$LIBRARY/util/message.sh"
+source "$LIBRARY/util/option.sh"
+
+
+tidy_zipman() {
+       if check_option "zipman" "y" && [[ -n ${MAN_DIRS[*]} ]]; then
+               msg2 "$(gettext "Compressing man and info pages...")"
+               local file files inode link
+               while read -rd ' ' inode; do
+                       read file
+                       find ${MAN_DIRS[@]} -type l 2>/dev/null |
+                       while read -r link ; do
+                               if [[ "${file}" -ef "${link}" ]] ; then
+                                       rm -f "$link" "${link}.gz"
+                                       if [[ ${file%/*} = ${link%/*} ]]; then
+                                               ln -s -- "${file##*/}.gz" 
"${link}.gz"
+                                       else
+                                               ln -s -- "/${file}.gz" 
"${link}.gz"
+                                       fi
+                               fi
+                       done
+                       if [[ -z ${files[$inode]} ]]; then
+                               files[$inode]=$file
+                               gzip -9 -n -f "$file"
+                       else
+                               rm -f "$file"
+                               ln "${files[$inode]}.gz" "${file}.gz"
+                               chmod 644 "${file}.gz"
+                       fi
+               done < <(find ${MAN_DIRS[@]} -type f \! -name "*.gz" \! -name 
"*.bz2" \
+                       -exec @INODECMD@ '{}' + 2>/dev/null)
+       fi
+}
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index e069f37..c01e939 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -48,13 +48,11 @@ declare -r startdir="$PWD"
 
 LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-packaging_options=('strip' 'docs' 'libtool' 'staticlibs' 'emptydirs' 'zipman'
-                   'purge' 'upx' 'optipng' 'debug')
 build_options=('ccache' 'distcc' 'buildflags' 'makeflags')
 splitpkg_overrides=('pkgdesc' 'arch' 'url' 'license' 'groups' 'depends'
                     'optdepends' 'provides' 'conflicts' 'replaces' 'backup'
                     'options' 'install' 'changelog')
-readonly -a packaging_options build_options splitpkg_overrides
+readonly -a build_options splitpkg_overrides
 
 known_hash_algos=('md5' 'sha1' 'sha224' 'sha256' 'sha384' 'sha512')
 
@@ -1682,148 +1680,6 @@ strip_file() {
        strip $@ "$binary"
 }
 
-tidy_install() {
-       cd_safe "$pkgdir"
-       msg "$(gettext "Tidying install...")"
-
-       if check_option "docs" "n" && [[ -n ${DOC_DIRS[*]} ]]; then
-               msg2 "$(gettext "Removing doc files...")"
-               rm -rf -- ${DOC_DIRS[@]}
-       fi
-
-       if check_option "purge" "y" && [[ -n ${PURGE_TARGETS[*]} ]]; then
-               msg2 "$(gettext "Purging unwanted files...")"
-               local pt
-               for pt in "${PURGE_TARGETS[@]}"; do
-                       if [[ ${pt} = "${pt//\/}" ]]; then
-                               find . ! -type d -name "${pt}" -exec rm -f -- 
'{}' +
-                       else
-                               rm -f ${pt}
-                       fi
-               done
-       fi
-
-       if check_option "libtool" "n"; then
-               msg2 "$(gettext "Removing "%s" files...")" "libtool"
-               find . ! -type d -name "*.la" -exec rm -f -- '{}' +
-       fi
-
-       if check_option "staticlibs" "n"; then
-               msg2 "$(gettext "Removing static library files...")"
-               local l
-               while read -rd '' l; do
-                       if [[ -f "${l%.a}.so" || -h "${l%.a}.so" ]]; then
-                               rm "$l"
-                       fi
-               done < <(find . ! -type d -name "*.a" -print0)
-       fi
-
-       if check_option "emptydirs" "n"; then
-               msg2 "$(gettext "Removing empty directories...")"
-               find . -depth -type d -exec rmdir '{}' + 2>/dev/null
-       fi
-
-       # check existence of backup files
-       local file
-       for file in "${backup[@]}"; do
-               if [[ ! -f $file ]]; then
-                       warning "$(gettext "%s entry file not in package : 
%s")" "backup" "$file"
-               fi
-       done
-
-       # check for references to the build and package directory
-       if find "${pkgdir}" -type f -print0 | xargs -0 grep -q -I "${srcdir}" ; 
then
-               warning "$(gettext "Package contains reference to %s")" 
"\$srcdir"
-       fi
-       if find "${pkgdir}" -type f -print0 | xargs -0 grep -q -I 
"${pkgdirbase}" ; then
-               warning "$(gettext "Package contains reference to %s")" 
"\$pkgdir"
-       fi
-
-       if check_option "zipman" "y" && [[ -n ${MAN_DIRS[*]} ]]; then
-               msg2 "$(gettext "Compressing man and info pages...")"
-               local file files inode link
-               while read -rd ' ' inode; do
-                       read file
-                       find ${MAN_DIRS[@]} -type l 2>/dev/null |
-                       while read -r link ; do
-                               if [[ "${file}" -ef "${link}" ]] ; then
-                                       rm -f "$link" "${link}.gz"
-                                       if [[ ${file%/*} = ${link%/*} ]]; then
-                                               ln -s -- "${file##*/}.gz" 
"${link}.gz"
-                                       else
-                                               ln -s -- "/${file}.gz" 
"${link}.gz"
-                                       fi
-                               fi
-                       done
-                       if [[ -z ${files[$inode]} ]]; then
-                               files[$inode]=$file
-                               gzip -9 -n -f "$file"
-                       else
-                               rm -f "$file"
-                               ln "${files[$inode]}.gz" "${file}.gz"
-                               chmod 644 "${file}.gz"
-                       fi
-               done < <(find ${MAN_DIRS[@]} -type f \! -name "*.gz" \! -name 
"*.bz2" \
-                       -exec @INODECMD@ '{}' + 2>/dev/null)
-       fi
-
-       if check_option "strip" "y"; then
-               msg2 "$(gettext "Stripping unneeded symbols from binaries and 
libraries...")"
-               # make sure library stripping variables are defined to prevent 
excess stripping
-               [[ -z ${STRIP_SHARED+x} ]] && STRIP_SHARED="-S"
-               [[ -z ${STRIP_STATIC+x} ]] && STRIP_STATIC="-S"
-
-               if check_option "debug" "y"; then
-                       dbgdir="$pkgdir-@DEBUGSUFFIX@/usr/lib/debug"
-                       mkdir -p "$dbgdir"
-               fi
-
-               local binary strip_flags
-               find . -type f -perm -u+w -print0 2>/dev/null | while read -rd 
'' binary ; do
-                       case "$(file -bi "$binary")" in
-                               *application/x-sharedlib*)  # Libraries (.so)
-                                       strip_flags="$STRIP_SHARED";;
-                               *application/x-archive*)    # Libraries (.a)
-                                       strip_flags="$STRIP_STATIC";;
-                               *application/x-object*)
-                                       case "$binary" in
-                                               *.ko)                   # 
Kernel module
-                                                       
strip_flags="$STRIP_SHARED";;
-                                               *)
-                                                       continue;;
-                                       esac;;
-                               *application/x-executable*) # Binaries
-                                       strip_flags="$STRIP_BINARIES";;
-                               *)
-                                       continue ;;
-                       esac
-                       strip_file "$binary" ${strip_flags}
-               done
-       fi
-
-       if check_option "upx" "y"; then
-               msg2 "$(gettext "Compressing binaries with %s...")" "UPX"
-               local binary
-               find . -type f -perm -u+w 2>/dev/null | while read -r binary ; 
do
-                       if [[ $(file --brief --mime-type "$binary") = 
'application/x-executable' ]]; then
-                               upx "${UPXFLAGS[@]}" "$binary" &>/dev/null ||
-                                               warning "$(gettext "Could not 
compress binary : %s")" "${binary/$pkgdir\//}"
-                       fi
-               done
-       fi
-
-       if check_option "optipng" "y"; then
-               msg2 "$(gettext "Optimizing PNG images...")"
-               local png
-               find . -type f -iname "*.png" 2>/dev/null | while read -r png ; 
do
-                       if [[ $(file --brief --mime-type "$png") = 'image/png' 
]]; then
-                               optipng "${OPTIPNGFLAGS[@]}" "$png" &>/dev/null 
||
-                                       warning "$(gettext "Could not optimize 
PNG image : %s")" "${png/$pkgdir\//}"
-                       fi
-               done
-       fi
-}
-
 find_libdepends() {
        local d sodepends;
 
diff --git a/scripts/po/POTFILES.in b/scripts/po/POTFILES.in
index f286be9..007227a 100644
--- a/scripts/po/POTFILES.in
+++ b/scripts/po/POTFILES.in
@@ -8,6 +8,17 @@ scripts/pacman-key.sh.in
 scripts/pacman-optimize.sh.in
 scripts/pkgdelta.sh.in
 scripts/repo-add.sh.in
+scripts/libmakepkg/tidy/build_references.sh.in
+scripts/libmakepkg/tidy/docs.sh.in
+scripts/libmakepkg/tidy/emptydirs.sh.in
+scripts/libmakepkg/tidy/libtool.sh.in
+scripts/libmakepkg/tidy/missing_backup.sh.in
+scripts/libmakepkg/tidy/optipng.sh.in
+scripts/libmakepkg/tidy/purge.sh.in
+scripts/libmakepkg/tidy/staticlibs.sh.in
+scripts/libmakepkg/tidy/strip.sh.in
+scripts/libmakepkg/tidy/upx.sh.in
+scripts/libmakepkg/tidy/zipman.sh.in
 scripts/libmakepkg/util/message.sh
 scripts/library/output_format.sh
 scripts/library/parseopts.sh
-- 
2.2.2

Reply via email to