| author | Yiteng Zhang <yiteng.zhang@oracle.com> |
| Tue, 05 Jan 2016 13:35:29 -0800 | |
| changeset 5228 | b457e3bd2acc |
| permissions | -rw-r--r-- |
|
5228
b457e3bd2acc
22386518 Move pkgbuild from Desktop consolidation to Userland
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
1 |
# This patch was taken from the upstream project mailing list and is |
|
b457e3bd2acc
22386518 Move pkgbuild from Desktop consolidation to Userland
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
2 |
# expected to be integrated in a future release. |
|
b457e3bd2acc
22386518 Move pkgbuild from Desktop consolidation to Userland
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
3 |
# http://sourceforge.net/p/pkgbuild/mailman/message/34656716/ |
|
b457e3bd2acc
22386518 Move pkgbuild from Desktop consolidation to Userland
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
4 |
|
|
b457e3bd2acc
22386518 Move pkgbuild from Desktop consolidation to Userland
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
5 |
--- pkgbuild-1.3.105-dist/configure.in 2013-04-03 23:43:19.000000000 -0500 |
|
b457e3bd2acc
22386518 Move pkgbuild from Desktop consolidation to Userland
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
6 |
+++ pkgbuild-1.3.105/configure.in 2015-11-29 14:35:05.914960090 -0600 |
|
b457e3bd2acc
22386518 Move pkgbuild from Desktop consolidation to Userland
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
7 |
@@ -23,7 +23,7 @@ |
|
b457e3bd2acc
22386518 Move pkgbuild from Desktop consolidation to Userland
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
8 |
PATCH_IS_GNU=no |
|
b457e3bd2acc
22386518 Move pkgbuild from Desktop consolidation to Userland
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
9 |
$PATCH --version 2>/dev/null | grep 'Free Software Foundation' > /dev/null \ |
|
b457e3bd2acc
22386518 Move pkgbuild from Desktop consolidation to Userland
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
10 |
&& PATCH_IS_GNU=yes |
|
b457e3bd2acc
22386518 Move pkgbuild from Desktop consolidation to Userland
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
11 |
-$PATCH --version 2>/dev/null | head -1 | grep '^patch ' > /dev/null \ |
|
b457e3bd2acc
22386518 Move pkgbuild from Desktop consolidation to Userland
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
12 |
+$PATCH --version 2>/dev/null | head -1 | grep '^.*patch ' > /dev/null \ |
|
b457e3bd2acc
22386518 Move pkgbuild from Desktop consolidation to Userland
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
13 |
|| PATCH_IS_GNU=no |
|
b457e3bd2acc
22386518 Move pkgbuild from Desktop consolidation to Userland
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
14 |
AC_MSG_RESULT([$PATCH_IS_GNU]) |
|
b457e3bd2acc
22386518 Move pkgbuild from Desktop consolidation to Userland
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
15 |
if test $PATCH_IS_GNU = no; then |
|
b457e3bd2acc
22386518 Move pkgbuild from Desktop consolidation to Userland
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
16 |
@@ -36,7 +36,7 @@ |
|
b457e3bd2acc
22386518 Move pkgbuild from Desktop consolidation to Userland
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
17 |
SED_IS_GNU=no |
|
b457e3bd2acc
22386518 Move pkgbuild from Desktop consolidation to Userland
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
18 |
$GNU_SED --version 2>/dev/null | grep 'Free Software Foundation' > /dev/null \ |
|
b457e3bd2acc
22386518 Move pkgbuild from Desktop consolidation to Userland
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
19 |
&& SED_IS_GNU=yes |
|
b457e3bd2acc
22386518 Move pkgbuild from Desktop consolidation to Userland
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
20 |
-$GNU_SED --version 2>/dev/null | head -1 | grep 'GNU sed ' > /dev/null \ |
|
b457e3bd2acc
22386518 Move pkgbuild from Desktop consolidation to Userland
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
21 |
+$GNU_SED --version 2>/dev/null | head -1 | grep 'GNU sed' > /dev/null \ |
|
b457e3bd2acc
22386518 Move pkgbuild from Desktop consolidation to Userland
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
22 |
|| SED_IS_GNU=no |
|
b457e3bd2acc
22386518 Move pkgbuild from Desktop consolidation to Userland
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
23 |
AC_MSG_RESULT([$SED_IS_GNU]) |
|
b457e3bd2acc
22386518 Move pkgbuild from Desktop consolidation to Userland
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
24 |
if test $SED_IS_GNU = no; then |