From owner-svn-ports-all@FreeBSD.ORG  Wed Oct 16 23:50:40 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
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 ESMTP id 6DB591E2;
 Wed, 16 Oct 2013 23:50:40 +0000 (UTC)
 (envelope-from amdmi3@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 417F5235B;
 Wed, 16 Oct 2013 23:50:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9GNoenJ063271;
 Wed, 16 Oct 2013 23:50:40 GMT (envelope-from amdmi3@svn.freebsd.org)
Received: (from amdmi3@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9GNod5b063251;
 Wed, 16 Oct 2013 23:50:39 GMT (envelope-from amdmi3@svn.freebsd.org)
Message-Id: <201310162350.r9GNod5b063251@svn.freebsd.org>
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Wed, 16 Oct 2013 23:50:39 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r330569 - in head/sysutils/gpart: . 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.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Oct 2013 23:50:40 -0000

Author: amdmi3
Date: Wed Oct 16 23:50:39 2013
New Revision: 330569
URL: http://svnweb.freebsd.org/changeset/ports/330569

Log:
  - Support staging

Modified:
  head/sysutils/gpart/Makefile
  head/sysutils/gpart/files/patch-inst.defs   (contents, props changed)
  head/sysutils/gpart/files/patch-make.defs   (contents, props changed)

Modified: head/sysutils/gpart/Makefile
==============================================================================
--- head/sysutils/gpart/Makefile	Wed Oct 16 23:49:45 2013	(r330568)
+++ head/sysutils/gpart/Makefile	Wed Oct 16 23:50:39 2013	(r330569)
@@ -14,19 +14,19 @@ COMMENT=	Tries to recover lost partition
 LICENSE=	GPLv2
 
 USES=		gmake
-MAN8=		gpart.8
-PLIST_FILES=	sbin/gpart
+PLIST_FILES=	sbin/gpart man/man8/gpart.8.gz
 CFLAGS+=	-std=c99
 
-.if defined(WANT_STATIC)
-MAKE_ARGS+=	LDFLAGS=-static
-.endif
+OPTIONS_DEFINE=	STATIC
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${ARCH} != "i386" && ${ARCH} != "alpha" && ${ARCH} != "amd64"
 BROKEN=		Only compiles on i386, amd64 and alpha.
 .endif
 
-.include <bsd.port.post.mk>
+.if ${PORT_OPTIONS:MSTATIC}
+LDFLAGS+=	-static
+.endif
+
+.include <bsd.port.mk>

Modified: head/sysutils/gpart/files/patch-inst.defs
==============================================================================
--- head/sysutils/gpart/files/patch-inst.defs	Wed Oct 16 23:49:45 2013	(r330568)
+++ head/sysutils/gpart/files/patch-inst.defs	Wed Oct 16 23:50:39 2013	(r330569)
@@ -1,12 +1,12 @@
---- ./inst.defs.orig	2000-12-13 23:45:49.000000000 +0100
-+++ ./inst.defs	2011-03-17 01:15:54.000000000 +0100
+--- inst.defs.orig	2000-12-14 01:45:49.000000000 +0300
++++ inst.defs	2013-10-17 00:03:33.617772686 +0400
 @@ -1,8 +1,8 @@
  #
  # installation directories for gpart
  #
 -prefix=/usr/local
 -bindir=$(prefix)/bin
-+prefix=$(PREFIX)
++prefix=$(DESTDIR)$(PREFIX)
 +bindir=$(prefix)/sbin
  libdir=$(prefix)/lib
  mandir=$(prefix)/man

Modified: head/sysutils/gpart/files/patch-make.defs
==============================================================================
--- head/sysutils/gpart/files/patch-make.defs	Wed Oct 16 23:49:45 2013	(r330568)
+++ head/sysutils/gpart/files/patch-make.defs	Wed Oct 16 23:50:39 2013	(r330569)
@@ -1,15 +1,15 @@
---- ./make.defs.orig	2001-01-29 20:17:12.000000000 +0100
-+++ ./make.defs	2011-03-17 01:15:54.000000000 +0100
-@@ -1,10 +1,10 @@
+--- make.defs.orig	2001-01-29 22:17:12.000000000 +0300
++++ make.defs	2013-10-16 21:42:40.373773165 +0400
+@@ -1,10 +1,9 @@
  #
  #
  #
 -CC      = gcc
 -CFLAGS  = -Wall -O2 -pedantic
+-LDFLAGS =
+-MAKEDEP = gcc -M
 +CC      ?= gcc
 +CFLAGS  += -Wall -pedantic
- LDFLAGS =
--MAKEDEP = gcc -M
 +MAKEDEP = $(CC) -M
  INSTALL = install
  RM      = rm -f