[122336] users/devans/dports/gnome

devans at macports.org devans at macports.org
Sun Jul 20 21:49:15 PDT 2014


Revision: 122336
          https://trac.macports.org/changeset/122336
Author:   devans at macports.org
Date:     2014-07-20 21:49:15 -0700 (Sun, 20 Jul 2014)
Log Message:
-----------
devans/dports: oregano, copy from trunk and update to version 0.82 for testing.

Modified Paths:
--------------
    users/devans/dports/gnome/oregano/Portfile
    users/devans/dports/gnome/oregano/files/patch-autogen.sh.diff

Added Paths:
-----------
    users/devans/dports/gnome/oregano/

Removed Paths:
-------------
    users/devans/dports/gnome/oregano/files/patch-configure.ac.diff
    users/devans/dports/gnome/oregano/files/patch-glib-2.32.diff

Modified: users/devans/dports/gnome/oregano/Portfile
===================================================================
--- trunk/dports/gnome/oregano/Portfile	2014-07-21 03:45:29 UTC (rev 122328)
+++ users/devans/dports/gnome/oregano/Portfile	2014-07-21 04:49:15 UTC (rev 122336)
@@ -4,8 +4,7 @@
 PortSystem          1.0
 PortGroup           github 1.0
 
-github.setup        marc-lorber oregano 0.73 v
-revision            1
+github.setup        marc-lorber oregano 0.82 v
 categories          gnome science
 maintainers         nomaintainer
 license             GPL-2+
@@ -15,42 +14,37 @@
 
 platforms           darwin
 
-checksums           rmd160  ff758dea4a5c5e37c594d474a5af263c6c172949 \
-                    sha256  7d7a6da253bf5e19de553c6e113fd444a5e8eb3aad3055c83d7df08736362d19
+checksums           rmd160  4b68fe79161e0b5034cd401eddec52c1478653de \
+                    sha256  b68cdd0c80421b0571bf520d3f8b0d1793808fee1ac7ac28dcf8ebaff2cb1a2d
 
 depends_build       port:autoconf \
                     port:automake \
                     port:intltool \
                     port:libtool \
-                    port:pkgconfig
+                    port:pkgconfig \
+                    port:gnome-doc-utils
 
-depends_lib         port:gtksourceview2 \
-                    port:libgnomecanvas \
-                    port:libgnomeui \
-                    port:rarian \
+depends_lib         port:gtk3 \
+                    port:gtksourceview3 \
+                    port:libxml2 \
+                    port:goocanvas2 \
                     port:desktop-file-utils \
-                    port:shared-mime-info
+                    port:shared-mime-info \
+                    port:rarian
 
 depends_run         port:yelp
 
-post-extract {
-    move ${worksrcpath}/configure.in ${worksrcpath}/configure.ac
-    file mkdir ${worksrcpath}/m4
-}
+patchfiles          patch-autogen.sh.diff 
 
-patchfiles          patch-autogen.sh.diff \
-                    patch-configure.ac.diff \
-                    patch-glib-2.32.diff
+configure.cmd       ./autogen.sh
 
-use_autoreconf      yes
-autoreconf.cmd      ./autogen.sh
-
 configure.args      --disable-silent-rules \
                     --disable-update-mimedb \
-                    --disable-update-mime
+                    --disable-schemas-compile
 
 post-activate {
     system "${prefix}/bin/scrollkeeper-update"
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
     system "${prefix}/bin/update-mime-database ${prefix}/share/mime"
+    system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }

Modified: users/devans/dports/gnome/oregano/files/patch-autogen.sh.diff
===================================================================
--- trunk/dports/gnome/oregano/files/patch-autogen.sh.diff	2014-07-21 03:45:29 UTC (rev 122328)
+++ users/devans/dports/gnome/oregano/files/patch-autogen.sh.diff	2014-07-21 04:49:15 UTC (rev 122336)
@@ -1,13 +1,31 @@
---- autogen.sh.orig	2012-01-08 03:24:22.000000000 -0600
-+++ autogen.sh	2012-05-11 10:40:03.000000000 -0500
-@@ -15,8 +15,8 @@
+--- autogen.sh.orig	2012-05-08 09:58:54.000000000 -0700
++++ autogen.sh	2014-07-20 21:07:40.000000000 -0700
+@@ -317,20 +317,20 @@
  
- # Refresh GNU autotools toolchain.
- echo Cleaning autotools files...
--find -type d -name autom4te.cache -print0 | xargs -0 rm -rf \;
--find -type f \( -name missing -o -name install-sh -o -name mkinstalldirs \
-+find . -type d -name autom4te.cache -print0 | xargs -0 rm -rf \;
-+find . -type f \( -name missing -o -name install-sh -o -name mkinstalldirs \
- 	-o -name depcomp -o -name ltmain.sh -o -name configure \
- 	-o -name config.sub -o -name config.guess \
- 	-o -name Makefile.in \) -print0 | xargs -0 rm -f
+ case $REQUIRED_AUTOMAKE_VERSION in
+     1.4*) automake_progs="automake-1.4" ;;
+-    1.5*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
+-    1.6*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
+-    1.7*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
+-    1.8*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;;
+-    1.9*) automake_progs="automake-1.11 automake-1.10 automake-1.9" ;;
+-    1.10*) automake_progs="automake-1.11 automake-1.10" ;;
+-    1.11*) automake_progs="automake-1.11" ;;
++    1.5*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
++    1.6*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
++    1.7*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
++    1.8*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;;
++    1.9*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9" ;;
++    1.10*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10" ;;
++    1.11*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11" ;;
+ esac
+ version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \
+     "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz"
+ ACLOCAL=`echo $AUTOMAKE | sed s/automake/aclocal/`
+ 
+ if $want_libtool; then
+-    version_check libtool LIBTOOLIZE libtoolize $REQUIRED_LIBTOOL_VERSION \
++    version_check libtool LIBTOOLIZE glibtoolize $REQUIRED_LIBTOOL_VERSION \
+         "http://ftp.gnu.org/pub/gnu/libtool/libtool-$REQUIRED_LIBTOOL_VERSION.tar.gz"
+     require_m4macro libtool.m4
+ fi

Deleted: users/devans/dports/gnome/oregano/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/gnome/oregano/files/patch-configure.ac.diff	2014-07-21 03:45:29 UTC (rev 122328)
+++ users/devans/dports/gnome/oregano/files/patch-configure.ac.diff	2014-07-21 04:49:15 UTC (rev 122336)
@@ -1,17 +0,0 @@
---- configure.ac.orig	2012-01-14 03:36:27.000000000 -0600
-+++ configure.ac	2013-05-23 05:14:53.000000000 -0500
-@@ -1,12 +1,12 @@
- AC_INIT(oregano-0.73, 0.73)
- AM_INIT_AUTOMAKE(oregano, 0.73)
- 
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AM_MAINTAINER_MODE
- 
- AC_CONFIG_MACRO_DIR([m4])
- 
--m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])œ
-+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
- 
- GETTEXT_PACKAGE=oregano
- AC_SUBST(GETTEXT_PACKAGE)

Deleted: users/devans/dports/gnome/oregano/files/patch-glib-2.32.diff
===================================================================
--- trunk/dports/gnome/oregano/files/patch-glib-2.32.diff	2014-07-21 03:45:29 UTC (rev 122328)
+++ users/devans/dports/gnome/oregano/files/patch-glib-2.32.diff	2014-07-21 04:49:15 UTC (rev 122336)
@@ -1,51 +0,0 @@
---- src/Makefile.am.orig	2012-01-14 03:36:27.000000000 -0600
-+++ src/Makefile.am	2012-06-06 18:04:54.000000000 -0500
-@@ -6,7 +6,7 @@
- 	stock		\
- 	pixmaps
- 
--AM_CFLAGS = -Wall -DG_DISABLE_DEPRECATED -DGSEAL_ENABLE \
-+AM_CFLAGS = -Wall -DGSEAL_ENABLE \
- 	-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED \
- 	-DGTK_DISABLE_DEPRECATED \
- 	-DG_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES \
---- src/engines/Makefile.am.orig	2012-01-14 03:36:27.000000000 -0600
-+++ src/engines/Makefile.am	2012-06-06 18:04:58.000000000 -0500
-@@ -1,6 +1,6 @@
- oreganodir = $(datadir)/oregano
- 
--AM_CFLAGS = -g -Wall -DG_DISABLE_DEPRECATED -DGSEAL_ENABLE \
-+AM_CFLAGS = -g -Wall -DGSEAL_ENABLE \
- 	-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED \
- 	-DGTK_DISABLE_DEPRECATED \
- 	-DG_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES \
---- src/gplot/Makefile.am.orig	2012-01-14 03:36:27.000000000 -0600
-+++ src/gplot/Makefile.am	2012-06-06 18:04:56.000000000 -0500
-@@ -1,6 +1,6 @@
- oreganodir = $(datadir)/oregano
- 
--AM_CFLAGS = -Wall -DG_DISABLE_DEPRECATED -DGSEAL_ENABLE \
-+AM_CFLAGS = -Wall -DGSEAL_ENABLE \
- 	-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED \
- 	-DGTK_DISABLE_DEPRECATED -DGTK_DISABLE_SINGLE_INCLUDES \
- 	-DG_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES
---- src/model/Makefile.am.orig	2012-01-14 03:36:27.000000000 -0600
-+++ src/model/Makefile.am	2012-06-06 18:04:53.000000000 -0500
-@@ -1,6 +1,6 @@
- oreganodir = $(datadir)/oregano
- 
--AM_CFLAGS = -Wall -DG_DISABLE_DEPRECATED -DGSEAL_ENABLE \
-+AM_CFLAGS = -Wall -DGSEAL_ENABLE \
- 	-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED \
- 	-DGTK_DISABLE_DEPRECATED \
- 	-DG_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES \
---- src/sheet/Makefile.am.orig	2012-01-14 03:36:27.000000000 -0600
-+++ src/sheet/Makefile.am	2012-06-06 18:04:51.000000000 -0500
-@@ -1,6 +1,6 @@
- oreganodir = $(datadir)/oregano
- 
--AM_CFLAGS = -Wall -DG_DISABLE_DEPRECATED -DGSEAL_ENABLE \
-+AM_CFLAGS = -Wall -DGSEAL_ENABLE \
- 	-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED \
- 	-DGTK_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES \
- 	-DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140720/7515343f/attachment.html>


More information about the macports-changes mailing list