From owner-svn-ports-head@FreeBSD.ORG Fri Jun 6 22:22:47 2014 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 ESMTPS id B755D48B; Fri, 6 Jun 2014 22:22:47 +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 A423B2651; Fri, 6 Jun 2014 22:22:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s56MMlSh092948; Fri, 6 Jun 2014 22:22:47 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s56MMlOu092947; Fri, 6 Jun 2014 22:22:47 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201406062222.s56MMlOu092947@svn.freebsd.org> From: John Marino Date: Fri, 6 Jun 2014 22:22:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r356859 - head/sysutils/samesame 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.18 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: Fri, 06 Jun 2014 22:22:47 -0000 Author: marino Date: Fri Jun 6 22:22:47 2014 New Revision: 356859 URL: http://svnweb.freebsd.org/changeset/ports/356859 QAT: https://qat.redports.org/buildarchive/r356859/ Log: sysutils/samesame: Stage support and simplify In addition to the provided stage support: * separate pkg-plist was created * install-strip was implified with the use of INSTALL_TARGET * most configure switches pulled into options framework * redundant post-install pkg-message removed * 2-clause BSD license documented * USE_BZIP2 converted * patch to buffer.cpp added by maintainer PR: ports/190164 Submitted by: Stephan Esser Approved by: maintainer (Alex de Kruijff) Simplified by: marino Modified: head/sysutils/samesame/Makefile Modified: head/sysutils/samesame/Makefile ============================================================================== --- head/sysutils/samesame/Makefile Fri Jun 6 22:21:32 2014 (r356858) +++ head/sysutils/samesame/Makefile Fri Jun 6 22:22:47 2014 (r356859) @@ -11,57 +11,41 @@ MASTER_SITE_SUBDIR= dhn MAINTAINER= samesame@akruijff.dds.nl COMMENT= Find duplicate files and optionally link them together -CONFLICTS= samefile-[0-9]* +LICENSE= BSD2CLAUSE -MAN1= samesame.1 samearchive.1 samearchive-lite.1 samefile.1 sameln.1 \ - samecp.1 samemv.1 samerm.1 samechflags.1 samechmod.1 samechown.1 \ - samedelay.1 -MANCOMPRESSED= no - -PLIST_FILES= bin/samearchive bin/samefile bin/samecp \ - bin/samearchive-lite bin/sameln bin/samemv \ - bin/samechflags bin/samerm bin/samechmod \ - bin/samechown bin/samedelay +CONFLICTS= samefile-[0-9]* HAS_CONFIGURE= yes +INSTALL_TARGET= install-strip CONFIGURE_ARGS= --enable-samechflags --enable-samechmod \ --mandir="${MANPREFIX}/man" --prefix="${PREFIX}" \ --includedir="${LOCALBASE}/include" --libdir="${LOCALBASE}/lib" -USE_BZIP2= yes +USES= tar:bzip2 -OPTIONS_DEFINE= DEBUG DISK_STORAGE LOW_MEMORY_PROFILE EXPERIMENTAL PROFILER TEST +OPTIONS_DEFINE= DEBUG DISK_STORAGE LOW_MEMORY_PROFILE \ + EXPERIMENTAL PROFILER TEST +OPTIONS_SUB= yes DISK_STORAGE_DESC= Allows temporarily storage on disk LOW_MEMORY_PROFILE_DESC= Low memory profile reduces functionality EXPERIMENTAL_DESC= Enables experimental functionality PROFILER_DESC= Enables gprof support TEST_DESC= Run quality assurance test -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MDEBUG} -CONFIGURE_ARGS+= --enable-debug -.endif +DISK_STORAGE_CONFIGURE_ENABLE= disk-storage +EXPERIMENTAL_CONFIGURE_ENABLE= experimental fsort #checksums preread +PROFILE_CONFIGURE_ENABLE= profiler +DEBUG_CONFIGURE_ENABLE= debug -.if ${PORT_OPTIONS:MDISK_STORAGE} -CONFIGURE_ARGS+= --enable-disk-storage -PLIST_FILES+= etc/rc.d/samesame.sh -.endif +.include -.if ${PORT_OPTIONS:MEXPERIMENTAL} -CONFIGURE_ARGS+= --enable-experimental --enable-fsort -#CONFIGURE_ARGS+= --enable-checksums --enable-preread -PLIST_FILES+= bin/fsort +.if ${PORT_OPTIONS:MDEBUG} || ${PORT_OPTIONS:MPROFILER} +INSTALL_TARGET= install .endif .if ${PORT_OPTIONS:MLOW_MEMORY_PROFILE} CONFIGURE_ARGS+= --enable-low-memory-profile --disable-read-onces .endif -.if ${PORT_OPTIONS:MPROFILER} -CONFIGURE_ARGS+= --enable-profiler -.endif - regression-test: build @cd ${WRKSRC}; ${MAKE} check @@ -71,26 +55,9 @@ post-build: .endif post-install: -.if ! ${PORT_OPTIONS:MDEBUG} && ! ${PORT_OPTIONS:MPROFILER} - ${STRIP_CMD} ${PREFIX}/bin/samefile - ${STRIP_CMD} ${PREFIX}/bin/samearchive - ${STRIP_CMD} ${PREFIX}/bin/samearchive-lite - ${STRIP_CMD} ${PREFIX}/bin/samecp - ${STRIP_CMD} ${PREFIX}/bin/samechflags - ${STRIP_CMD} ${PREFIX}/bin/samechmod - ${STRIP_CMD} ${PREFIX}/bin/samechown - ${STRIP_CMD} ${PREFIX}/bin/sameln - ${STRIP_CMD} ${PREFIX}/bin/samemv - ${STRIP_CMD} ${PREFIX}/bin/samerm -.if ${PORT_OPTIONS:MEXPERIMENTAL} - ${STRIP_CMD} ${PREFIX}/bin/fsort -.endif -.endif .if ${PORT_OPTIONS:MDISK_STORAGE} - ${INSTALL_SCRIPT} ${FILESDIR}/samesame.sh ${PREFIX}/etc/rc.d/ + ${INSTALL_SCRIPT} ${FILESDIR}/samesame.sh \ + ${STAGEDIR}${PREFIX}/etc/rc.d/ .endif - @${ECHO} - @${CAT} pkg-message - @${ECHO} .include