Attachment 4738 Details for Bug 11842 – file.diff

[patch] file.diff

file.diff (text/plain), 2.88 KB, created by reg on 1999-05-23 00:20:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: reg

Created: 1999-05-23 00:20:01 UTC

Size: 2.88 KB

patch

obsolete

>--- /usr/ports.ref/cad/geda/Makefile	Fri Apr 23 10:51:05 1999
>+++ cad/geda/Makefile	Mon May 17 01:47:31 1999
>@@ -15,15 +15,13 @@
> 
> MAINTAINER=	vanilla@FreeBSD.ORG
> 
>-LIB_DEPENDS=	gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \
>+LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
> 		guile.4:${PORTSDIR}/lang/guile
> 
>-USE_X_PREFIX=	yes
>-GNU_CONFIGURE=	yes
>-CONFIGURE_ENV=	CPPFLAGS="${CFLAGS}" 
>-CONFIGURE_ARGS=	--with-gtk-config=${X11BASE}/bin/gtk12-config
>+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
> 
>-post-install:
>-	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
>+USE_X_PREFIX=	yes
>+USE_LIBTOOL=	yes
>+CONFIGURE_ARGS=	--with-gtk-config=${GTK_CONFIG}
> 
> .include <bsd.port.mk>
>--- /usr/ports.ref/cad/geda/patches/patch-aa	Wed Feb  3 01:42:43 1999
>+++ cad/geda/patches/patch-aa	Mon May 17 01:47:01 1999
>@@ -1,53 +0,0 @@
>---- ltmain.sh.orig	Sun Dec 13 13:00:00 1998
>-+++ ltmain.sh	Tue Feb  2 23:17:51 1999
>-@@ -967,6 +967,16 @@
>-         versuffix="$current.$revision"
>-         ;;
>- 
>-+      freebsd)
>-+        version_vars="$version_vars major versuffix"
>-+        major="$current"
>-+	if [ $PORTOBJFORMAT = elf ]; then
>-+        versuffix="$current";
>-+	else
>-+        versuffix="$current.$revision";
>-+	fi
>-+        ;;
>-+
>-       *)
>-         $echo "$modename: unknown library version type \`$version_type'" 1>&2
>-         echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
>---- ltconfig.orig	Sun Dec 13 13:00:00 1998
>-+++ ltconfig	Tue Feb  2 23:18:10 1999
>-@@ -777,7 +777,7 @@
>-     ;;
>- 
>-   # FreeBSD 3, at last, uses gcc -shared to do shared libraries.
>--  freebsd3*)
>-+  freebsd*)
>-     archive_cmds='$CC -shared -o $lib$libobjs'
>-     hardcode_libdir_flag_spec='-R$libdir'
>-     hardcode_direct=yes
>-@@ -1123,10 +1123,21 @@
>-   finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/$[^/]*$\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
>-   ;;
>- 
>--freebsd2* | freebsd3*)
>-+freebsd2*)
>-   version_type=sunos
>-   library_names_spec='${libname}${release}.so.$versuffix $libname.so'
>-   finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir'
>-+  shlibpath_var=LD_LIBRARY_PATH
>-+  ;;
>-+
>-+freebsd*)
>-+  version_type=freebsd
>-+  library_names_spec='${libname}${release}.so.$versuffix $libname.so'
>-+  if [ $PORTOBJFORMAT = elf ]; then
>-+  finish_cmds='PATH="\$PATH:/sbin" OBJFORMAT="$PORTOBJFORMAT" ldconfig -m $libdir'
>-+  else
>-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
>-+  fi
>-   shlibpath_var=LD_LIBRARY_PATH
>-   ;;
>- 
>--- /usr/ports.ref/cad/geda/pkg/PLIST	Thu May 13 15:49:26 1999
>+++ cad/geda/pkg/PLIST	Mon May 17 02:19:57 1999
>@@ -8,7 +8,6 @@
> bin/mk_sym
> bin/smash_megafile
> lib/libgeda.a
>-lib/libgeda.la
> lib/libgeda.so
> lib/libgeda.so.2.2
> share/gEDA/scheme/gnetlist.scm

Actions: View | Diff

Attachments on bug 11842: 4735 | 4736 | 4737 | 4738 | 4739 | 4740 | 4741 | 4742 | 4743 | 4744 | 4745 | 4746 | 4747 | 4748 | 4749 | 4750 | 4751 | 4752 | 4753 | 4754 | 4755 | 4756 | 4757 | 4758 | 4759 | 4760 | 4761 | 4762 | 4763 | 4764 | 4765 | 4766 | 4767 | 4768 | 4769 | 4770 | 4771 | 4772 | 4773 | 4774 | 4775 | 4776 | 4777