Date: Fri, 25 Oct 2013 16:59:33 -0500 From: Pedro Giffuni <pfg@apache.org> To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/183307: update devel/hadoop to version 1.2.1 Message-ID: <526AE9C5.3000306@apache.org> In-Reply-To: <201310252020.r9PKK0Dv004917@freefall.freebsd.org> References: <201310252020.r9PKK0Dv004917@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------070309050802040706070209
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Minor (but important) enhancement:
Define PKGNAMEPREFIX to respect Apache branding rules.
--------------070309050802040706070209
Content-Type: text/plain; charset=UTF-8;
name="patch-hadoop.txt"
Content-Transfer-Encoding: 8bit
Content-Disposition: attachment;
filename="patch-hadoop.txt"
Index: hadoop/Makefile
===================================================================
--- hadoop/Makefile (revisione 331587)
+++ hadoop/Makefile (copia locale)
@@ -2,22 +2,22 @@
# $FreeBSD$
PORTNAME= hadoop
-PORTVERSION= 1.0.0
+PORTVERSION= 1.2.1
CATEGORIES= devel java
MASTER_SITES= ${MASTER_SITE_APACHE}
MASTER_SITE_SUBDIR= ${PORTNAME}/core/${PORTNAME}-${PORTVERSION}
+PKGNAMEPREFIX= apache-
DIST_SUBDIR= hadoop
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= pfg@apache.org
COMMENT= Apache Map/Reduce framework
LICENSE= AL2
-LICENSE_FILE= ${WRKSRC}/LICENSE.txt
USE_JAVA= yes
JAVA_VERSION= 1.6
USE_ANT= yes
-ONLY_FOR_ARCHS= amd64 i386
+ONLY_FOR_ARCHS= amd64 i386
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
@@ -59,8 +59,7 @@
FIX_PERMS= src/c++/pipes/install-sh src/c++/utils/install-sh src/c++/libhdfs/install-sh \
src/c++/libhdfs/tests/test-libhdfs.sh
-FIX_DOCS= docs/cn/skin/css docs/cn/skin/scripts docs/cn/skin/translations \
- docs/jdiff docs/skin/css docs/skin/scripts docs/skin/translations
+FIX_DOCS= docs/jdiff docs/skin/css docs/skin/scripts docs/skin/translations
DOC= CHANGES.txt LICENSE.txt NOTICE.txt README.txt
@@ -81,7 +80,7 @@
.if ${ARCH} == "amd64"
_HADOOP_ARCH= FreeBSD-amd64-64
.else
-_HADOOP_ARCH= FreeBSD-i386-32
+_HADOOP_ARCH= FreeBSD-${ARCH}-32
.endif
PLIST_SUB+= HADOOP_ARCH=${_HADOOP_ARCH}
@@ -93,12 +92,6 @@
@${TOUCH} ${WRKSRC}/${d}/.empty
.endfor
-#do-build:
-# @cd ${WRKSRC}; \
-# ${ANT} -Dbuild.classes=${WRKSRC}/hadoop-core-${PORTVERSION}.jar -Dversion=${PORTVERSION} -Dcompile.native=true \
-# -Dcompile.c++=true -Dmake.cmd=${GMAKE} compile-core-native compile-c++ compile-c++-libhdfs compile-c++-pipes \
-# compile-c++-utils -Dlibhdfs=1 -Dlibrecordio=true -Dskip.record-parser=true
-
post-build:
@cd ${WRKSRC} ;${ANT} FreeBSD-dist
@${TAR} -cf - -C ${WRKSRC}/build/c++/ ${_HADOOP_ARCH}/lib ${_HADOOP_ARCH}/include | ${TAR} xf - -C ${WRKSRC}/c++/
Index: hadoop/distinfo
===================================================================
--- hadoop/distinfo (revisione 331587)
+++ hadoop/distinfo (copia locale)
@@ -1,2 +1,2 @@
-SHA256 (hadoop/hadoop-1.0.0.tar.gz) = 587bc9389d062f4e8042f2604b2d9a574080d4178614cccc07c5e5d743836f71
-SIZE (hadoop/hadoop-1.0.0.tar.gz) = 59468784
+SHA256 (hadoop/hadoop-1.2.1.tar.gz) = 94a1181771f173bdb55c8f901722825866396091f0516bdd12b34dc3de1706a1
+SIZE (hadoop/hadoop-1.2.1.tar.gz) = 63851630
Index: hadoop/files/patch-build.xml
===================================================================
--- hadoop/files/patch-build.xml (revisione 331587)
+++ hadoop/files/patch-build.xml (copia locale)
@@ -1,6 +1,6 @@
---- build.xml.orig 2011-05-04 08:30:16.000000000 +0200
-+++ build.xml 2011-08-08 00:08:22.000000000 +0200
-@@ -372,7 +372,7 @@
+--- build.xml.orig 2013-07-22 17:26:41.000000000 -0500
++++ build.xml 2013-10-25 09:24:09.000000000 -0500
+@@ -452,7 +452,7 @@
<!-- ====================================================== -->
<!-- Compile the Java files -->
<!-- ====================================================== -->
@@ -9,16 +9,16 @@
<javacc
target="${core.src.dir}/org/apache/hadoop/record/compiler/generated/rcc.jj"
outputdirectory="${core.src.dir}/org/apache/hadoop/record/compiler/generated"
-@@ -539,7 +539,7 @@
- </antcall>
+@@ -636,7 +636,7 @@
+ </exec>
</target>
-- <target name="compile-core-native" depends="compile-core-classes"
+- <target name="compile-core-native" depends="create-native-configure, compile-core-classes"
+ <target name="compile-core-native"
if="compile.native">
<mkdir dir="${build.native}/lib"/>
-@@ -1669,7 +1669,7 @@
+@@ -2042,7 +2042,7 @@
<!-- librecordio targets. -->
<!-- ================================================================== -->
@@ -27,7 +27,7 @@
<mkdir dir="${build.librecordio}"/>
<exec dir="${librecordio.src}" executable="${make.cmd}" failonerror="true">
<env key="XERCESCROOT" value="${xercescroot}"/>
-@@ -1703,7 +1703,7 @@
+@@ -2076,7 +2076,7 @@
</chmod>
</target>
@@ -36,7 +36,7 @@
<exec executable="autoreconf" dir="${c++.utils.src}" searchpath="yes"
failonerror="yes">
<arg value="-if"/>
-@@ -1726,7 +1726,7 @@
+@@ -2099,7 +2099,7 @@
</exec>
</target>
@@ -45,7 +45,7 @@
<condition property="need.c++.utils.makefile">
<not> <available file="${build.c++.utils}/Makefile"/> </not>
</condition>
-@@ -1747,7 +1747,7 @@
+@@ -2120,7 +2120,7 @@
</condition>
</target>
@@ -54,8 +54,8 @@
<condition property="need.c++.libhdfs.makefile">
<not> <available file="${build.c++.libhdfs}/Makefile"/> </not>
</condition>
-@@ -2326,5 +2326,23 @@
- <fileset file="${jsvc.install.dir}/jsvc"/>
+@@ -2824,5 +2824,23 @@
+ <fileset file="${jsvc.install.dir}/jsvc.${os.arch}"/>
</chmod>
</target>
+ <target name="FreeBSD-dist" >
Index: hadoop/files/patch-src__c++__libhdfs__m4__apsupport.m4
===================================================================
--- hadoop/files/patch-src__c++__libhdfs__m4__apsupport.m4 (revisione 0)
+++ hadoop/files/patch-src__c++__libhdfs__m4__apsupport.m4 (copia locale)
@@ -0,0 +1,11 @@
+--- src/c++/libhdfs/m4/apsupport.m4.orig 2013-10-25 14:34:59.000000000 -0500
++++ src/c++/libhdfs/m4/apsupport.m4 2013-10-25 14:35:20.000000000 -0500
+@@ -80,7 +80,7 @@
+ i?86)
+ CFLAGS="$CFLAGS -DCPU=\\\"i386\\\""
+ HOST_CPU=i386;;
+- x86_64)
++ amd64|x86_64)
+ CFLAGS="$CFLAGS -DCPU=\\\"amd64\\\""
+ HOST_CPU=amd64;;
+ bs2000)
Proprietà modificate su: hadoop/files/patch-src__c++__libhdfs__m4__apsupport.m4
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: hadoop/files/patch-src__native__Makefile.in
===================================================================
--- hadoop/files/patch-src__native__Makefile.in (revisione 331587)
+++ hadoop/files/patch-src__native__Makefile.in (copia locale)
@@ -1,31 +1,33 @@
---- src/native/Makefile.in.orig 2011-05-04 08:30:16.000000000 +0200
-+++ src/native/Makefile.in 2011-12-09 10:38:40.000000000 +0100
-@@ -92,10 +92,7 @@
- libLTLIBRARIES_INSTALL = $(INSTALL)
+--- src/native/Makefile.in.orig 2013-07-22 17:26:40.000000000 -0500
++++ src/native/Makefile.in 2013-10-25 09:42:34.000000000 -0500
+@@ -93,10 +93,7 @@
LTLIBRARIES = $(lib_LTLIBRARIES)
libhadoop_la_DEPENDENCIES =
--am_libhadoop_la_OBJECTS = ZlibCompressor.lo ZlibDecompressor.lo \
-- getGroup.lo JniBasedUnixGroupsMapping.lo \
+ am_libhadoop_la_OBJECTS = ZlibCompressor.lo ZlibDecompressor.lo \
+- SnappyCompressor.lo SnappyDecompressor.lo getGroup.lo \
+- JniBasedUnixGroupsMapping.lo \
- JniBasedUnixGroupsNetgroupMapping.lo file_descriptor.lo \
- errno_enum.lo NativeIO.lo
-+am_libhadoop_la_OBJECTS = ZlibCompressor.lo ZlibDecompressor.lo
++ SnappyCompressor.lo SnappyDecompressor.lo
libhadoop_la_OBJECTS = $(am_libhadoop_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
-@@ -223,24 +220,15 @@
- sysconfdir = @sysconfdir@
+@@ -230,9 +227,7 @@
target_alias = @target_alias@
AM_CPPFLAGS = @JNI_CPPFLAGS@ -I$(HADOOP_NATIVE_SRCDIR)/src \
-- -Isrc/org/apache/hadoop/io/compress/zlib \
+ -Isrc/org/apache/hadoop/io/compress/zlib \
+- -Isrc/org/apache/hadoop/io/compress/snappy \
- -Isrc/org/apache/hadoop/io/nativeio \
- -Isrc/org/apache/hadoop/security
-+ -Isrc/org/apache/hadoop/io/compress/zlib
++ -Isrc/org/apache/hadoop/io/compress/snappy
AM_LDFLAGS = @JNI_LDFLAGS@ -m$(JVM_DATA_MODEL)
AM_CFLAGS = -g -Wall -fPIC -O2 -m$(JVM_DATA_MODEL)
- lib_LTLIBRARIES = libhadoop.la
+@@ -240,16 +235,10 @@
libhadoop_la_SOURCES = src/org/apache/hadoop/io/compress/zlib/ZlibCompressor.c \
-- src/org/apache/hadoop/io/compress/zlib/ZlibDecompressor.c \
+ src/org/apache/hadoop/io/compress/zlib/ZlibDecompressor.c \
+ src/org/apache/hadoop/io/compress/snappy/SnappyCompressor.c \
+- src/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.c \
- src/org/apache/hadoop/security/getGroup.c \
- src/org/apache/hadoop/security/JniBasedUnixGroupsMapping.c \
- src/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.c \
@@ -32,15 +34,15 @@
- src/org/apache/hadoop/io/nativeio/file_descriptor.c \
- src/org/apache/hadoop/io/nativeio/errno_enum.c \
- src/org/apache/hadoop/io/nativeio/NativeIO.c
--
-+ src/org/apache/hadoop/io/compress/zlib/ZlibDecompressor.c
- libhadoop_la_LDFLAGS = -version-info 1:0:0
++ src/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.c
+
+ libhadoop_la_LDFLAGS = -version-info 1:0:0 $(AM_LDFLAGS)
-libhadoop_la_LIBADD = -ldl -ljvm
+libhadoop_la_LIBADD = -ljvm
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
-@@ -332,14 +320,8 @@
+@@ -341,16 +330,10 @@
distclean-compile:
-rm -f *.tab.c
@@ -47,6 +49,8 @@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/JniBasedUnixGroupsMapping.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/JniBasedUnixGroupsNetgroupMapping.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NativeIO.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SnappyCompressor.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SnappyDecompressor.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ZlibCompressor.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ZlibDecompressor.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/errno_enum.Plo@am__quote@
@@ -55,9 +59,9 @@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@@ -376,47 +358,6 @@
+@@ -401,47 +384,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ZlibDecompressor.lo `test -f 'src/org/apache/hadoop/io/compress/zlib/ZlibDecompressor.c' || echo '$(srcdir)/'`src/org/apache/hadoop/io/compress/zlib/ZlibDecompressor.c
+ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o SnappyDecompressor.lo `test -f 'src/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.c' || echo '$(srcdir)/'`src/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.c
-getGroup.lo: src/org/apache/hadoop/security/getGroup.c
-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getGroup.lo -MD -MP -MF "$(DEPDIR)/getGroup.Tpo" -c -o getGroup.lo `test -f 'src/org/apache/hadoop/security/getGroup.c' || echo '$(srcdir)/'`src/org/apache/hadoop/security/getGroup.c; \
Index: hadoop/pkg-plist
===================================================================
--- hadoop/pkg-plist (revisione 331587)
+++ hadoop/pkg-plist (copia locale)
@@ -136,6 +136,15 @@
%%HADOOP_HOME%%/lib/jdiff/hadoop_0.19.2.xml
%%HADOOP_HOME%%/lib/jdiff/hadoop_0.20.1.xml
%%HADOOP_HOME%%/lib/jdiff/hadoop_0.20.205.0.xml
+%%HADOOP_HOME%%/lib/jdiff/hadoop_1.0.0.xml
+%%HADOOP_HOME%%/lib/jdiff/hadoop_1.0.1.xml
+%%HADOOP_HOME%%/lib/jdiff/hadoop_1.0.2.xml
+%%HADOOP_HOME%%/lib/jdiff/hadoop_1.0.3.xml
+%%HADOOP_HOME%%/lib/jdiff/hadoop_1.0.4.xml
+%%HADOOP_HOME%%/lib/jdiff/hadoop_1.1.0.xml
+%%HADOOP_HOME%%/lib/jdiff/hadoop_1.1.1.xml
+%%HADOOP_HOME%%/lib/jdiff/hadoop_1.1.2.xml
+%%HADOOP_HOME%%/lib/jdiff/hadoop_1.2.0.xml
%%HADOOP_HOME%%/lib/jdiff/hadoop_%%PORTVERSION%%.xml
%%HADOOP_HOME%%/lib/jsp-2.1/jsp-2.1.jar
%%HADOOP_HOME%%/lib/jsp-2.1/jsp-api-2.1.jar
@@ -154,8 +163,8 @@
%%HADOOP_HOME%%/lib/native/%%HADOOP_ARCH%%/libhadoop.so
%%HADOOP_HOME%%/lib/native/%%HADOOP_ARCH%%/libhadoop.so.1
%%HADOOP_HOME%%/lib/asm-3.2.jar
-%%HADOOP_HOME%%/lib/aspectjrt-1.6.5.jar
-%%HADOOP_HOME%%/lib/aspectjtools-1.6.5.jar
+%%HADOOP_HOME%%/lib/aspectjrt-1.6.11.jar
+%%HADOOP_HOME%%/lib/aspectjtools-1.6.11.jar
%%HADOOP_HOME%%/lib/commons-beanutils-1.7.0.jar
%%HADOOP_HOME%%/lib/commons-beanutils-core-1.8.0.jar
%%HADOOP_HOME%%/lib/commons-cli-1.2.jar
@@ -166,16 +175,17 @@
%%HADOOP_HOME%%/lib/commons-digester-1.8.jar
%%HADOOP_HOME%%/lib/commons-el-1.0.jar
%%HADOOP_HOME%%/lib/commons-httpclient-3.0.1.jar
+%%HADOOP_HOME%%/lib/commons-io-2.1.jar
%%HADOOP_HOME%%/lib/commons-lang-2.4.jar
%%HADOOP_HOME%%/lib/commons-logging-1.1.1.jar
%%HADOOP_HOME%%/lib/commons-logging-api-1.0.4.jar
%%HADOOP_HOME%%/lib/commons-math-2.1.jar
-%%HADOOP_HOME%%/lib/commons-net-1.4.1.jar
+%%HADOOP_HOME%%/lib/commons-net-3.1.jar
%%HADOOP_HOME%%/lib/core-3.1.1.jar
%%HADOOP_HOME%%/lib/hsqldb-1.8.0.10.LICENSE.txt
%%HADOOP_HOME%%/lib/hsqldb-1.8.0.10.jar
-%%HADOOP_HOME%%/lib/jackson-core-asl-1.0.1.jar
-%%HADOOP_HOME%%/lib/jackson-mapper-asl-1.0.1.jar
+%%HADOOP_HOME%%/lib/jackson-core-asl-1.8.8.jar
+%%HADOOP_HOME%%/lib/jackson-mapper-asl-1.8.8.jar
%%HADOOP_HOME%%/lib/jasper-compiler-5.5.12.jar
%%HADOOP_HOME%%/lib/jasper-runtime-5.5.12.jar
%%HADOOP_HOME%%/lib/jdeb-0.8.jar
@@ -203,6 +213,8 @@
%%HADOOP_HOME%%/webapps/static/jobconf.xsl
%%HADOOP_HOME%%/webapps/static/hadoop.css
%%HADOOP_HOME%%/webapps/static/hadoop-logo.jpg
+%%HADOOP_HOME%%/webapps/secondary/index.html
+%%HADOOP_HOME%%/webapps/secondary/WEB-INF/web.xml
%%HADOOP_HOME%%/webapps/job/taskstatshistory.jsp
%%HADOOP_HOME%%/webapps/job/taskstats.jsp
%%HADOOP_HOME%%/webapps/job/taskdetailshistory.jsp
@@ -237,6 +249,7 @@
%%EXAMPLESDIR%%/mapred-default.xml
%%EXAMPLESDIR%%/conf/masters
%%EXAMPLESDIR%%/conf/slaves
+%%EXAMPLESDIR%%/conf/task-log4j.properties
%%EXAMPLESDIR%%/conf/ssl-client.xml.example
%%EXAMPLESDIR%%/conf/ssl-server.xml.example
@unexec if cmp -s %D/%%HADOOP_ETC%%/capacity-scheduler.xml %D/%%EXAMPLESDIR%%/conf/capacity-scheduler.xml; then rm -f %D/%%HADOOP_ETC%%/capacity-scheduler.xml; fi
--------------070309050802040706070209--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?526AE9C5.3000306>