1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-24 04:33:24 +00:00

- Respect LOCALBASE/PREFIX

- Fix ia64

Submitted by:	Sten Feldman <exile@chamber.ee> (maintainer)
This commit is contained in:
Pav Lucistnik 2005-10-27 11:01:32 +00:00
parent c1c8dd1f5c
commit 3fbea6477d
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=146468
4 changed files with 188 additions and 0 deletions

View File

@ -17,6 +17,8 @@ COMMENT= Programmer's editor with a nice Text User Interface (TUI)
LIB_DEPENDS= rhtv.2:${PORTSDIR}/devel/rhtvision
HAS_CONFIGURE= yes
CONFIGURE_ENV= LOCALBASE="${LOCALBASE}" \
X11BASE="${X11BASE}"
USE_PERL5_BUILD=yes
USE_GMAKE= yes

View File

@ -0,0 +1,21 @@
*** libmigdb/src/Makefile.orig Thu Oct 27 12:18:57 2005
--- libmigdb/src/Makefile Thu Oct 27 12:19:34 2005
***************
*** 3,10 ****
all: libmigdb.a
! CFLAGS=-O2 -Wall -gstabs+3 -I.
! CXXFLAGS=-O2 -Wall -gstabs+3
LDLIBS=
connect.o: mi_gdb.h
--- 3,10 ----
all: libmigdb.a
! CFLAGS=-O2 -Wall -I.
! CXXFLAGS=-O2 -Wall
LDLIBS=
connect.o: mi_gdb.h

View File

@ -0,0 +1,93 @@
*** config.pl.orig Tue Oct 12 22:00:54 2004
--- config.pl Thu Oct 27 12:06:23 2005
***************
*** 169,175 ****
}
elsif ($OS eq 'UNIX')
{
! $MakeDefsRHIDE[0]='RHIDE_STDINC=/usr/include /usr/local/include /usr/include/g++ /usr/local/include/g++ /usr/lib/gcc-lib /usr/local/lib/gcc-lib';
if (@conf{'static'} eq 'yes')
{ $libs=TVConfigOption('slibs'); }
else
--- 169,175 ----
}
elsif ($OS eq 'UNIX')
{
! $MakeDefsRHIDE[0]='RHIDE_STDINC=/usr/include ' . $ENV{'LOCALBASE'} . '/include /usr/include/g++ ' . $ENV{'LOCALBASE'} . '/include/g++ /usr/lib/gcc-lib ' . $ENV{'LOCALBASE'} . '/lib/gcc-lib';
if (@conf{'static'} eq 'yes')
{ $libs=TVConfigOption('slibs'); }
else
***************
*** 456,464 ****
elsif ($i eq '--debug')
{
$conf{'XCFLAGS'}=
! $conf{'XCXXFLAGS'}='-O3 -fomit-frame-pointer -ffast-math -gstabs+3';
$conf{'CFLAGS'}=
! $conf{'CXXFLAGS'}='-O2 -Wall -Werror -gstabs+3';
}
elsif ($i eq '--with-mixer')
{
--- 456,464 ----
elsif ($i eq '--debug')
{
$conf{'XCFLAGS'}=
! $conf{'XCXXFLAGS'}='-O3 -fomit-frame-pointer -ffast-math';
$conf{'CFLAGS'}=
! $conf{'CXXFLAGS'}='-O2 -Wall -Werror';
}
elsif ($i eq '--with-mixer')
{
***************
*** 783,790 ****
}
elsif ($OS eq 'UNIX')
{
! @dirsI=("$parent/tvision/include",'/usr/include/rhtvision','/usr/local/include/rhtvision');
! @dirsL=("$parent/tvision/makes",'/usr/lib','/usr/local/lib');
}
elsif ($OS eq 'Win32')
{
--- 783,790 ----
}
elsif ($OS eq 'UNIX')
{
! @dirsI=("$parent/tvision/include",'/usr/include/rhtvision',$ENV{'LOCALBASE'} . '/include/rhtvision');
! @dirsL=("$parent/tvision/makes",'/usr/lib',$ENV{'LOCALBASE'} . '/lib');
}
elsif ($OS eq 'Win32')
{
***************
*** 1856,1862 ****
return 0;
}
';
! $conf{'X11LibPath'}='/usr/X11R6/lib' unless $conf{'X11LibPath'};
$conf{'X11Lib'}='X11 Xmu' unless $conf{'X11Lib'};
$libs=$conf{'X11Lib'};
$libs=~s/(\S+)/-l$1/g;
--- 1856,1862 ----
return 0;
}
';
! $conf{'X11LibPath'}=$ENV{'X11BASE'} . '/lib' unless $conf{'X11LibPath'};
$conf{'X11Lib'}='X11 Xmu' unless $conf{'X11Lib'};
$libs=$conf{'X11Lib'};
$libs=~s/(\S+)/-l$1/g;
***************
*** 1873,1879 ****
{
if (!$conf{'X11IncludePath'})
{
! $conf{'X11IncludePath'}='/usr/X11R6/include';
$o.="-I$conf{'X11IncludePath'} -L$conf{'X11LibPath'} $libs";
if ($test=~/OK, (\d+)\.(\d+)/)
{
--- 1873,1879 ----
{
if (!$conf{'X11IncludePath'})
{
! $conf{'X11IncludePath'}=$ENV{'X11BASE'} . '/include';
$o.="-I$conf{'X11IncludePath'} -L$conf{'X11LibPath'} $libs";
if ($test=~/OK, (\d+)\.(\d+)/)
{

View File

@ -0,0 +1,72 @@
*** conflib.pl.orig Wed Oct 26 21:55:24 2005
--- conflib.pl Wed Oct 26 21:57:36 2005
***************
*** 246,252 ****
else
{
if ($OSf eq 'FreeBSD')
! { $prefix='/usr/local'; }
else
{ $prefix='/usr'; }
}
--- 246,252 ----
else
{
if ($OSf eq 'FreeBSD')
! { $prefix=$ENV{'PREFIX'}; }
else
{ $prefix='/usr'; }
}
***************
*** 567,573 ****
$ret.=' -pipe' if $UsePipe;
# Looks like that's common and some sysadmins doesn't configure gcc to
# look there:
! $conf{'EXTRA_INCLUDE_DIRS'}.=' /usr/local/include' if ($OSf eq 'FreeBSD');
}
}
print "$ret\n";
--- 567,573 ----
$ret.=' -pipe' if $UsePipe;
# Looks like that's common and some sysadmins doesn't configure gcc to
# look there:
! $conf{'EXTRA_INCLUDE_DIRS'}.=' ' . $ENV{'LOCALBASE'} . '/include' if ($OSf eq 'FreeBSD');
}
}
print "$ret\n";
***************
*** 596,602 ****
return $ret;
}
$ret='';
! $ret.='/usr/local/lib' if ($OSf eq 'FreeBSD');
$conf{'LDExtraDirs'}=$ret;
$ret;
}
--- 596,602 ----
return $ret;
}
$ret='';
! $ret.=$ENV{'LOCALBASE'} . '/lib' if ($OSf eq 'FreeBSD');
$conf{'LDExtraDirs'}=$ret;
$ret;
}
***************
*** 639,646 ****
{
$ret='-O2'; # -gstabs+3';
$ret.=' -pipe' if $UsePipe;
! $ret.=' -L/usr/local/include' if ($OSf eq 'FreeBSD');
! $conf{'EXTRA_INCLUDE_DIRS'}.=' /usr/local/include' if ($OSf eq 'FreeBSD');
}
}
print "$ret\n";
--- 639,646 ----
{
$ret='-O2'; # -gstabs+3';
$ret.=' -pipe' if $UsePipe;
! $ret.=' -L' . $ENV{'LOCALBASE'} . '/include' if ($OSf eq 'FreeBSD');
! $conf{'EXTRA_INCLUDE_DIRS'}.=' ' . $ENV{'LOCALBASE'} . '/include' if ($OSf eq 'FreeBSD');
}
}
print "$ret\n";