diff options
author | gusi <gusi@df743ca5-7f9a-e211-a948-0013205c9059> | 2014-04-08 17:10:40 +0800 |
---|---|---|
committer | gusi <gusi@df743ca5-7f9a-e211-a948-0013205c9059> | 2014-04-08 17:10:40 +0800 |
commit | 5891408eacc5bac17757ce78cb1f431fe493c761 (patch) | |
tree | 5dd259f9740c29e7684b8fb4efe1c723c14d0b66 | |
parent | 216010cff63a15fd10257d790426445a9d005d6e (diff) | |
download | marcuscom-ports-experimental-5891408eacc5bac17757ce78cb1f431fe493c761.tar.gz marcuscom-ports-experimental-5891408eacc5bac17757ce78cb1f431fe493c761.tar.zst marcuscom-ports-experimental-5891408eacc5bac17757ce78cb1f431fe493c761.zip |
Remove two patches that were incorrectly put in the port directory. Reset the MCom tag while
here.
git-svn-id: svn://creme-brulee.marcuscom.com/ports-experimental/trunk@19465 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r-- | x11/gnome-terminal/Makefile | 2 | ||||
-rw-r--r-- | x11/gnome-terminal/patch-configure | 55 | ||||
-rw-r--r-- | x11/gnome-terminal/patch-configure.ac | 13 |
3 files changed, 1 insertions, 69 deletions
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile index 2a15856..a7f781d 100644 --- a/x11/gnome-terminal/Makefile +++ b/x11/gnome-terminal/Makefile @@ -1,6 +1,6 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom: ports-experimental/trunk/x11/gnome-terminal/Makefile 19438 2014-04-01 15:37:19Z gusi $ +# $MCom$ PORTNAME= gnome-terminal PORTVERSION= 3.12.0 diff --git a/x11/gnome-terminal/patch-configure b/x11/gnome-terminal/patch-configure deleted file mode 100644 index 54434bd..0000000 --- a/x11/gnome-terminal/patch-configure +++ /dev/null @@ -1,55 +0,0 @@ ---- configure.orig 2011-01-13 04:08:02.000000000 +0000 -+++ configure 2011-01-13 04:08:30.000000000 +0000 -@@ -14510,6 +13851,52 @@ - ;; - esac - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kinfo_getfile in -lutil" >&5 -+$as_echo_n "checking for kinfo_getfile in -lutil... " >&6; } -+if ${ac_cv_lib_util_kinfo_getfile+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lutil $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char kinfo_getfile (); -+int -+main () -+{ -+return kinfo_getfile (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_util_kinfo_getfile=yes -+else -+ ac_cv_lib_util_kinfo_getfile=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_kinfo_getfile" >&5 -+$as_echo "$ac_cv_lib_util_kinfo_getfile" >&6; } -+if test "x$ac_cv_lib_util_kinfo_getfile" = xyes; then : -+ LIBS="${LIBS} -lutil" -+ -+$as_echo "#define HAVE_KINFO_GETFILE 1" >>confdefs.h -+ -+else -+ : -+fi -+ -+ - if test "$GTK_BUILDER_CONVERT" = "false"; then - as_fn_error $? "gtk-builder-convert not found" "$LINENO" 5 - fi diff --git a/x11/gnome-terminal/patch-configure.ac b/x11/gnome-terminal/patch-configure.ac deleted file mode 100644 index 5e3a59f..0000000 --- a/x11/gnome-terminal/patch-configure.ac +++ /dev/null @@ -1,13 +0,0 @@ ---- configure.ac.orig 2011-01-11 19:41:06.000000000 +0000 -+++ configure.ac 2011-01-13 04:07:54.000000000 +0000 -@@ -136,6 +136,10 @@ - 3.0) AC_PATH_PROGS([GTK_BUILDER_CONVERT],[gtk-builder-convert gtk-builder-convert-3.0],[false]) ;; - esac - -+AC_CHECK_LIB(util, kinfo_getfile, -+ [LIBS="${LIBS} -lutil" -+ AC_DEFINE(HAVE_KINFO_GETFILE, 1, [Define if you have the kinfo_getfile function])], [:]) -+ - if test "$GTK_BUILDER_CONVERT" = "false"; then - AC_MSG_ERROR([gtk-builder-convert not found]) - fi |