Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 16 Oct 2013 05:05:53 +0000 (UTC)
From:      Hiroki Sato <hrs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r330479 - in head/net/cvsync: . files
Message-ID:  <201310160505.r9G55r3Y067991@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: hrs
Date: Wed Oct 16 05:05:52 2013
New Revision: 330479
URL: http://svnweb.freebsd.org/changeset/ports/330479

Log:
  Add STAGEDIR support.

Added:
  head/net/cvsync/files/patch-mk-base.mk   (contents, props changed)
Modified:
  head/net/cvsync/Makefile
  head/net/cvsync/pkg-plist

Modified: head/net/cvsync/Makefile
==============================================================================
--- head/net/cvsync/Makefile	Wed Oct 16 04:56:32 2013	(r330478)
+++ head/net/cvsync/Makefile	Wed Oct 16 05:05:52 2013	(r330479)
@@ -17,28 +17,30 @@ USE_GMAKE=	yes
 USE_RC_SUBR=	cvsyncd
 USE_OPENSSL=	yes
 
-MAN1=		cvscan.1 cvsup2cvsync.1 cvsync.1 cvsync2cvsup.1 cvsyncd.1 \
-		rcscan.1 rcscmp.1
 PORTDOCS=	ChangeLog FAQ TODO
 PORTEXAMPLES=	cvsync.conf cvsyncd-FreeBSD.conf \
 		cvsyncd-NetBSD.conf cvsyncd-OpenBSD.conf
 
-MAKE_ENV+=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}"
+MAKE_ENV+=	DESTDIR="${STAGEDIR}" \
+		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+		PTHREAD_LIBS="${PTHREAD_LIBS}" \
+		INSTALL= \
+		INSTALL_BIN_OPTS="${INSTALL_PROGRAM}" \
+		INSTALL_MAN_OPTS="${INSTALL_MAN}"
 MAKE_FLAGS=	OSVER="${OSVERSION}" HASH_TYPE=openssl
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-install:
 .if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${EXAMPLESDIR}
-	cd ${WRKSRC}/samples && ${INSTALL_DATA} ${PORTEXAMPLES} ${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	cd ${WRKSRC}/samples && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
 .endif
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>

Added: head/net/cvsync/files/patch-mk-base.mk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/cvsync/files/patch-mk-base.mk	Wed Oct 16 05:05:52 2013	(r330479)
@@ -0,0 +1,13 @@
+--- mk/base.mk.orig	2005-01-24 16:45:13.000000000 +0900
++++ mk/base.mk	2013-10-07 04:38:38.000000000 +0900
+@@ -91,8 +91,8 @@
+ endif # SunOS
+ 
+ PREFIX ?= /usr/local
+-BINDIR ?= ${PREFIX}/bin
+-MANDIR ?= ${PREFIX}/man
++BINDIR ?= ${DESTDIR}${PREFIX}/bin
++MANDIR ?= ${DESTDIR}${PREFIX}/man
+ 
+ BINOWN ?= root
+ BINGRP ?= wheel

Modified: head/net/cvsync/pkg-plist
==============================================================================
--- head/net/cvsync/pkg-plist	Wed Oct 16 04:56:32 2013	(r330478)
+++ head/net/cvsync/pkg-plist	Wed Oct 16 05:05:52 2013	(r330479)
@@ -6,3 +6,10 @@ bin/cvsync2cvsup
 bin/cvsyncd
 bin/rcscan
 bin/rcscmp
+man/man1/cvscan.1.gz
+man/man1/cvsup2cvsync.1.gz
+man/man1/cvsync.1.gz
+man/man1/cvsync2cvsup.1.gz
+man/man1/cvsyncd.1.gz
+man/man1/rcscan.1.gz
+man/man1/rcscmp.1.gz



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