svn commit: r333979 - in head/sysutils: rdate rdiff-backup rdiff-backup-devel recoverdm recoverdm/files relaxconf reoback rfstool rtty rtty/files

Vanilla I. Shu vanilla at FreeBSD.org
Sat Nov 16 04:15:32 UTC 2013 

Author: vanilla
Date: Sat Nov 16 04:15:28 2013
New Revision: 333979
URL: http://svnweb.freebsd.org/changeset/ports/333979

Log:
  1: Support STAGEDIR.
  2: switch to new LIB_DEPENDS syntax.

Modified:
  head/sysutils/rdate/Makefile
  head/sysutils/rdiff-backup-devel/Makefile
  head/sysutils/rdiff-backup-devel/pkg-plist
  head/sysutils/rdiff-backup/Makefile
  head/sysutils/rdiff-backup/pkg-plist
  head/sysutils/recoverdm/Makefile
  head/sysutils/recoverdm/files/patch-Makefile
  head/sysutils/relaxconf/Makefile
  head/sysutils/reoback/Makefile
  head/sysutils/reoback/pkg-plist
  head/sysutils/rfstool/Makefile
  head/sysutils/rtty/Makefile
  head/sysutils/rtty/files/patch-aa
  head/sysutils/rtty/pkg-plist

Modified: head/sysutils/rdate/Makefile
==============================================================================
--- head/sysutils/rdate/Makefile	Sat Nov 16 03:39:40 2013	(r333978)
+++ head/sysutils/rdate/Makefile	Sat Nov 16 04:15:28 2013	(r333979)
@@ -9,12 +9,13 @@ MASTER_SITES=	http://www.cons.org/freebs
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Sets the clock of the local host to the time of another host
 
-MAN8=		rdate.8
-PLIST_FILES=	sbin/rdate
+PLIST_FILES=	man/man8/${PORTNAME}.8.gz sbin/rdate
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|gcc|${CC}|g' ${WRKSRC}/Makefile
 
-NO_STAGE=	yes
 post-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/rdate ${PREFIX}/sbin/.
-	${INSTALL_MAN} ${WRKSRC}/rdate.8 ${PREFIX}/man/man8/.
+	${INSTALL_PROGRAM} ${WRKSRC}/rdate ${STAGEDIR}${PREFIX}/sbin/
+	${INSTALL_MAN} ${WRKSRC}/rdate.8 ${STAGEDIR}${PREFIX}/man/man8/
 
 .include <bsd.port.mk>

Modified: head/sysutils/rdiff-backup-devel/Makefile
==============================================================================
--- head/sysutils/rdiff-backup-devel/Makefile	Sat Nov 16 03:39:40 2013	(r333978)
+++ head/sysutils/rdiff-backup-devel/Makefile	Sat Nov 16 04:15:28 2013	(r333979)
@@ -17,27 +17,23 @@ COMMENT=	Local/remote mirroring+incremen
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	rsync:${PORTSDIR}/net/librsync
+LIB_DEPENDS=	librsync.so:${PORTSDIR}/net/librsync
 
 CONFLICTS=	rdiff-backup-[0-9]*
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 
-MAN1=		rdiff-backup.1 rdiff-backup-statistics.1
-
-PORTDOCS=	CHANGELOG README COPYING FAQ.html
+MAN1S=		rdiff-backup.1 rdiff-backup-statistics.1
+DOCS=		CHANGELOG README COPYING FAQ.html
 
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-install:
-	${INSTALL_MAN} ${MAN1:S,^,${WRKSRC}/,} ${PREFIX}/man/man1
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
-.endif
+	${INSTALL_MAN} ${MAN1S:S,^,${WRKSRC}/,} ${STAGEDIR}${PREFIX}/man/man1
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/sysutils/rdiff-backup-devel/pkg-plist
==============================================================================
--- head/sysutils/rdiff-backup-devel/pkg-plist	Sat Nov 16 03:39:40 2013	(r333978)
+++ head/sysutils/rdiff-backup-devel/pkg-plist	Sat Nov 16 04:15:28 2013	(r333979)
@@ -104,4 +104,12 @@ bin/rdiff-backup-statistics
 %%PYTHON_SITELIBDIR%%/rdiff_backup/win_acls.py
 %%PYTHON_SITELIBDIR%%/rdiff_backup/win_acls.pyc
 %%PYTHON_SITELIBDIR%%/rdiff_backup/win_acls.pyo
- at dirrm %%PYTHON_SITELIBDIR%%/rdiff_backup
+man/man1/rdiff-backup-statistics.1.gz
+man/man1/rdiff-backup.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/FAQ.html
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+ at dirrmtry %%PYTHON_SITELIBDIR%%/rdiff_backup
+ at dirrmtry %%PYTHON_SITELIBDIR%%

Modified: head/sysutils/rdiff-backup/Makefile
==============================================================================
--- head/sysutils/rdiff-backup/Makefile	Sat Nov 16 03:39:40 2013	(r333978)
+++ head/sysutils/rdiff-backup/Makefile	Sat Nov 16 04:15:28 2013	(r333979)
@@ -17,27 +17,21 @@ COMMENT=	Local/remote mirroring+incremen
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	rsync:${PORTSDIR}/net/librsync
+LIB_DEPENDS=	librsync.so:${PORTSDIR}/net/librsync
 
 CONFLICTS=	rdiff-backup-devel-[0-9]* rdiff-backup-1.0*
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 
-MAN1=		rdiff-backup.1 rdiff-backup-statistics.1
-
-PORTDOCS=	CHANGELOG README COPYING FAQ.html
+MAN1S=		rdiff-backup.1 rdiff-backup-statistics.1
+DOCS=		CHANGELOG README COPYING FAQ.html
 
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
 post-install:
-	${INSTALL_MAN} ${MAN1:S,^,${WRKSRC}/,} ${PREFIX}/man/man1
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
-.endif
+	${INSTALL_MAN} ${MAN1S:S,^,${WRKSRC}/,} ${STAGEDIR}${PREFIX}/man/man1
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/sysutils/rdiff-backup/pkg-plist
==============================================================================
--- head/sysutils/rdiff-backup/pkg-plist	Sat Nov 16 03:39:40 2013	(r333978)
+++ head/sysutils/rdiff-backup/pkg-plist	Sat Nov 16 04:15:28 2013	(r333979)
@@ -104,4 +104,12 @@ bin/rdiff-backup-statistics
 %%PYTHON_SITELIBDIR%%/rdiff_backup/win_acls.py
 %%PYTHON_SITELIBDIR%%/rdiff_backup/win_acls.pyc
 %%PYTHON_SITELIBDIR%%/rdiff_backup/win_acls.pyo
+man/man1/rdiff-backup-statistics.1.gz
+man/man1/rdiff-backup.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/FAQ.html
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/rdiff_backup
+ at dirrm %%PYTHON_SITELIBDIR%%

Modified: head/sysutils/recoverdm/Makefile
==============================================================================
--- head/sysutils/recoverdm/Makefile	Sat Nov 16 03:39:40 2013	(r333978)
+++ head/sysutils/recoverdm/Makefile	Sat Nov 16 04:15:28 2013	(r333979)
@@ -10,9 +10,6 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Recover files and discs with damaged sectors
 
-MAN1=		recoverdm.1
+PLIST_FILES=	bin/mergebad bin/recoverdm man/man1/${PORTNAME}.1.gz
 
-PLIST_FILES=	bin/mergebad bin/recoverdm
-
-NO_STAGE=	yes
 .include <bsd.port.mk>

Modified: head/sysutils/recoverdm/files/patch-Makefile
==============================================================================
--- head/sysutils/recoverdm/files/patch-Makefile	Sat Nov 16 03:39:40 2013	(r333978)
+++ head/sysutils/recoverdm/files/patch-Makefile	Sat Nov 16 04:15:28 2013	(r333979)
@@ -1,38 +1,33 @@
-*** Makefile.orig	Sun Jan 22 05:15:13 2006
---- Makefile	Sun Jan 22 05:22:31 2006
-***************
-*** 1,14 ****
-  VERSION=0.19
-  
-! CFLAGS=-Wall -Wshadow -Wconversion -Wwrite-strings -Winline -O2 -DVERSION=\"$(VERSION)\"
-  LDFLAGS=
-  
-  OBJSr=recoverdm.o dev.o io.o utils.o error.o
-  OBJSm=mergebad.o io.o utils.o error.o
-  
-  all: recoverdm mergebad
-  
-  recoverdm: $(OBJSr)
-  	$(CC) -Wall -W $(OBJSr) $(LDFLAGS) -o recoverdm
-  	strip recoverdm
-  	echo
---- 1,19 ----
-  VERSION=0.19
-  
-! CFLAGS+=-Wall -DVERSION=\"$(VERSION)\"
-  LDFLAGS=
-  
-  OBJSr=recoverdm.o dev.o io.o utils.o error.o
-  OBJSm=mergebad.o io.o utils.o error.o
-  
-  all: recoverdm mergebad
-+ 
-+ install:
-+ 	${INSTALL} -m 755 recoverdm ${PREFIX}/bin
-+ 	${INSTALL} -m 755 mergebad ${PREFIX}/bin
-+ 	${INSTALL} -m 644 recoverdm.1 ${PREFIX}/man/man1
-  
-  recoverdm: $(OBJSr)
-  	$(CC) -Wall -W $(OBJSr) $(LDFLAGS) -o recoverdm
-  	strip recoverdm
-  	echo
+--- Makefile.orig	2009-01-06 23:22:12.000000000 +0800
++++ Makefile	2013-11-16 11:41:56.000000000 +0800
+@@ -1,6 +1,6 @@
+ VERSION=0.20
+ 
+-CFLAGS=-Wall -Wshadow -Wconversion -Wwrite-strings -Winline -O2 -DVERSION=\"$(VERSION)\"
++CFLAGS+=-Wall -DVERSION=\"$(VERSION)\"
+ LDFLAGS=
+ 
+ OBJSr=recoverdm.o dev.o io.o utils.o error.o
+@@ -8,17 +8,17 @@ OBJSm=mergebad.o io.o utils.o error.o
+ 
+ all: recoverdm mergebad
+ 
++install:
++	${INSTALL} -m 755 recoverdm $(DESTDIR)$(PREFIX)/bin
++	${INSTALL} -m 755 mergebad $(DESTDIR)$(PREFIX)/bin
++	${INSTALL} -m 644 recoverdm.1 $(DESTDIR)$(PREFIX)/man/man1
++
+ recoverdm: $(OBJSr)
+ 	$(CC) -Wall -W $(OBJSr) $(LDFLAGS) -o recoverdm
+ 
+ mergebad: $(OBJSm)
+ 	$(CC) -Wall -W $(OBJSm) $(LDFLAGS) -o mergebad
+ 
+-install:
+-	cp recoverdm mergebad /usr/local/bin
+-	echo
+-	echo Oh, blatant plug: http://keetweej.vanheusden.com/wishlist.html
+-
+ clean:
+ 	rm -f $(OBJSr) $(OBJSm) recoverdm mergebad core
+ 

Modified: head/sysutils/relaxconf/Makefile
==============================================================================
--- head/sysutils/relaxconf/Makefile	Sat Nov 16 03:39:40 2013	(r333978)
+++ head/sysutils/relaxconf/Makefile	Sat Nov 16 04:15:28 2013	(r333979)
@@ -16,7 +16,6 @@ RUN_DEPENDS=	cdialog:${PORTSDIR}/devel/c
 
 GNU_CONFIGURE=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}

Modified: head/sysutils/reoback/Makefile
==============================================================================
--- head/sysutils/reoback/Makefile	Sat Nov 16 03:39:40 2013	(r333978)
+++ head/sysutils/reoback/Makefile	Sat Nov 16 04:15:28 2013	(r333979)
@@ -15,22 +15,18 @@ RUN_DEPENDS=	p5-Net>=0:${PORTSDIR}/net/p
 NO_BUILD=	yes
 USES=		perl5
 
-MAN1=		reoback.1 reoback.pl.1
-MANCOMPRESSED=	yes
-
-NO_STAGE=	yes
 pre-install:
 		cd ${WRKSRC} && ${REINPLACE_CMD} -e 's,/home/sforge/reoback/settings.conf,${PREFIX}/etc/reoback/settings.conf,g' ${WRKSRC}/run_reoback.sh
 		cd ${WRKSRC} && ${REINPLACE_CMD} -e 's,/home/sforge/reoback/reoback.pl,${PREFIX}/bin/reoback.pl,g' ${WRKSRC}/run_reoback.sh
 		cd ${WRKSRC} && ${REINPLACE_CMD} -e 's,^#!/usr/bin/perl -W,#!/usr/bin/perl -w,g' reoback.pl
 
 do-install:
-		${INSTALL_SCRIPT}	${WRKSRC}/reoback.pl ${PREFIX}/bin/
-		${INSTALL_SCRIPT}	${WRKSRC}/run_reoback.sh ${PREFIX}/bin/
-		${MKDIR}		${PREFIX}/etc/reoback
-		${INSTALL_DATA}		${WRKSRC}/conf/settings.conf ${PREFIX}/etc/reoback/settings.conf.dist
-		${INSTALL_DATA}		${WRKSRC}/conf/files.conf ${PREFIX}/etc/reoback/files.conf.dist
-		${INSTALL_MAN}		${WRKSRC}/docs/man/reoback.1.gz ${PREFIX}/man/man1/
-		${INSTALL_MAN}		${WRKSRC}/docs/man/reoback.pl.1.gz ${PREFIX}/man/man1/
+		${INSTALL_SCRIPT}	${WRKSRC}/reoback.pl ${STAGEDIR}${PREFIX}/bin/
+		${INSTALL_SCRIPT}	${WRKSRC}/run_reoback.sh ${STAGEDIR}${PREFIX}/bin/
+		${MKDIR}		${STAGEDIR}${PREFIX}/etc/reoback
+		${INSTALL_DATA}		${WRKSRC}/conf/settings.conf ${STAGEDIR}${PREFIX}/etc/reoback/settings.conf.dist
+		${INSTALL_DATA}		${WRKSRC}/conf/files.conf ${STAGEDIR}${PREFIX}/etc/reoback/files.conf.dist
+		${INSTALL_MAN}		${WRKSRC}/docs/man/reoback.1.gz ${STAGEDIR}${PREFIX}/man/man1/
+		${INSTALL_MAN}		${WRKSRC}/docs/man/reoback.pl.1.gz ${STAGEDIR}${PREFIX}/man/man1/
 
 .include <bsd.port.mk>

Modified: head/sysutils/reoback/pkg-plist
==============================================================================
--- head/sysutils/reoback/pkg-plist	Sat Nov 16 03:39:40 2013	(r333978)
+++ head/sysutils/reoback/pkg-plist	Sat Nov 16 04:15:28 2013	(r333979)
@@ -1,5 +1,7 @@
 bin/reoback.pl
 bin/run_reoback.sh
-etc/reoback/settings.conf.dist
 etc/reoback/files.conf.dist
+etc/reoback/settings.conf.dist
+man/man1/reoback.1.gz
+man/man1/reoback.pl.1.gz
 @dirrm etc/reoback

Modified: head/sysutils/rfstool/Makefile
==============================================================================
--- head/sysutils/rfstool/Makefile	Sat Nov 16 03:39:40 2013	(r333978)
+++ head/sysutils/rfstool/Makefile	Sat Nov 16 04:15:28 2013	(r333979)
@@ -15,11 +15,10 @@ USE_ZIP=	yes
 WRKSRC=		${WRKDIR}/rfstool-0.14/RFSTOOL
 MAKEFILE=	makefile.gcc3x
 
-NO_STAGE=	yes
 post-extract:
 	@${REINPLACE_CMD} -e "s,g++,\$${CXX},g" ${WRKSRC}/${MAKEFILE}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/rfstool ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/rfstool ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>

Modified: head/sysutils/rtty/Makefile
==============================================================================
--- head/sysutils/rtty/Makefile	Sat Nov 16 03:39:40 2013	(r333978)
+++ head/sysutils/rtty/Makefile	Sat Nov 16 04:15:28 2013	(r333979)
@@ -16,5 +16,4 @@ EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS=	|sh
 NO_WRKSUBDIR=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.mk>

Modified: head/sysutils/rtty/files/patch-aa
==============================================================================
--- head/sysutils/rtty/files/patch-aa	Sat Nov 16 03:39:40 2013	(r333978)
+++ head/sysutils/rtty/files/patch-aa	Sat Nov 16 04:15:28 2013	(r333979)
@@ -1,6 +1,6 @@
---- Makefile.orig	Fri Nov  9 15:30:45 2001
-+++ Makefile	Fri Nov  9 15:32:24 2001
-@@ -19,12 +19,12 @@
+--- Makefile.orig	2013-11-16 11:45:54.000000000 +0800
++++ Makefile	2013-11-16 11:46:33.000000000 +0800
+@@ -19,12 +19,12 @@ VERSION = 4.0
  
  VPATH = ../src
  
@@ -16,7 +16,7 @@
  #
  # use -U to undefine, -D to define
  #	DEBUG		include code to help debug this software
-@@ -37,7 +37,7 @@
+@@ -37,7 +37,7 @@ CDEBUG = -O
  CDEFS = -DDEBUG -UWANT_TCPIP -UNEED_BITYPES_H -UNEED_INET_ATON \
  	-UNO_SOCKADDR_LEN -UNO_HSTRERROR
  #
@@ -25,12 +25,23 @@
  LIBS = -lcrypt
  #(if WANT_TCPIP defined and this isn't in your libc)
  # -lresolv
-@@ -64,7 +64,7 @@
- 		test -d $(DESTPATH)/$$x || mkdir $(DESTPATH)/$$x; \
+@@ -59,15 +59,15 @@ kit:; shar README Makefile *.c *.h *.sh 
+ bin.tar:; tar cf bin.tar $(ALL)
+ 
+ install: $(ALL) Makefile
+-	-set -x; test -d $(DESTPATH) || mkdir $(DESTPATH)
++	-set -x; test -d $(DESTDIR)$(DESTPATH) || mkdir $(DESTDIR)$(DESTPATH)
+ 	-set +e -x; for x in bin dev sock log pid opt out; do \
+-		test -d $(DESTPATH)/$$x || mkdir $(DESTPATH)/$$x; \
++		test -d $(DESTDIR)$(DESTPATH)/$$x || mkdir $(DESTDIR)$(DESTPATH)/$$x; \
  	done
  	set -x; for x in $(BINARY); do \
 -		install -c -m 111 $$x $(DESTBIN)/$$x; \
-+		install -c -s -m 111 $$x $(DESTBIN)/$$x; \
++		install -c -s -m 111 $$x $(DESTDIR)$(DESTBIN)/$$x; \
  	done
  	set -x; for x in $(SCRIPT); do \
- 		install -c -m 555 $$x $(DESTBIN)/$$x; \
+-		install -c -m 555 $$x $(DESTBIN)/$$x; \
++		install -c -m 555 $$x $(DESTDIR)$(DESTBIN)/$$x; \
+ 	done
+ 
+ ttysrv: ttysrv.o ttyprot.o connutil.o misc.o version.o

Modified: head/sysutils/rtty/pkg-plist
==============================================================================
--- head/sysutils/rtty/pkg-plist	Sat Nov 16 03:39:40 2013	(r333978)
+++ head/sysutils/rtty/pkg-plist	Sat Nov 16 04:15:28 2013	(r333979)
@@ -6,17 +6,11 @@ rtty/bin/locbrok
 rtty/bin/rtty
 rtty/bin/startsrv
 rtty/bin/ttysrv
- at exec mkdir -p %D/rtty/dev
- at exec mkdir -p %D/rtty/log
- at exec mkdir -p %D/rtty/opt
- at exec mkdir -p %D/rtty/out
- at exec mkdir -p %D/rtty/pid
- at exec mkdir -p %D/rtty/sock
 @dirrmtry rtty/sock
 @dirrmtry rtty/pid
 @dirrmtry rtty/out
 @dirrmtry rtty/opt
 @dirrmtry rtty/log
 @dirrmtry rtty/dev
- at dirrm rtty/bin
- at dirrm rtty
+ at dirrmtry rtty/bin
+ at dirrmtry rtty

More information about the svn-ports-head mailing list