mirror of
https://git.freebsd.org/ports.git
synced 2025-06-21 20:50:31 -04:00
bb8a25690e
- Remove some patches that are now applied on the source code [1] - Use OPTIONS for some dependencies now - Makefile and build script changes causing build to fail-fast rather than continue when errors occur; also explicitly build options rather than allowing build failures - Misc other simple build fixes Removed file(s) [1]: - files/patch-clip::clip_makeslib.in - files/patch-cliplibs::clip-gd::gd::gdft.c - files/patch-cliplibs::clip-gtkextra::configure - files/patch-gd::configure PR: ports/78536 [1] Submitted by: Renato Botelho <renato@galle.com.br> Approved by: clement (mentor)
77 lines
2.4 KiB
Text
77 lines
2.4 KiB
Text
--- cliplibs/clip-gtkextra/configure.orig Mon Oct 25 19:56:51 2004
|
|
+++ cliplibs/clip-gtkextra/configure Fri Apr 15 21:24:57 2005
|
|
@@ -3,6 +3,10 @@
|
|
uname=`uname -s`
|
|
uver=`uname -r`
|
|
hname=`hostname -f 2>/dev/null`
|
|
+gtkconfig=gtk-config
|
|
+gtkpath=
|
|
+glibconfig=glib-config
|
|
+glibpath=glibpath=
|
|
oldpwd=`pwd`
|
|
|
|
[ -z "$CLIPROOT" ] && CLIPROOT=$(cd ../../../; pwd)/cliproot
|
|
@@ -35,6 +39,10 @@
|
|
;;
|
|
FreeBSD*)
|
|
osname=FREEBSD
|
|
+ gtkconfig=gtk12-config
|
|
+ gtkpath=/gtk12
|
|
+ glibconfig=glib12-config
|
|
+ glibpath=/glib12
|
|
STATICLINK=-static
|
|
;;
|
|
NetBSD*)
|
|
@@ -67,7 +75,8 @@
|
|
echo '#define SYSTEM "'$uname'"' >&3
|
|
echo '' >&3
|
|
|
|
-gtkprefix=`gtk-config --prefix 2>/dev/null`
|
|
+glibprefix=`${glibconfig} --prefix 2>/dev/null`
|
|
+gtkprefix=`${gtkconfig} --prefix 2>/dev/null`
|
|
|
|
if [ $? -ne 0 ]
|
|
then
|
|
@@ -77,11 +86,11 @@
|
|
echo "*****************************************************************"
|
|
USE_GTK=no
|
|
else
|
|
- gtkincpath=`find $gtkprefix/include/gtk-1.2 -name 'gtk.h' -printf '%h'`
|
|
+ gtkincpath=`find $gtkprefix/include$gtkpath -name 'gtk.h' -exec dirname {} \;`
|
|
cd $gtkincpath/..
|
|
gtkincpath=`pwd`
|
|
cd $oldpwd
|
|
- LIBS=`gtk-config --libs`
|
|
+ LIBS=`${gtkconfig} --libs`
|
|
|
|
if [ "$osname" = "CYGWIN" ]
|
|
then
|
|
@@ -97,8 +106,8 @@
|
|
echo 'Warning: system do not have installed GTK+ development'
|
|
exit
|
|
fi
|
|
- GTK_MAJOR=`gtk-config --version|cut -d. -f1`
|
|
- GTK_MINOR=`gtk-config --version|cut -d. -f2`
|
|
+ GTK_MAJOR=`${gtkconfig} --version|cut -d. -f1`
|
|
+ GTK_MINOR=`${gtkconfig} --version|cut -d. -f2`
|
|
if [ ! \( "$GTK_MAJOR" -ge 1 -o "$GTK_MINOR" -ge 2 -o "$GTK_MAJOR" -gt 1 \) ]
|
|
then
|
|
echo
|
|
@@ -115,7 +124,7 @@
|
|
echo "****************************************************************************"
|
|
USE_GTK_EXTRA=no
|
|
else
|
|
- gtkextraincpath=`find $gtkextraprefix/include -name 'gtkextra.h' -printf '%h'`
|
|
+ gtkextraincpath=`find $gtkprefix/include -name 'gtk.h' -exec dirname {} \;`
|
|
cd $gtkextraincpath/..
|
|
gtkextraincpath=`pwd`
|
|
cd $oldpwd
|
|
@@ -173,7 +182,7 @@
|
|
echo "COMPILER='$CC'" >&3
|
|
echo "DLLSUFF='$DLLSUFF'" >&3
|
|
echo "DLLREALSUFF='$DLLREALSUFF'" >&3
|
|
-echo 'INCLUDEDIRS=-I. -I$(CLIPROOT)/include -I'$gtkprefix'/include -I'$gtkextraprefix'/include' >&3
|
|
+echo 'INCLUDEDIRS=-I. -I$(CLIPROOT)/include -I$(CLIPROOT)/clip-gtk -I'$gtkprefix'/include'${gtkpath}' -I'$glibprefix'/include'${glibpath}' -I'$gtkextraprefix'/include' >&3
|
|
echo "XTARGETS='"'$(XLIB) $(XSLIB)'"'" >&3
|
|
echo "C_FLAGS=-Wall '"'$(INCLUDEDIRS)'"' '$EXTRACFLAGS'" >&3
|
|
echo "LIBS='$LIBS'" >&3
|