Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 12 Oct 2013 20:29:59 +0000 (UTC)
From:      Eitan Adler <eadler@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r330186 - in head/devel/cdecl: . files
Message-ID:  <201310122029.r9CKTxsB042933@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: eadler
Date: Sat Oct 12 20:29:58 2013
New Revision: 330186
URL: http://svnweb.freebsd.org/changeset/ports/330186

Log:
  Convert to staging

Modified:
  head/devel/cdecl/Makefile
  head/devel/cdecl/files/patch-Makefile

Modified: head/devel/cdecl/Makefile
==============================================================================
--- head/devel/cdecl/Makefile	Sat Oct 12 20:15:30 2013	(r330185)
+++ head/devel/cdecl/Makefile	Sat Oct 12 20:29:58 2013	(r330186)
@@ -14,21 +14,18 @@ USE_CSTD=	c89
 
 USES=		readline
 ALL_TARGET=	${PORTNAME}
-MAN1=		cdecl.1
-MLINKS=		cdecl.1 c++decl.1
 PORTDOCS=	testset testset++
-PLIST_FILES=	bin/cdecl bin/c++decl
-
+PLIST_FILES=	bin/cdecl bin/c++decl man/man1/cdecl.1.gz man/man1/c++decl.1.gz
+MAKE_ENV+=	STAGEDIR=$(STAGEDIR)
 
 CONFLICTS=	cutils-[0-9]*
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/testset* ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/testset* ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>

Modified: head/devel/cdecl/files/patch-Makefile
==============================================================================
--- head/devel/cdecl/files/patch-Makefile	Sat Oct 12 20:15:30 2013	(r330185)
+++ head/devel/cdecl/files/patch-Makefile	Sat Oct 12 20:29:58 2013	(r330186)
@@ -24,12 +24,13 @@
  
  install: cdecl
 -	$(INSTALL) cdecl $(BINDIR)
-+	${BSD_INSTALL_PROGRAM} cdecl $(BINDIR)
- 	ln $(BINDIR)/cdecl $(BINDIR)/c++decl
++	${BSD_INSTALL_PROGRAM} cdecl $(STAGEDIR)$(BINDIR)
+-	ln $(BINDIR)/cdecl $(BINDIR)/c++decl
++	ln -s $(BINDIR)/cdecl $(STAGEDIR)$(BINDIR)/c++decl
 -	$(INSTALL_DATA) cdecl.1 $(MANDIR)
 -	$(INSTALL_DATA) c++decl.1 $(MANDIR)
-+	${BSD_INSTALL_MAN} cdecl.1 $(MANDIR)
-+	${BSD_INSTALL_MAN} c++decl.1 $(MANDIR)
++	${BSD_INSTALL_MAN} cdecl.1 $(STAGEDIR)$(MANDIR)
++	ln -s $(MANDIR)/cdecl.1 $(STAGEDIR)$(MANDIR)/c++decl.1
  
  clean:
  	rm -f cdgram.c cdlex.c cdecl y.output c++decl



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310122029.r9CKTxsB042933>