diff options
| author | nectar <nectar@FreeBSD.org> | 1999-01-23 06:25:49 +0800 |
|---|---|---|
| committer | nectar <nectar@FreeBSD.org> | 1999-01-23 06:25:49 +0800 |
| commit | d321e0885718f23ed6059c7d76864e2727981769 (patch) | |
| tree | d8c88f4264ab4a02a7318258eae0ceaf0604a27b | |
| parent | 39bf09fedd947c783a34bdd3d24ad040a12ce492 (diff) | |
| download | freebsd-ports-gnome-d321e0885718f23ed6059c7d76864e2727981769.tar.gz freebsd-ports-gnome-d321e0885718f23ed6059c7d76864e2727981769.tar.zst freebsd-ports-gnome-d321e0885718f23ed6059c7d76864e2727981769.zip | |
Fixup: Ports that want gtk+ 1.0.x should now reference gtk10-config.
| -rw-r--r-- | x11-fm/workplace/Makefile | 6 | ||||
| -rw-r--r-- | x11-fm/workplace/files/patch-aa | 16 | ||||
| -rw-r--r-- | x11-fm/workplace/files/patch-ab | 30 |
3 files changed, 49 insertions, 3 deletions
diff --git a/x11-fm/workplace/Makefile b/x11-fm/workplace/Makefile index f6c3ba6663b2..c98e2b22876c 100644 --- a/x11-fm/workplace/Makefile +++ b/x11-fm/workplace/Makefile @@ -3,7 +3,7 @@ # Date created: 7 March 1998 # Whom: Andrey Zakhvatov # -# $Id: Makefile,v 1.9 1998/09/22 22:55:55 asami Exp $ +# $Id: Makefile,v 1.10 1998/10/04 02:17:24 steve Exp $ # DISTNAME= workplace-1.0.a3 @@ -13,12 +13,12 @@ MASTER_SITES= http://www2.osk.3web.ne.jp/~hideki70/src/ MAINTAINER= andy@icc.surw.chel.su -LIB_DEPENDS= gtk.1:${PORTSDIR}/x11-toolkits/gtk +LIB_DEPENDS= gtk10.1:${PORTSDIR}/x11-toolkits/gtk10 GNU_CONFIGURE= yes USE_X_PREFIX= yes CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include/gtk10" \ - LIBS="-L${LOCALBASE}/lib" + LIBS="-L${LOCALBASE}/lib" pre-configure: @ ${RM} ${WRKSRC}/config.cache diff --git a/x11-fm/workplace/files/patch-aa b/x11-fm/workplace/files/patch-aa new file mode 100644 index 000000000000..4ecae4de16b1 --- /dev/null +++ b/x11-fm/workplace/files/patch-aa @@ -0,0 +1,16 @@ +--- configure.in.orig Fri Jan 22 16:21:28 1999 ++++ configure.in Fri Jan 22 16:22:59 1999 +@@ -37,10 +37,10 @@ + + LDFLAGS="$saved_ldflags $X_LDFLAGS $X_LIBS" + +- AC_CHECK_LIB(gtk, gtk_widget_new, +- X_LIBS="$X_LIBS -lgtk -lgdk -lglib $x_libs -lm", ++ AC_CHECK_LIB(gtk10, gtk_widget_new, ++ X_LIBS="$X_LIBS -lgtk10 -lgdk10 -lglib10 $x_libs -lm", + [AC_MSG_ERROR(Can not link with gtk/gdk/glib)], +- -lgdk -lglib $x_libs -lm) ++ -lgdk10 -lglib10 $x_libs -lm) + + CFLAGS="$saved_cflags" + LDFLAGS="$saved_ldflags" diff --git a/x11-fm/workplace/files/patch-ab b/x11-fm/workplace/files/patch-ab new file mode 100644 index 000000000000..0f18ec1a479e --- /dev/null +++ b/x11-fm/workplace/files/patch-ab @@ -0,0 +1,30 @@ +--- configure.orig Fri Jan 22 16:21:32 1999 ++++ configure Fri Jan 22 16:23:08 1999 +@@ -1807,14 +1807,14 @@ + + LDFLAGS="$saved_ldflags $X_LDFLAGS $X_LIBS" + +- echo $ac_n "checking for gtk_widget_new in -lgtk""... $ac_c" 1>&6 +-echo "configure:1812: checking for gtk_widget_new in -lgtk" >&5 +-ac_lib_var=`echo gtk'_'gtk_widget_new | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for gtk_widget_new in -lgtk10""... $ac_c" 1>&6 ++echo "configure:1812: checking for gtk_widget_new in -lgtk10" >&5 ++ac_lib_var=`echo gtk10'_'gtk_widget_new | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-lgtk -lgdk -lglib $x_libs -lm $LIBS" ++LIBS="-lgtk10 -lgdk10 -lglib10 $x_libs -lm $LIBS" + cat > conftest.$ac_ext <<EOF + #line 1820 "configure" + #include "confdefs.h" +@@ -1842,7 +1842,7 @@ + fi + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 +- X_LIBS="$X_LIBS -lgtk -lgdk -lglib $x_libs -lm" ++ X_LIBS="$X_LIBS -lgtk10 -lgdk10 -lglib10 $x_libs -lm" + else + echo "$ac_t""no" 1>&6 + { echo "configure: error: Can not link with gtk/gdk/glib" 1>&2; exit 1; } |