aboutsummaryrefslogtreecommitdiffstats
path: root/devel
diff options
context:
space:
mode:
authorade <ade@FreeBSD.org>2000-07-16 03:07:48 +0800
committerade <ade@FreeBSD.org>2000-07-16 03:07:48 +0800
commitce0254204c0696eecc240e100121ec3a5af57782 (patch)
treedc19e1354af7d516e84570dbe4782a47f901c909 /devel
parente54fd3e8226bd73a319b121ea085bf6d9233fd60 (diff)
downloadfreebsd-ports-gnome-ce0254204c0696eecc240e100121ec3a5af57782.tar.gz
freebsd-ports-gnome-ce0254204c0696eecc240e100121ec3a5af57782.tar.zst
freebsd-ports-gnome-ce0254204c0696eecc240e100121ec3a5af57782.zip
Persuade automake to look not only in ${PREFIX}/share/aclocal
(ie: ${LOCALBASE}), but also ${X11BASE}/share/aclocal via an extra patch and some configure-time substitution Discussed on: ports (quite a while back) Original disgusting hack by: ade Suggested improvements by: asami Reworked patch by: ade
Diffstat (limited to 'devel')
-rw-r--r--devel/automake/Makefile3
-rw-r--r--devel/automake/files/patch-ad11
-rw-r--r--devel/automake110/Makefile3
-rw-r--r--devel/automake110/files/patch-ad11
-rw-r--r--devel/automake14/Makefile3
-rw-r--r--devel/automake14/files/patch-ad11
-rw-r--r--devel/automake15/Makefile3
-rw-r--r--devel/automake15/files/patch-ad11
-rw-r--r--devel/automake16/Makefile3
-rw-r--r--devel/automake16/files/patch-ad11
-rw-r--r--devel/automake17/Makefile3
-rw-r--r--devel/automake17/files/patch-ad11
-rw-r--r--devel/automake18/Makefile3
-rw-r--r--devel/automake18/files/patch-ad11
-rw-r--r--devel/automake19/Makefile3
-rw-r--r--devel/automake19/files/patch-ad11
-rw-r--r--devel/gnu-automake/Makefile3
-rw-r--r--devel/gnu-automake/files/patch-ad11
18 files changed, 126 insertions, 0 deletions
diff --git a/devel/automake/Makefile b/devel/automake/Makefile
index a31ea876ed3a..dec01e0a76c8 100644
--- a/devel/automake/Makefile
+++ b/devel/automake/Makefile
@@ -19,6 +19,9 @@ USE_PERL5= yes
STRIP= # none
+pre-configure:
+ ${PERL} -pi -e "s^%%X11BASE%%^${X11BASE}^" ${WRKSRC}/aclocal.in
+
post-install:
@install-info ${PREFIX}/info/automake.info ${PREFIX}/info/dir
diff --git a/devel/automake/files/patch-ad b/devel/automake/files/patch-ad
new file mode 100644
index 000000000000..2d5b1223d4f1
--- /dev/null
+++ b/devel/automake/files/patch-ad
@@ -0,0 +1,11 @@
+--- aclocal.in.orig Sun Jan 10 20:35:27 1999
++++ aclocal.in Sat Jul 15 13:59:55 2000
+@@ -103,7 +103,7 @@
+
+
+ local (@dirlist) = &parse_arguments (@ARGV);
+-&scan_m4_files ($acdir, @dirlist);
++&scan_m4_files ($acdir, '%%X11BASE%%/share/aclocal', @dirlist);
+ &scan_configure;
+ if (! $exit_status)
+ {
diff --git a/devel/automake110/Makefile b/devel/automake110/Makefile
index a31ea876ed3a..dec01e0a76c8 100644
--- a/devel/automake110/Makefile
+++ b/devel/automake110/Makefile
@@ -19,6 +19,9 @@ USE_PERL5= yes
STRIP= # none
+pre-configure:
+ ${PERL} -pi -e "s^%%X11BASE%%^${X11BASE}^" ${WRKSRC}/aclocal.in
+
post-install:
@install-info ${PREFIX}/info/automake.info ${PREFIX}/info/dir
diff --git a/devel/automake110/files/patch-ad b/devel/automake110/files/patch-ad
new file mode 100644
index 000000000000..2d5b1223d4f1
--- /dev/null
+++ b/devel/automake110/files/patch-ad
@@ -0,0 +1,11 @@
+--- aclocal.in.orig Sun Jan 10 20:35:27 1999
++++ aclocal.in Sat Jul 15 13:59:55 2000
+@@ -103,7 +103,7 @@
+
+
+ local (@dirlist) = &parse_arguments (@ARGV);
+-&scan_m4_files ($acdir, @dirlist);
++&scan_m4_files ($acdir, '%%X11BASE%%/share/aclocal', @dirlist);
+ &scan_configure;
+ if (! $exit_status)
+ {
diff --git a/devel/automake14/Makefile b/devel/automake14/Makefile
index a31ea876ed3a..dec01e0a76c8 100644
--- a/devel/automake14/Makefile
+++ b/devel/automake14/Makefile
@@ -19,6 +19,9 @@ USE_PERL5= yes
STRIP= # none
+pre-configure:
+ ${PERL} -pi -e "s^%%X11BASE%%^${X11BASE}^" ${WRKSRC}/aclocal.in
+
post-install:
@install-info ${PREFIX}/info/automake.info ${PREFIX}/info/dir
diff --git a/devel/automake14/files/patch-ad b/devel/automake14/files/patch-ad
new file mode 100644
index 000000000000..2d5b1223d4f1
--- /dev/null
+++ b/devel/automake14/files/patch-ad
@@ -0,0 +1,11 @@
+--- aclocal.in.orig Sun Jan 10 20:35:27 1999
++++ aclocal.in Sat Jul 15 13:59:55 2000
+@@ -103,7 +103,7 @@
+
+
+ local (@dirlist) = &parse_arguments (@ARGV);
+-&scan_m4_files ($acdir, @dirlist);
++&scan_m4_files ($acdir, '%%X11BASE%%/share/aclocal', @dirlist);
+ &scan_configure;
+ if (! $exit_status)
+ {
diff --git a/devel/automake15/Makefile b/devel/automake15/Makefile
index a31ea876ed3a..dec01e0a76c8 100644
--- a/devel/automake15/Makefile
+++ b/devel/automake15/Makefile
@@ -19,6 +19,9 @@ USE_PERL5= yes
STRIP= # none
+pre-configure:
+ ${PERL} -pi -e "s^%%X11BASE%%^${X11BASE}^" ${WRKSRC}/aclocal.in
+
post-install:
@install-info ${PREFIX}/info/automake.info ${PREFIX}/info/dir
diff --git a/devel/automake15/files/patch-ad b/devel/automake15/files/patch-ad
new file mode 100644
index 000000000000..2d5b1223d4f1
--- /dev/null
+++ b/devel/automake15/files/patch-ad
@@ -0,0 +1,11 @@
+--- aclocal.in.orig Sun Jan 10 20:35:27 1999
++++ aclocal.in Sat Jul 15 13:59:55 2000
+@@ -103,7 +103,7 @@
+
+
+ local (@dirlist) = &parse_arguments (@ARGV);
+-&scan_m4_files ($acdir, @dirlist);
++&scan_m4_files ($acdir, '%%X11BASE%%/share/aclocal', @dirlist);
+ &scan_configure;
+ if (! $exit_status)
+ {
diff --git a/devel/automake16/Makefile b/devel/automake16/Makefile
index a31ea876ed3a..dec01e0a76c8 100644
--- a/devel/automake16/Makefile
+++ b/devel/automake16/Makefile
@@ -19,6 +19,9 @@ USE_PERL5= yes
STRIP= # none
+pre-configure:
+ ${PERL} -pi -e "s^%%X11BASE%%^${X11BASE}^" ${WRKSRC}/aclocal.in
+
post-install:
@install-info ${PREFIX}/info/automake.info ${PREFIX}/info/dir
diff --git a/devel/automake16/files/patch-ad b/devel/automake16/files/patch-ad
new file mode 100644
index 000000000000..2d5b1223d4f1
--- /dev/null
+++ b/devel/automake16/files/patch-ad
@@ -0,0 +1,11 @@
+--- aclocal.in.orig Sun Jan 10 20:35:27 1999
++++ aclocal.in Sat Jul 15 13:59:55 2000
+@@ -103,7 +103,7 @@
+
+
+ local (@dirlist) = &parse_arguments (@ARGV);
+-&scan_m4_files ($acdir, @dirlist);
++&scan_m4_files ($acdir, '%%X11BASE%%/share/aclocal', @dirlist);
+ &scan_configure;
+ if (! $exit_status)
+ {
diff --git a/devel/automake17/Makefile b/devel/automake17/Makefile
index a31ea876ed3a..dec01e0a76c8 100644
--- a/devel/automake17/Makefile
+++ b/devel/automake17/Makefile
@@ -19,6 +19,9 @@ USE_PERL5= yes
STRIP= # none
+pre-configure:
+ ${PERL} -pi -e "s^%%X11BASE%%^${X11BASE}^" ${WRKSRC}/aclocal.in
+
post-install:
@install-info ${PREFIX}/info/automake.info ${PREFIX}/info/dir
diff --git a/devel/automake17/files/patch-ad b/devel/automake17/files/patch-ad
new file mode 100644
index 000000000000..2d5b1223d4f1
--- /dev/null
+++ b/devel/automake17/files/patch-ad
@@ -0,0 +1,11 @@
+--- aclocal.in.orig Sun Jan 10 20:35:27 1999
++++ aclocal.in Sat Jul 15 13:59:55 2000
+@@ -103,7 +103,7 @@
+
+
+ local (@dirlist) = &parse_arguments (@ARGV);
+-&scan_m4_files ($acdir, @dirlist);
++&scan_m4_files ($acdir, '%%X11BASE%%/share/aclocal', @dirlist);
+ &scan_configure;
+ if (! $exit_status)
+ {
diff --git a/devel/automake18/Makefile b/devel/automake18/Makefile
index a31ea876ed3a..dec01e0a76c8 100644
--- a/devel/automake18/Makefile
+++ b/devel/automake18/Makefile
@@ -19,6 +19,9 @@ USE_PERL5= yes
STRIP= # none
+pre-configure:
+ ${PERL} -pi -e "s^%%X11BASE%%^${X11BASE}^" ${WRKSRC}/aclocal.in
+
post-install:
@install-info ${PREFIX}/info/automake.info ${PREFIX}/info/dir
diff --git a/devel/automake18/files/patch-ad b/devel/automake18/files/patch-ad
new file mode 100644
index 000000000000..2d5b1223d4f1
--- /dev/null
+++ b/devel/automake18/files/patch-ad
@@ -0,0 +1,11 @@
+--- aclocal.in.orig Sun Jan 10 20:35:27 1999
++++ aclocal.in Sat Jul 15 13:59:55 2000
+@@ -103,7 +103,7 @@
+
+
+ local (@dirlist) = &parse_arguments (@ARGV);
+-&scan_m4_files ($acdir, @dirlist);
++&scan_m4_files ($acdir, '%%X11BASE%%/share/aclocal', @dirlist);
+ &scan_configure;
+ if (! $exit_status)
+ {
diff --git a/devel/automake19/Makefile b/devel/automake19/Makefile
index a31ea876ed3a..dec01e0a76c8 100644
--- a/devel/automake19/Makefile
+++ b/devel/automake19/Makefile
@@ -19,6 +19,9 @@ USE_PERL5= yes
STRIP= # none
+pre-configure:
+ ${PERL} -pi -e "s^%%X11BASE%%^${X11BASE}^" ${WRKSRC}/aclocal.in
+
post-install:
@install-info ${PREFIX}/info/automake.info ${PREFIX}/info/dir
diff --git a/devel/automake19/files/patch-ad b/devel/automake19/files/patch-ad
new file mode 100644
index 000000000000..2d5b1223d4f1
--- /dev/null
+++ b/devel/automake19/files/patch-ad
@@ -0,0 +1,11 @@
+--- aclocal.in.orig Sun Jan 10 20:35:27 1999
++++ aclocal.in Sat Jul 15 13:59:55 2000
+@@ -103,7 +103,7 @@
+
+
+ local (@dirlist) = &parse_arguments (@ARGV);
+-&scan_m4_files ($acdir, @dirlist);
++&scan_m4_files ($acdir, '%%X11BASE%%/share/aclocal', @dirlist);
+ &scan_configure;
+ if (! $exit_status)
+ {
diff --git a/devel/gnu-automake/Makefile b/devel/gnu-automake/Makefile
index a31ea876ed3a..dec01e0a76c8 100644
--- a/devel/gnu-automake/Makefile
+++ b/devel/gnu-automake/Makefile
@@ -19,6 +19,9 @@ USE_PERL5= yes
STRIP= # none
+pre-configure:
+ ${PERL} -pi -e "s^%%X11BASE%%^${X11BASE}^" ${WRKSRC}/aclocal.in
+
post-install:
@install-info ${PREFIX}/info/automake.info ${PREFIX}/info/dir
diff --git a/devel/gnu-automake/files/patch-ad b/devel/gnu-automake/files/patch-ad
new file mode 100644
index 000000000000..2d5b1223d4f1
--- /dev/null
+++ b/devel/gnu-automake/files/patch-ad
@@ -0,0 +1,11 @@
+--- aclocal.in.orig Sun Jan 10 20:35:27 1999
++++ aclocal.in Sat Jul 15 13:59:55 2000
+@@ -103,7 +103,7 @@
+
+
+ local (@dirlist) = &parse_arguments (@ARGV);
+-&scan_m4_files ($acdir, @dirlist);
++&scan_m4_files ($acdir, '%%X11BASE%%/share/aclocal', @dirlist);
+ &scan_configure;
+ if (! $exit_status)
+ {