From owner-svn-ports-head@FreeBSD.ORG Sun Nov 10 10:16:55 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 3F2458A8; Sun, 10 Nov 2013 10:16:55 +0000 (UTC) (envelope-from marino@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 12B4A2192; Sun, 10 Nov 2013 10:16:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAAAGsHo015688; Sun, 10 Nov 2013 10:16:54 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAAAGs0S015687; Sun, 10 Nov 2013 10:16:54 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201311101016.rAAAGs0S015687@svn.freebsd.org> From: John Marino Date: Sun, 10 Nov 2013 10:16:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333370 - head/archivers/zip-ada X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Nov 2013 10:16:55 -0000 Author: marino Date: Sun Nov 10 10:16:54 2013 New Revision: 333370 URL: http://svnweb.freebsd.org/changeset/ports/333370 Log: archivers/zip-ada: Convert to staging Also remove extract depends on unzip; base tar can do this. Modified: head/archivers/zip-ada/Makefile Modified: head/archivers/zip-ada/Makefile ============================================================================== --- head/archivers/zip-ada/Makefile Sun Nov 10 10:10:14 2013 (r333369) +++ head/archivers/zip-ada/Makefile Sun Nov 10 10:16:54 2013 (r333370) @@ -12,13 +12,11 @@ COMMENT= Zip compressed archive file for LICENSE= MIT -NO_STAGE= yes USES= ada perl5 USE_PERL5= build -USE_ZIP= yes USE_DOS2UNIX= yes +EXTRACT_SUFX= .zip WRKSRC= ${WRKDIR}/zip-ada -DESTINY= ${WRKDIR}/destino MAKE_ENV+= Build_Mode=Optimize ZTOOLS= zipada comp_zip find_zip rezip bunzip lz DEMOS= demo_zip demo_unzip ziptest demo_csv_into_zip test_extract \ @@ -27,30 +25,29 @@ DEMOS= demo_zip demo_unzip ziptest demo do-build: @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gnatmake -P zipada.gpr - @${MKDIR} ${DESTINY}${PREFIX}/bin \ - ${DESTINY}${EXAMPLESDIR} \ - ${DESTINY}${PREFIX}/include/zip-ada \ - ${DESTINY}${PREFIX}/lib/zip-ada \ - ${DESTINY}${PREFIX}/lib/gnat + +do-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/bin \ + ${STAGEDIR}${EXAMPLESDIR} \ + ${STAGEDIR}${PREFIX}/include/zip-ada \ + ${STAGEDIR}${PREFIX}/lib/zip-ada \ + ${STAGEDIR}${PREFIX}/lib/gnat @${MKDIR} ${WRKSRC}/obj_tools ${WRKSRC}/obj_demos .for F in ${ZTOOLS} - @${INSTALL_PROGRAM} ${WRKSRC}/${F} ${DESTINY}${PREFIX}/bin/ + @${INSTALL_PROGRAM} ${WRKSRC}/${F} ${STAGEDIR}${PREFIX}/bin/ @${MV} ${WRKSRC}/obj_opt/${F}.* ${WRKSRC}/obj_tools/ .endfor .for F in ${DEMOS} - @${INSTALL_PROGRAM} ${WRKSRC}/${F} ${DESTINY}${EXAMPLESDIR}/ + @${INSTALL_PROGRAM} ${WRKSRC}/${F} ${STAGEDIR}${EXAMPLESDIR}/ @${MV} ${WRKSRC}/obj_opt/${F}.* ${WRKSRC}/obj_demos/ .endfor @cd ${WRKSRC}/obj_opt && ${AR} rcs libzip-ada.a *.o - @${MV} ${DESTINY}${PREFIX}/bin/bunzip ${DESTINY}${PREFIX}/bin/debzip2 + @${MV} ${STAGEDIR}${PREFIX}/bin/bunzip ${STAGEDIR}${PREFIX}/bin/debzip2 @${INSTALL_DATA} ${WRKSRC}/zip_lib/*.ad[sb] \ - ${DESTINY}${PREFIX}/include/zip-ada/ + ${STAGEDIR}${PREFIX}/include/zip-ada/ @${INSTALL_DATA} ${WRKSRC}/obj_opt/*.ali \ - ${DESTINY}${PREFIX}/lib/zip-ada/ - @${INSTALL_LIB} ${WRKSRC}/obj_opt/*.a ${DESTINY}${PREFIX}/lib/zip-ada/ - @${INSTALL_DATA} ${FILESDIR}/zip-ada.gpr ${DESTINY}${PREFIX}/lib/gnat/ - -do-install: - ${CP} -pR ${DESTINY}${PREFIX}/ ${PREFIX}/ + ${STAGEDIR}${PREFIX}/lib/zip-ada/ + @${INSTALL_LIB} ${WRKSRC}/obj_opt/*.a ${STAGEDIR}${PREFIX}/lib/zip-ada/ + @${INSTALL_DATA} ${FILESDIR}/zip-ada.gpr ${STAGEDIR}${PREFIX}/lib/gnat/ .include