svn commit: r330569 - in head/sysutils/gpart: . files

[Dmitry Marakasov]

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