summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2016-02-02 11:38:42 +1000
committerAllan McRae <allan@archlinux.org>2016-02-26 15:18:43 +1000
commit1a29744d0da8aa945b96b234574e0d5c80f13b62 (patch)
treed8c7460efe96d4cd4f1ce1ee83b666b21b4a92fb /doc
parentd4f499f5638a68a3b7e17c5171aabdf535b79bd4 (diff)
downloadpacman-1a29744d0da8aa945b96b234574e0d5c80f13b62.tar.xz
makepkg: Remove upx and optipng support
These options were added before libmakepkg allowed passes like this to be dropped in. I prefer only real core packaging tasks to be included in makepkg and additional things like this to be dropped in by a user or distribution that wants to support them. Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'doc')
-rw-r--r--doc/PKGBUILD.5.txt6
-rw-r--r--doc/makepkg.conf.5.txt10
2 files changed, 1 insertions, 15 deletions
diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt
index e410481b..e19a81c9 100644
--- a/doc/PKGBUILD.5.txt
+++ b/doc/PKGBUILD.5.txt
@@ -293,12 +293,6 @@ underscore and the architecture name e.g., 'replaces_x86_64=()'.
*zipman*;;
Compress man and info pages with gzip.
- *upx*;;
- Compress binary executable files using UPX.
-
- *optipng*;;
- Optimize PNG images with optipng.
-
*ccache*;;
Allow the use of ccache during build. More useful in its negative
form `!ccache` with select packages that have problems building
diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt
index e35eb8a6..5bd3472f 100644
--- a/doc/makepkg.conf.5.txt
+++ b/doc/makepkg.conf.5.txt
@@ -141,7 +141,7 @@ Options
Specify a key to use for GPG signing instead of the default key in the
keyring. Can be overridden with makepkg's '\--key' option.
-**OPTIONS=(**strip docs libtool staticlibs emptydirs zipman purge !upx !optipng**)**::
+**OPTIONS=(**strip docs libtool staticlibs emptydirs zipman purge**)**::
This array contains options that affect default packaging. They are
equivalent to options that can be placed in the PKGBUILD; the defaults are
shown here. All options should always be left in the array; to enable or
@@ -178,14 +178,6 @@ Options
Remove files specified by the `PURGE_TARGETS` variable from the
package.
- *upx*;;
- Compress binary executable files using UPX. Additional options
- can be passed to UPX by specifying the `UPXFLAGS` array variable.
-
- *optipng*;;
- Optimize PNG images with optipng. Additional options can be passed
- to optipng by specifying the `OPTIPNGFLAGS` array variable.
-
*debug*;;
Add the user-specified debug flags as specified in DEBUG_CFLAGS and
DEBUG_CXXFLAGS to their counterpart buildflags. Creates a separate