From owner-svn-ports-all@FreeBSD.ORG Wed May 14 19:28:43 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 35158A6E; Wed, 14 May 2014 19:28:43 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 21DF521AC; Wed, 14 May 2014 19:28:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4EJSh2q010991; Wed, 14 May 2014 19:28:43 GMT (envelope-from garga@svn.freebsd.org) Received: (from garga@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4EJSggh010987; Wed, 14 May 2014 19:28:42 GMT (envelope-from garga@svn.freebsd.org) Message-Id: <201405141928.s4EJSggh010987@svn.freebsd.org> From: Renato Botelho Date: Wed, 14 May 2014 19:28:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354084 - in head/devel/libslang2: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 May 2014 19:28:43 -0000 Author: garga Date: Wed May 14 19:28:41 2014 New Revision: 354084 URL: http://svnweb.freebsd.org/changeset/ports/354084 QAT: https://qat.redports.org/buildarchive/r354084/ Log: . Move USE_BZIP2 to USES=tar:bzip2 . Fix stage with non-root . Strip binaries Added: head/devel/libslang2/files/ head/devel/libslang2/files/patch-configure (contents, props changed) head/devel/libslang2/files/patch-slsh__Makefile.in (contents, props changed) head/devel/libslang2/files/patch-src__Makefile.in (contents, props changed) Modified: head/devel/libslang2/Makefile Modified: head/devel/libslang2/Makefile ============================================================================== --- head/devel/libslang2/Makefile Wed May 14 18:29:25 2014 (r354083) +++ head/devel/libslang2/Makefile Wed May 14 19:28:41 2014 (r354084) @@ -16,7 +16,7 @@ LICENSE= GPLv2 CONFLICTS= libslang-1.*.j[0-9] -USE_BZIP2= yes +USES= tar:bzip2 USE_LDCONFIG= yes GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes @@ -58,6 +58,10 @@ post-patch: @${REINPLACE_CMD} -e 's, install[_-]docs,,g; /MKINSDIR.*DEST_SLSH_DOC_DIR/d' \ ${WRKSRC}/src/Makefile.in \ ${WRKSRC}/slsh/Makefile.in + @${REINPLACE_CMD} -e '/RANLIB.*DEST_LIBDIR/d' \ + ${WRKSRC}/src/Makefile.in + @${REINPLACE_CMD} -e 's,INSTALL_MODULE,INSTALL_LIB,g' \ + ${WRKSRC}/modules/Makefile.in post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} Added: head/devel/libslang2/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/libslang2/files/patch-configure Wed May 14 19:28:41 2014 (r354084) @@ -0,0 +1,19 @@ +--- configure.orig 2014-05-14 19:15:05.000000000 -0300 ++++ configure 2014-05-14 19:16:21.000000000 -0300 +@@ -664,6 +664,7 @@ + GNU_READLINE + TERMINFO_LAYOUT + pkgconfigdir ++INSTALL_LIB + INSTALL_DATA + INSTALL_SCRIPT + INSTALL_PROGRAM +@@ -4163,6 +4164,8 @@ + + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + ++test -z "$INSTALL_LIB" && INSTALL_LIB='${INSTALL} -s -m 444' ++ + + + # Check whether --with-pkgconfigdir was given. Added: head/devel/libslang2/files/patch-slsh__Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/libslang2/files/patch-slsh__Makefile.in Wed May 14 19:28:41 2014 (r354084) @@ -0,0 +1,23 @@ +--- slsh/Makefile.in.orig 2011-04-10 23:37:07.000000000 -0300 ++++ slsh/Makefile.in 2014-05-14 19:25:14.000000000 -0300 +@@ -23,6 +23,7 @@ + #---------------------------------------------------------------------------- + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ ++INSTALL_PROGRAM = @INSTALL_PROGRAM@ + MKINSDIR = $(CONFIG_DIR)/autoconf/mkinsdir.sh + #---------------------------------------------------------------------------- + # Where system-wide slsh.rc, scripts, and library files reside +@@ -147,9 +148,9 @@ + # + install: slsh install_directories install_lib_files install_rline_files \ + install_scripts install_help install_docs +- $(INSTALL) $(OBJDIR)/slsh $(DEST_BIN_DIR)/ +- $(INSTALL_DATA) etc/slsh.rc $(DEST_SLSH_CONF_DIR)/ +- echo 'prepend_to_slang_load_path("$(SLSH_LOCALLIB_DIR)");' >> $(DEST_SLSH_CONF_DIR)/slsh.rc ++ $(INSTALL_PROGRAM) $(OBJDIR)/slsh $(DEST_BIN_DIR)/ ++ ( echo 'prepend_to_slang_load_path("$(SLSH_LOCALLIB_DIR)");'; cat etc/slsh.rc ) > etc/slsh.rc.new ++ $(INSTALL_DATA) etc/slsh.rc.new $(DEST_SLSH_CONF_DIR)/slsh.rc + $(INSTALL_DATA) doc/man/slsh.1 $(DEST_MAN_DIR)/ + #--------------------------------------------------------------------------- + # Housekeeping Added: head/devel/libslang2/files/patch-src__Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/libslang2/files/patch-src__Makefile.in Wed May 14 19:28:41 2014 (r354084) @@ -0,0 +1,19 @@ +--- src/Makefile.in.orig 2014-05-14 19:08:43.000000000 -0300 ++++ src/Makefile.in 2014-05-14 19:09:40.000000000 -0300 +@@ -63,6 +63,7 @@ + RANLIB = @RANLIB@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ ++INSTALL_LIB = @INSTALL_LIB@ + MKINSDIR = @CONFIG_DIR@/autoconf/mkinsdir.sh + RM = rm -f + RM_R = rm -rf +@@ -195,7 +196,7 @@ + -$(RM) $(DEST_LIBDIR)/$(ELFLIB) + -$(RM) $(DEST_LIBDIR)/$(ELFLIB_MAJOR) + @echo installing $(ELFLIB_BUILD_NAME) in $(DEST_LIBDIR) +- $(INSTALL_DATA) $(ELFDIR_ELF_LIB) $(DEST_LIBDIR)/ ++ $(INSTALL_LIB) $(ELFDIR_ELF_LIB) $(DEST_LIBDIR)/ + -cd $(DEST_LIBDIR) && $(LN) $(ELFLIB_BUILD_NAME) $(ELFLIB_MAJOR) + -cd $(DEST_LIBDIR) && $(LN) $(ELFLIB_MAJOR) $(ELFLIB) + @echo ""