[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (32a248c15e09041bda4ec1aec17dd5cf6699341f)

Ladislav Hagara scm at sourcemage.org
Mon Apr 11 19:36:16 EDT 2011


GIT changes to master grimoire by Ladislav Hagara <hgr at vabo.cz>:

 ChangeLog                       |    1 
 disk/ntfsprogs/BUILD            |    1 
 disk/ntfsprogs/DETAILS          |    9 +++---
 disk/ntfsprogs/HISTORY          |    3 ++
 disk/ntfsprogs/INSTALL          |    1 
 disk/ntfsprogs/PRE_BUILD        |    6 ----
 disk/ntfsprogs/UP_TRIGGERS      |    2 +
 disk/ntfsprogs/gnutls-2.8.patch |   52 ----------------------------------------
 8 files changed, 14 insertions(+), 61 deletions(-)

New commits:
commit 32a248c15e09041bda4ec1aec17dd5cf6699341f
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    disk/ntfsprogs: deprecated, part of ntfs-3g

diff --git a/ChangeLog b/ChangeLog
index e12922d..fbbb14c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2011-04-11 Ladislav Hagara <hgr at vabo.cz>
 	* x11-toolkits/gtkmm3: new spell, C++ wrapper library for GTK+3
+	* disk/ntfsprogs: spell deprecated, merged into ntfs-3g
 
 2011-04-10 Ladislav Hagara <hgr at vabo.cz>
 	* gnome2-libs/yelp-xsl: new spell, Yelp XSLT Stylesheets
diff --git a/disk/ntfsprogs/BUILD b/disk/ntfsprogs/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/disk/ntfsprogs/BUILD
@@ -0,0 +1 @@
+true
diff --git a/disk/ntfsprogs/DETAILS b/disk/ntfsprogs/DETAILS
index 07a45cc..6e973e3 100755
--- a/disk/ntfsprogs/DETAILS
+++ b/disk/ntfsprogs/DETAILS
@@ -1,10 +1,11 @@
            SPELL=ntfsprogs
-         VERSION=2.0.0
-     SOURCE_HASH=sha512:5dc09a205bf4f9b9cc51b51799623a5e71e5be00f879abf1b4e1a5bb10be2671f8fbcb49c59967eb635acf2f65dd1ec98527d22a08aa5b5e88639eebe92caf67
-          SOURCE=$SPELL-$VERSION.tar.gz
+         VERSION=DEPRECATED
+#     SOURCE_HASH=sha512:5dc09a205bf4f9b9cc51b51799623a5e71e5be00f879abf1b4e1a5bb10be2671f8fbcb49c59967eb635acf2f65dd1ec98527d22a08aa5b5e88639eebe92caf67
+#          SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=$SOURCEFORGE_URL/linux-ntfs/$SOURCE
+#   SOURCE_URL[0]=$SOURCEFORGE_URL/linux-ntfs/$SOURCE
 #      SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+         ARCHIVE=off
         WEB_SITE=http://linux-ntfs.org
       LICENSE[0]=GPL
          ENTERED=20030930
diff --git a/disk/ntfsprogs/HISTORY b/disk/ntfsprogs/HISTORY
index b0989e4..d3b43f7 100644
--- a/disk/ntfsprogs/HISTORY
+++ b/disk/ntfsprogs/HISTORY
@@ -1,3 +1,6 @@
+2011-04-11 Ladislav Hagara <hgr at vabo.cz>
+	* *: spell deprecated, now part of ntfs-3g
+
 2010-04-30 Elisamuel Resto <ryuji at sourcemage.org>
 	* PRE_BUILD: correct patch, but second if clause was not matching
 
diff --git a/disk/ntfsprogs/INSTALL b/disk/ntfsprogs/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/disk/ntfsprogs/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/disk/ntfsprogs/PRE_BUILD b/disk/ntfsprogs/PRE_BUILD
index 23795ce..27ba77d 100755
--- a/disk/ntfsprogs/PRE_BUILD
+++ b/disk/ntfsprogs/PRE_BUILD
@@ -1,5 +1 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-if is_depends_enabled $SPELL gnutls && [[ "$(installed_version gnutls | cut -d. -f-2)" == "2.8" ]]; then
-    patch -p0 < $SPELL_DIRECTORY/gnutls-2.8.patch
-fi
+true
diff --git a/disk/ntfsprogs/UP_TRIGGERS b/disk/ntfsprogs/UP_TRIGGERS
new file mode 100755
index 0000000..5290697
--- /dev/null
+++ b/disk/ntfsprogs/UP_TRIGGERS
@@ -0,0 +1,2 @@
+up_trigger ntfsprogs dispel_self &&
+up_trigger ntfs-3g cast_self
diff --git a/disk/ntfsprogs/gnutls-2.8.patch b/disk/ntfsprogs/gnutls-2.8.patch
deleted file mode 100644
index 28b2a0d..0000000
--- a/disk/ntfsprogs/gnutls-2.8.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- libntfs/Makefile.am
-+++ libntfs/Makefile.am
-@@ -38,8 +38,8 @@
- 	-DLTVERSION_LIBNTFS=\"$(LTVERSION_LIBNTFS)\"
- 
- if ENABLE_CRYPTO
--libntfs_la_LDFLAGS += `libgnutls-config --libs` `pkg-config --libs libconfig`
--libntfs_la_CFLAGS += `libgnutls-config --cflags` `pkg-config --cflags libconfig`
-+libntfs_la_LDFLAGS += `pkg-config --libs gnutls libconfig`
-+libntfs_la_CFLAGS += `pkg-config --cflags gnutls libconfig`
- endif
- 
- libntfs_la_SOURCES =	\
---- libntfs/Makefile.in
-+++ libntfs/Makefile.in
-@@ -61,8 +61,8 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-- at ENABLE_CRYPTO_TRUE@am__append_1 = `libgnutls-config --libs` `pkg-config --libs libconfig`
-- at ENABLE_CRYPTO_TRUE@am__append_2 = `libgnutls-config --cflags` `pkg-config --cflags libconfig`
-+ at ENABLE_CRYPTO_TRUE@am__append_1 = `pkg-config --libs gnutls libconfig`
-+ at ENABLE_CRYPTO_TRUE@am__append_2 = `pkg-config --cflags gnutls libconfig`
- subdir = libntfs
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- 	$(srcdir)/libntfs-gnomevfs.8.in $(srcdir)/libntfs.8.in \
---- ntfsprogs/Makefile.am
-+++ ntfsprogs/Makefile.am
-@@ -125,8 +125,8 @@
- if ENABLE_CRYPTO
- ntfsdecrypt_SOURCES	= ntfsdecrypt.c utils.c utils.h
- ntfsdecrypt_LDADD	= $(AM_LIBS)
--ntfsdecrypt_LDFLAGS	= $(AM_LFLAGS) `libgnutls-config --libs`
--ntfsdecrypt_CFLAGS	= `libgnutls-config --cflags`
-+ntfsdecrypt_LDFLAGS	= $(AM_LFLAGS) `pkg-config --libs gnutls`
-+ntfsdecrypt_CFLAGS	= `pkg-config --cflags gnutls`
- endif
- 
- # Extra targets
---- ntfsprogs/Makefile.in
-+++ ntfsprogs/Makefile.in
-@@ -449,8 +449,8 @@
- ntfsdump_logfile_LDFLAGS = $(AM_LFLAGS)
- @ENABLE_CRYPTO_TRUE at ntfsdecrypt_SOURCES = ntfsdecrypt.c utils.c utils.h
- @ENABLE_CRYPTO_TRUE at ntfsdecrypt_LDADD = $(AM_LIBS)
-- at ENABLE_CRYPTO_TRUE@ntfsdecrypt_LDFLAGS = $(AM_LFLAGS) `libgnutls-config --libs`
-- at ENABLE_CRYPTO_TRUE@ntfsdecrypt_CFLAGS = `libgnutls-config --cflags`
-+ at ENABLE_CRYPTO_TRUE@ntfsdecrypt_LDFLAGS = $(AM_LFLAGS) `pkg-config --libs gnutls`
-+ at ENABLE_CRYPTO_TRUE@ntfsdecrypt_CFLAGS = `pkg-config --cflags gnutls`
- all: all-am
- 
- .SUFFIXES:



More information about the SM-Commit mailing list