aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkuriyama <kuriyama@FreeBSD.org>1998-10-10 21:08:16 +0800
committerkuriyama <kuriyama@FreeBSD.org>1998-10-10 21:08:16 +0800
commite833eea3a561ab37fec5325e65969ea2a9dd69f4 (patch)
tree0eae101feb5cc8f7db25fd6a970d54a79eb1eefa
parent05741a556a141f635bece25cb47c87af25c1dfcd (diff)
downloadfreebsd-ports-gnome-e833eea3a561ab37fec5325e65969ea2a9dd69f4.tar.gz
freebsd-ports-gnome-e833eea3a561ab37fec5325e65969ea2a9dd69f4.tar.zst
freebsd-ports-gnome-e833eea3a561ab37fec5325e65969ea2a9dd69f4.zip
Integrate patch-ad and patch-ah into patch-ad.
Submitted by: Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp>
-rw-r--r--japanese/perl5/files/patch-aa11
-rw-r--r--japanese/perl5/files/patch-ad31
2 files changed, 29 insertions, 13 deletions
diff --git a/japanese/perl5/files/patch-aa b/japanese/perl5/files/patch-aa
index 63fd5f7b754c..c2c792b46499 100644
--- a/japanese/perl5/files/patch-aa
+++ b/japanese/perl5/files/patch-aa
@@ -9,17 +9,6 @@
cf_email=''
cf_by=''
cf_time=''
-@@ -818,7 +818,9 @@
-
- i_whoami=''
- : change the next line if compiling for Xenix/286 on Xenix/386
--xlibpth='/usr/lib/386 /lib/386'
-+xlibpth="/usr/lib/386 /lib/386"
-+: change the next line if compiling for FreeBSD 3.0
-+xlibpth="/usr/lib/aout $xlibpath"
-
- : Possible local library directories to search.
- loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib"
@@ -862,7 +864,7 @@
: If anyone needs -lnet, put it in a hint file.
libswanted='sfio socket inet nsl nm ndbm gdbm dbm db malloc dl'
diff --git a/japanese/perl5/files/patch-ad b/japanese/perl5/files/patch-ad
index 76bdab280b5b..510e8eee86e3 100644
--- a/japanese/perl5/files/patch-ad
+++ b/japanese/perl5/files/patch-ad
@@ -1,5 +1,5 @@
---- hints/freebsd.sh.ORIG Fri Jul 24 06:00:19 1998
-+++ hints/freebsd.sh Thu Jul 30 16:04:24 1998
+--- hints/freebsd.sh.orig Fri Jul 24 13:00:19 1998
++++ hints/freebsd.sh Sat Oct 10 20:39:02 1998
@@ -68,6 +68,7 @@
d_setreuid='define'
d_setegid='undef'
@@ -27,3 +27,30 @@
;;
esac
+@@ -95,12 +102,20 @@
+ case "$osvers" in
+ 0.*|1.0*) ;;
+
+-3.0*) if [ -e /usr/lib/aout ]; then
+- libpth="/usr/lib/aout /usr/local/lib /usr/lib"
+- glibpth="/usr/lib/aout /usr/local/lib /usr/lib"
+- fi
+- cccdlflags='-DPIC -fpic'
+- lddlflags='-Bshareable'
++3.0*) objformat=`objformat`
++ if [ x$objformat = xelf ]; then
++ libpth="/usr/lib /usr/local/lib"
++ glibpth="/usr/lib /usr/local/lib"
++ ldflags="-Wl,-E "
++ lddlflags="-shared "
++ else
++ if [ -e /usr/lib/aout ]; then
++ libpth="/usr/lib/aout /usr/local/lib /usr/lib"
++ glibpth="/usr/lib/aout /usr/local/lib /usr/lib"
++ fi
++ lddlflags='-Bshareable'
++ fi
++ cccdlflags='-DPIC -fpic'
+ ;;
+
+ *) cccdlflags='-DPIC -fpic'