diff options
Diffstat (limited to 'x11-fm/workplace')
| -rw-r--r-- | x11-fm/workplace/Makefile | 11 | ||||
| -rw-r--r-- | x11-fm/workplace/files/patch-aa | 40 | ||||
| -rw-r--r-- | x11-fm/workplace/files/patch-ab | 40 |
3 files changed, 47 insertions, 44 deletions
diff --git a/x11-fm/workplace/Makefile b/x11-fm/workplace/Makefile index 65e14cd..dc78848 100644 --- a/x11-fm/workplace/Makefile +++ b/x11-fm/workplace/Makefile @@ -8,15 +8,18 @@ PORTNAME= workplace PORTVERSION= 1.0.a3 CATEGORIES= x11-fm -MASTER_SITES= http://www2.osk.3web.ne.jp/~hideki70/src/ +MASTER_SITES= http://people.freebsd.org/~trevor/ports/distfiles/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= trevor@FreeBSD.org -LIB_DEPENDS= gtk10.1:${PORTSDIR}/x11-toolkits/gtk10 +BROKEN= "patches are not yet correct" + +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 GNU_CONFIGURE= yes USE_X_PREFIX= yes -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include/gtk10" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/glib12 \ + -I${X11BASE}/include/gtk12" \ LIBS="-L${LOCALBASE}/lib" pre-configure: diff --git a/x11-fm/workplace/files/patch-aa b/x11-fm/workplace/files/patch-aa index 4ecae4d..7f57ac5 100644 --- a/x11-fm/workplace/files/patch-aa +++ b/x11-fm/workplace/files/patch-aa @@ -1,16 +1,30 @@ ---- configure.in.orig Fri Jan 22 16:21:28 1999 -+++ configure.in Fri Jan 22 16:22:59 1999 -@@ -37,10 +37,10 @@ +--- configure.orig Wed Apr 8 02:48:44 1998 ++++ configure Thu Oct 5 02:42:18 2000 +@@ -1807,14 +1807,14 @@ 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" +- 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 -lgtk12""... $ac_c" 1>&6 ++echo "configure:1812: checking for gtk_widget_new in -lgtk12" >&5 ++ac_lib_var=`echo gtk12'_'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="-lgtk12 -lgdk12 -lglib12 $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 -lgtk12 -lgdk12 -lglib12 $x_libs -lm" + else + echo "$ac_t""no" 1>&6 + { echo "configure: error: Can not link with gtk/gdk/glib" 1>&2; exit 1; } diff --git a/x11-fm/workplace/files/patch-ab b/x11-fm/workplace/files/patch-ab index 0f18ec1..3bf8ce2 100644 --- a/x11-fm/workplace/files/patch-ab +++ b/x11-fm/workplace/files/patch-ab @@ -1,30 +1,16 @@ ---- configure.orig Fri Jan 22 16:21:32 1999 -+++ configure Fri Jan 22 16:23:08 1999 -@@ -1807,14 +1807,14 @@ +--- configure.in.orig Wed Apr 8 02:39:00 1998 ++++ configure.in Thu Oct 5 02:42:18 2000 +@@ -37,10 +37,10 @@ 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; } +- AC_CHECK_LIB(gtk, gtk_widget_new, +- X_LIBS="$X_LIBS -lgtk -lgdk -lglib $x_libs -lm", ++ AC_CHECK_LIB(gtk12, gtk_widget_new, ++ X_LIBS="$X_LIBS -lgtk12 -lgdk12 -lglib12 $x_libs -lm", + [AC_MSG_ERROR(Can not link with gtk/gdk/glib)], +- -lgdk -lglib $x_libs -lm) ++ -lgdk12 -lglib12 $x_libs -lm) + + CFLAGS="$saved_cflags" + LDFLAGS="$saved_ldflags" |
