Attachment 4777 Details for Bug 11842 – file.diff

[patch] file.diff

file.diff (text/plain), 5.67 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: 5.67 KB

patch

obsolete

>--- /usr/ports.ref/x11-toolkits/gtkgl/Makefile	Thu Apr 22 14:58:54 1999
>+++ x11-toolkits/gtkgl/Makefile	Fri May 14 03:18:53 1999
>@@ -13,17 +13,13 @@
> 
> MAINTAINER=	billf@FreeBSD.org
> 
>-LIB_DEPENDS=	gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \
>+LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
> 		MesaGL.14:${PORTSDIR}/graphics/Mesa3
>-BUILD_DEPENDS=	${LOCALBASE}/share/libtool/ltconfig:${PORTSDIR}/devel/libtool/
> 
>-GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=  --with-Mesa=yes
>-CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
>+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
> 
>-pre-install:
>-	@if [ ! -f ${PREFIX}/info/dir ]; then \
>-	${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
>-	fi
>+USE_LIBTOOL=	yes
>+CONFIGURE_ARGS= --with-Mesa=yes
>+CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
> 
> .include <bsd.port.mk>
>--- /usr/ports.ref/x11-toolkits/gtkgl/patches/patch-aa	Thu Apr 22 14:58:54 1999
>+++ x11-toolkits/gtkgl/patches/patch-aa	Mon May 10 18:43:41 1999
>@@ -1,94 +1,20 @@
>-*** configure.orig	Sat Apr 18 13:25:08 1998
>---- configure	Mon Feb  1 22:56:18 1999
>-***************
>-*** 1330,1337 ****
>-  # Actually configure libtool.  ac_aux_dir is where install-sh is found.
>-  CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
>-  LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
>-! ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
>-! $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
>-  || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
>-  
>-  
>---- 1330,1337 ----
>-  # Actually configure libtool.  ac_aux_dir is where install-sh is found.
>-  CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
>-  LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
>-! ${CONFIG_SHELL-/bin/sh} ${LOCALBASE}/share/libtool/ltconfig \
>-! $libtool_flags --no-verify ${LOCALBASE}/share/libtool//ltmain.sh $host \
>-  || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
>-  
>-  
>-***************
>-*** 1397,1414 ****
>-    if test x$gtk_config_exec_prefix != x ; then
>-       gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
>-       if test x${GTK_CONFIG+set} != xset ; then
>-!         GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
>-       fi
>-    fi
>-    if test x$gtk_config_prefix != x ; then
>-       gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
>-       if test x${GTK_CONFIG+set} != xset ; then
>-!         GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
>-       fi
>-    fi
>-  
>-!   # Extract the first word of "gtk-config", so it can be a program name with args.
>-! set dummy gtk-config; ac_word=$2
>-  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-  echo "configure:1414: checking for $ac_word" >&5
>-  if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
>---- 1397,1414 ----
>-    if test x$gtk_config_exec_prefix != x ; then
>-       gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
>-       if test x${GTK_CONFIG+set} != xset ; then
>-!         GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk12-config
>-       fi
>-    fi
>-    if test x$gtk_config_prefix != x ; then
>-       gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
>-       if test x${GTK_CONFIG+set} != xset ; then
>-!         GTK_CONFIG=$gtk_config_prefix/bin/gtk12-config
>-       fi
>-    fi
>-  
>-!   # Extract the first word of "gtk12-config", so it can be a program name with args.
>-! set dummy gtk12-config; ac_word=$2
>-  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-  echo "configure:1414: checking for $ac_word" >&5
>-  if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
>-***************
>-*** 2456,2462 ****
>-    echo $ac_n "(cached) $ac_c" 1>&6
>-  else
>-    ac_save_LIBS="$LIBS"
>-! LIBS="-lGL ${last_LDFLAGS} $LIBS"
>-  cat > conftest.$ac_ext <<EOF
>-  #line 2462 "configure"
>-  #include "confdefs.h"
>---- 2456,2462 ----
>-    echo $ac_n "(cached) $ac_c" 1>&6
>-  else
>-    ac_save_LIBS="$LIBS"
>-! LIBS="-lGL -lXext ${last_LDFLAGS} $LIBS"
>-  cat > conftest.$ac_ext <<EOF
>-  #line 2462 "configure"
>-  #include "confdefs.h"
>-***************
>-*** 2536,2542 ****
>-    echo $ac_n "(cached) $ac_c" 1>&6
>-  else
>-    ac_save_LIBS="$LIBS"
>-! LIBS="-lGLU ${last_LDFLAGS} $LIBS"
>-  cat > conftest.$ac_ext <<EOF
>-  #line 2542 "configure"
>-  #include "confdefs.h"
>---- 2536,2542 ----
>-    echo $ac_n "(cached) $ac_c" 1>&6
>-  else
>-    ac_save_LIBS="$LIBS"
>-! LIBS="-lGLU -lXext -lGL ${last_LDFLAGS} $LIBS"
>-  cat > conftest.$ac_ext <<EOF
>-  #line 2542 "configure"
>-  #include "confdefs.h"
>+--- configure.orig	Sat Apr 18 05:55:08 1998
>++++ configure	Wed May  5 03:00:01 1999
>+@@ -2456,7 +2456,7 @@
>+   echo $ac_n "(cached) $ac_c" 1>&6
>+ else
>+   ac_save_LIBS="$LIBS"
>+-LIBS="-lGL ${last_LDFLAGS} $LIBS"
>++LIBS="-lGL -lXext ${last_LDFLAGS} $LIBS"
>+ cat > conftest.$ac_ext <<EOF
>+ #line 2462 "configure"
>+ #include "confdefs.h"
>+@@ -2536,7 +2536,7 @@
>+   echo $ac_n "(cached) $ac_c" 1>&6
>+ else
>+   ac_save_LIBS="$LIBS"
>+-LIBS="-lGLU ${last_LDFLAGS} $LIBS"
>++LIBS="-lGLU -lXext -lGL ${last_LDFLAGS} $LIBS"
>+ cat > conftest.$ac_ext <<EOF
>+ #line 2542 "configure"
>+ #include "confdefs.h"
>--- /usr/ports.ref/x11-toolkits/gtkgl/pkg/PLIST	Sun Sep 20 23:25:15 1998
>+++ x11-toolkits/gtkgl/pkg/PLIST	Sat May 22 16:44:42 1999
>@@ -10,16 +10,14 @@
> include/gtkGL/gtkGLmain.h
> @unexec install-info --delete %D/info/gtkGL.info %D/info/dir
> info/gtkGL.info
>-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
> @exec install-info %D/info/gtkGL.info %D/info/dir
> lib/libgdkGL.a
>-lib/libgdkGL.la
> lib/libgdkGL.so
> lib/libgdkGL.so.0.9
> lib/libgtkGL.a
>-lib/libgtkGL.la
> lib/libgtkGL.so
> lib/libgtkGL.so.0.9
>-@exec /sbin/ldconfig -m %D/lib
>+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
>+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
> @dirrm include/gtkGL
> @dirrm include/gdkGL

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