[102458] trunk/dports/sysutils/e2fsprogs

3 Feb 2013

Revision: 102458
          https://trac.macports.org/changeset/102458
Author:   cal@macports.org
Date:     2013-02-03 14:35:17 -0800 (Sun, 03 Feb 2013)
Log Message:
-----------
e2fsprogs: update to 1.42.7, move libcomerr to a subport, removes conflict with kerberos5, see #26869

(after a kerberos5 commit, which I will do in a second)

Modified Paths:
--------------
    trunk/dports/sysutils/e2fsprogs/Portfile

Added Paths:
-----------
    trunk/dports/sysutils/e2fsprogs/files/patch-Makefile.in-remove-included-libcomerr.diff
    trunk/dports/sysutils/e2fsprogs/files/patch-lib__et__compile_et.sh.in.diff

Modified: trunk/dports/sysutils/e2fsprogs/Portfile
===================================================================

--- trunk/dports/sysutils/e2fsprogs/Portfile	2013-02-03 21:02:21 UTC (rev 102457)
+++ trunk/dports/sysutils/e2fsprogs/Portfile	2013-02-03 22:35:17 UTC (rev 102458)
@@ -4,8 +4,7 @@
 PortSystem                  1.0
 
 name                        e2fsprogs
-conflicts                   kerberos5
-version                     1.42.6
+version                     1.42.7
 categories                  sysutils
 platforms                   darwin
 maintainers                 nomaintainer
@@ -21,28 +20,53 @@
 homepage                    http://e2fsprogs.sourceforge.net/
 master_sites                sourceforge:project/e2fsprogs/e2fsprogs/v${version}
 
-checksums                   sha1    cd05cd4205a00d01a6da821660cff386788e9be3 \
-                            rmd160  cc00eed371237548f86c7856420a6c5a41411128 \
-                            sha256  726b5919edeaee5b077d7a5b602284f1453ea31cf499efa433af26c679b667a5
+checksums                   rmd160  365ce2a182e5adc988f3428634a8bed5d05910a2 \
+                            sha256  dc6501b2e75d205e425196d753d92b129c568525d8aad08085c0aa69ee9e7345
 
 depends_build               port:pkgconfig
-depends_lib                 port:gettext \
-                            port:ossp-uuid
+depends_lib                 port:gettext
 
-patchfiles                  patch-lib__Makefile.darwin-lib
+configure.args-append       --enable-bsd-shlibs
 
-if {${configure.compiler} == "clang"} {
-   # This project is not C99 conformant and has return type conflicts that
-   # clang complains about
-   configure.cflags-append  "--std=gnu89 -Wno-return-type"
+
+if {${name} == ${subport}} {
+    configure.args-append       --disable-libuuid \
+                                --disable-uuidd
+
+    depends_lib-append          port:ossp-uuid \
+                                port:libcomerr
+
+    patchfiles-append           patch-lib__Makefile.darwin-lib \
+                                patch-Makefile.in-remove-included-libcomerr.diff
+
+    if {${configure.compiler} == "clang"} {
+        # This project is not C99 conformant and has return type conflicts that
+        # clang complains about
+        configure.cflags-append  "--std=gnu89 -Wno-return-type"
+    }
+
+    pre-build {
+        ln -fs ${prefix}/bin/compile_et ${worksrcpath}/lib/et/compile_et
+        ln -fs ${prefix}/lib/libcom_err.1.1.dylib ${worksrcpath}/lib/libcom_err.dylib
+    }
+
+    universal_variant           no
+
+    destroot.target-append      install-libs
 }
 
-universal_variant           no
+subport libcomerr {
+    license                     MIT BSD
 
-configure.args-append       --enable-bsd-shlibs \
-                            --disable-libuuid --disable-uuidd
+    patchfiles-append           patch-lib__et__compile_et.sh.in.diff
 
-destroot.target-append      install-libs
+    build.args-append           -C lib/et
+    destroot.args-append        -C lib/et
+    post-destroot {
+        ln -fs libcom_err.1.1.dylib ${destroot}${prefix}/lib/libcom_err.dylib
+        system "install_name_tool -id ${prefix}/lib/libcom_err.1.1.dylib ${destroot}${prefix}/lib/libcom_err.1.1.dylib"
+    }
+}
 
 livecheck.type              regex
 livecheck.regex             ${name}-(\[0-9.\]+)\\.tar

Added: trunk/dports/sysutils/e2fsprogs/files/patch-Makefile.in-remove-included-libcomerr.diff
===================================================================
--- trunk/dports/sysutils/e2fsprogs/files/patch-Makefile.in-remove-included-libcomerr.diff	                        (rev 0)
+++ trunk/dports/sysutils/e2fsprogs/files/patch-Makefile.in-remove-included-libcomerr.diff	2013-02-03 22:35:17 UTC (rev 102458)
@@ -0,0 +1,19 @@
+--- Makefile.in.orig	2013-02-03 21:52:12.000000000 +0100
++++ Makefile.in	2013-02-03 21:52:24.000000000 +0100
+@@ -15,7 +15,7 @@
+ @BLKID_CMT@BLKID_LIB_SUBDIR= lib/blkid
+ @QUOTA_CMT@QUOTA_LIB_SUBDIR= lib/quota
+ 
+-LIB_SUBDIRS=lib/et lib/ss lib/e2p $(UUID_LIB_SUBDIR) lib/ext2fs $(BLKID_LIB_SUBDIR) $(QUOTA_LIB_SUBDIR) intl
++LIB_SUBDIRS=lib/ss lib/e2p $(UUID_LIB_SUBDIR) lib/ext2fs $(BLKID_LIB_SUBDIR) $(QUOTA_LIB_SUBDIR) intl
+ PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR) tests/progs po
+ SUBDIRS=util $(LIB_SUBDIRS) $(PROG_SUBDIRS) tests
+ 
+@@ -32,7 +32,6 @@
+ subs: $(DEP_SUBSTITUTE)
+ 	@for i in $(SUBS) ; do if test -d `dirname $$i` ; \
+ 		then $(MAKE) $$i || exit $$? ; fi ; done
+-	@(if test -d lib/et ; then cd lib/et && $(MAKE) compile_et; fi)
+ 	@(if test -d lib/ext2fs ; then cd lib/ext2fs && $(MAKE) ext2_err.h; fi)
+ 
+ progs: all-progs-recursive

Added: trunk/dports/sysutils/e2fsprogs/files/patch-lib__et__compile_et.sh.in.diff
===================================================================
--- trunk/dports/sysutils/e2fsprogs/files/patch-lib__et__compile_et.sh.in.diff	                        (rev 0)
+++ trunk/dports/sysutils/e2fsprogs/files/patch-lib__et__compile_et.sh.in.diff	2013-02-03 22:35:17 UTC (rev 102458)
@@ -0,0 +1,27 @@
+--- lib/et/compile_et.sh.in.orig	2013-02-03 22:16:20.000000000 +0100
++++ lib/et/compile_et.sh.in	2013-02-03 22:16:47.000000000 +0100
+@@ -5,11 +5,9 @@
+ datarootdir=@datarootdir@
+ AWK=@AWK@
+ DIR="${DIR-@datadir@/et}"
+-ET_DIR="@ET_DIR@"
+ 
+ if test "$1" = "--build-tree" ; then
+     shift;
+-    DIR="$ET_DIR"
+ fi
+ 
+ if test "x$1" = x ; then
+@@ -30,12 +28,8 @@
+ done
+ 
+ if test ! -f "$DIR/et_h.awk" || test ! -f "$DIR/et_c.awk" ; then
+-    DIR="$ET_DIR"
+-#    echo "Falling back to $DIR..."
+-    if test ! -f "$DIR/et_h.awk" || test ! -f "$DIR/et_c.awk" ; then
+ 	echo "compile_et: Couldn't find compile_et's template files."
+ 	exit 1
+-    fi
+ fi
+ 
+ ROOT=`echo $1 | sed -e s/.et$//`

    

cal＠macports.org

tags

participants (1)