From owner-ports-jp@jp.freebsd.org  Fri Jan 31 15:01:38 1997
Received: by jaz.jp.freebsd.org (8.8.5+2.7Wbeta4/8.7.3) id PAA06593
	Fri, 31 Jan 1997 15:01:38 +0900 (JST)
Received: by jaz.jp.freebsd.org (8.8.5+2.7Wbeta4/8.7.3) with ESMTP id PAA06588
	for <ports-jp@jp.freebsd.org>; Fri, 31 Jan 1997 15:01:37 +0900 (JST)
Received: by uno.sat.t.u-tokyo.ac.jp (8.8.4/8.7.3) with SMTP
	id PAA24388; Fri, 31 Jan 1997 15:01:28 +0900 (JST)
Received: from silvia.HIP.Berkeley.EDU (wck-ca9-11.ix.netcom.com [204.31.231.107]) by dfw-ix4.ix.netcom.com (8.6.13/8.6.12) with ESMTP id VAA12806 for <ports-jp@jp.freebsd.org>; Thu, 30 Jan 1997 21:56:46 -0800
Received: (from asami@localhost) by silvia.HIP.Berkeley.EDU (8.8.5/8.6.9) id VAA03163; Thu, 30 Jan 1997 21:22:23 -0800 (PST)
Date: Thu, 30 Jan 1997 21:22:23 -0800 (PST)
Message-Id: <199701310522.VAA03163@silvia.HIP.Berkeley.EDU>
To: ports-jp@jp.freebsd.org
In-reply-to: <199701301247.VAA08172@edison.ee.t.u-tokyo.ac.jp> (message from MITA Yoshio on Thu, 30 Jan 1997 21:47:29 +0900)
From: asami@vader.cs.berkeley.edu (Satoshi Asami)
Reply-To: ports-jp@jp.freebsd.org
Precedence: bulk
X-Distribute: distribute [version 2.1 (Alpha) patchlevel=19]
X-Sequence: ports-jp 578
Subject: [ports-jp 578] Re: jp-fvwm-2.0.45, putting on jaz
Errors-To: owner-ports-jp@jp.freebsd.org
Sender: owner-ports-jp@jp.freebsd.org

 * From: MITA Yoshio <mita@ee.t.u-tokyo.ac.jp>

$B@u8+$G$9!#(B

 * $B@53N$J$H$3$m$O$b$C$HJL$N?M$,Ez$($F2<$5$k$H$7$F!$(B
 * 
 * $B0MB8$7$F$$$k(Bports$B$N(BMakefile$B$,B8:_$7$J$$>l9g(B
 * *** Error Code 2 Stop.$B$H$$$&JQ$J(Bports$B$X0MB8$7$F$$$k$H5-O?$5$l$k$N$O(B
 * $B8=>u$N%7%9%F%`$G$O@5$7$$5sF0$G$9$M!%(B

$B$H$$$&$+!"8=>u$N%7%9%F%`$N%P%0E*5sF0$@$H$$$C$?J}$,(B...$B!#(B(^_^;)

 * $B$d$O$j0MB84X78$r@5$7$/5-O?$9$k$?$a$K!$3:Ev$9$k(Bports$B$r<h$C$F$-$F(B
 * make$B$7$J$*$9$N$,6Z$G$O$J$$$+$H!%(B

$B$=$N$H$*$j$G$"$j$^$9!#$7$+$7!"L[$C$FJQ$J$b$N$r(B @pkgdep$B$KF~$l$F$7$^$&$H(B
$B$$$&$N$bLdBj$J$N$G!"%a%C%;!<%8$r=P$9$h$&$KD>$7$F$_$^$7$?!#;n$7$F$_$F$/(B
$B$@$5$$!#(B

$B$"$5$_(B

$B#P(B.$B#S(B. $B8+$F$$$?$@$1$l$P$o$+$kDL$j!"B>$N%Q%C%A$b:.$8$C$F$$$^$9!#(B
-------
Index: bsd.port.mk
===================================================================
RCS file: /usr/cvs/src/share/mk/bsd.port.mk,v
retrieving revision 1.249
diff -u -r1.249 bsd.port.mk
--- bsd.port.mk	1997/01/25 02:45:09	1.249
+++ bsd.port.mk	1997/01/31 05:18:02
@@ -1025,6 +1025,17 @@
 	@cd ${.CURDIR} && ${MAKE} ${.MAKEFLAGS} build-depends lib-depends misc-depends
 .endif
 .if make(real-install)
+.if !defined(NO_PKG_REGISTER) && !defined(FORCE_PKG_REGISTER)
+	@if [ -d ${PKG_DBDIR}/${PKGNAME} ]; then \
+		${ECHO_MSG} "===>  ${PKGNAME} is already installed - perhaps an older version?"; \
+		${ECHO_MSG} "      If so, you may wish to \`\`pkg_delete ${PKGNAME}'' and install"; \
+		${ECHO_MSG} "      this port again by \`\`make reinstall'' to upgrade it properly."; \
+		${ECHO_MSG} "      If you really wish to overwrite the old port of ${PKGNAME}"; \
+		${ECHO_MSG} "      without deleting it first, set the variable \"FORCE_PKG_REGISTER\""; \
+		${ECHO_MSG} "      in your environment or the \"make install\" command line."; \
+		exit 1; \
+	fi
+.endif
 	@cd ${.CURDIR} && ${MAKE} ${.MAKEFLAGS} run-depends lib-depends
 .endif
 .if make(real-install)
@@ -1212,8 +1223,10 @@
 .if !target(distclean)
 distclean: pre-distclean clean
 	@${ECHO_MSG} "===>  Dist cleaning for ${PKGNAME}"
-	@(cd ${_DISTDIR}; \
-	${RM} -f ${DISTFILES} ${PATCHFILES})
+	@(if [ -d ${_DISTDIR} ]; then \
+		cd ${_DISTDIR}; \
+		${RM} -f ${DISTFILES} ${PATCHFILES}; \
+	fi)
 .if defined(DIST_SUBDIR)
 	@${RMDIR} ${_DISTDIR}  
 .endif
@@ -1324,7 +1337,11 @@
 package-depends:
 	@for i in ${RUN_DEPENDS} ${LIB_DEPENDS} ${DEPENDS}; do \
 		dir=`${ECHO} $$i | ${SED} -e 's/.*://'`; \
-		(cd $$dir ; ${MAKE} package-name package-depends); \
+		if [ -d $$dir ]; then \
+			(cd $$dir ; ${MAKE} package-name package-depends); \
+		else \
+			${ECHO_MSG} "Warning: \"$$dir\" non-existent -- @pkgdep registration incomplete" >&2; \
+		fi; \
 	done
 .endif
 
@@ -1599,7 +1616,7 @@
 		if [ -f ${PKGDIR}/REQ ]; then \
 			${CP} ${PKGDIR}/REQ ${PKG_DBDIR}/${PKGNAME}/+REQ; \
 		fi; \
-		for dep in `make package-depends | sort -u`; do \
+		for dep in `make package-depends ECHO_MSG=/usr/bin/true | sort -u`; do \
 			if [ -d ${PKG_DBDIR}/$$dep ]; then \
 				if ! ${GREP} ^${PKGNAME}$$ ${PKG_DBDIR}/$$dep/+REQUIRED_BY \
 					>/dev/null 2>&1; then \
@@ -1607,10 +1624,6 @@
 				fi; \
 			fi; \
 		done; \
-	else \
-		${ECHO_MSG} "===>  ${PKGNAME} is already installed - perhaps an older version?"; \
-		${ECHO_MSG} "      If so, you may wish to \`\`pkg_delete ${PKGNAME}'' and install"; \
-		${ECHO_MSG} "      this port again by \`\`make reinstall'' to upgrade it properly."; \
 	fi
 .endif
 
