From 6d47ab8c2e56290413065d74b82626b31ff1b4fd Mon Sep 17 00:00:00 2001 From: Chris Piazza Date: Mon, 2 Aug 1999 22:45:41 +0000 Subject: [PATCH] Add a workaround to chown the files if the person installing the port is root. It was keeping the uid/gid of 10/143. There might be a better solution than this in the long run but it'll work for now. PR: 12897 Reported by: Jose Marques Also some minor non-functional changes, exit 0 -> ${FALSE}, PKGMESSAGE to use | ${SED} instead of creating a new file. --- java/jdk-doc/Makefile | 13 ++++++++----- java/jdk11-doc/Makefile | 13 ++++++++----- java/jdk12-doc/Makefile | 13 ++++++++----- java/jdk13-doc/Makefile | 13 ++++++++----- java/jdk14-doc/Makefile | 13 ++++++++----- 5 files changed, 40 insertions(+), 25 deletions(-) diff --git a/java/jdk-doc/Makefile b/java/jdk-doc/Makefile index c755f6222909..158930620e62 100644 --- a/java/jdk-doc/Makefile +++ b/java/jdk-doc/Makefile @@ -3,7 +3,7 @@ # Date created: Mon Mar 8 10:10:42 EET 1999 # Whom: Martti Kuparinen # -# $Id: Makefile,v 1.5 1999/06/21 02:56:36 cpiazza Exp $ +# $Id: Makefile,v 1.6 1999/06/28 02:22:02 billf Exp $ # DISTNAME= jdk118-doc @@ -17,7 +17,6 @@ IS_INTERACTIVE= "Requires manual fetch" VERSION= 1.1.8 WRKSRC= ${WRKDIR}/jdk${VERSION} NO_BUILD= yes -PKGMESSAGE= ${WRKDIR}/MESSAGE PLIST_SUB+= VERSION=${VERSION} .include @@ -34,14 +33,18 @@ do-fetch: @echo 'as described in' @echo ' http://java.sun.com/feedback/faq/downloading.html' @echo '' - @exit 1 + @${FALSE} .endif +pre-install: + @if [ !`id -u` ]; then \ + /usr/sbin/chown -R root:wheel ${WRKDIR}/*; \ + fi + do-install: ${MKDIR} ${PREFIX}/jdk${VERSION} (cd ${WRKSRC} && ${TAR} -cf - docs) \ | (cd ${PREFIX}/jdk${VERSION} && ${TAR} -xf -) - @${SED} s+!!PREFIX!!+${PREFIX}+g < ${PKGDIR}/MESSAGE > ${PKGMESSAGE} - @${CAT} ${PKGMESSAGE} + @${CAT} ${PKGMESSAGE} | ${SED} s+!!PREFIX!!+${PREFIX}+g .include diff --git a/java/jdk11-doc/Makefile b/java/jdk11-doc/Makefile index c755f6222909..158930620e62 100644 --- a/java/jdk11-doc/Makefile +++ b/java/jdk11-doc/Makefile @@ -3,7 +3,7 @@ # Date created: Mon Mar 8 10:10:42 EET 1999 # Whom: Martti Kuparinen # -# $Id: Makefile,v 1.5 1999/06/21 02:56:36 cpiazza Exp $ +# $Id: Makefile,v 1.6 1999/06/28 02:22:02 billf Exp $ # DISTNAME= jdk118-doc @@ -17,7 +17,6 @@ IS_INTERACTIVE= "Requires manual fetch" VERSION= 1.1.8 WRKSRC= ${WRKDIR}/jdk${VERSION} NO_BUILD= yes -PKGMESSAGE= ${WRKDIR}/MESSAGE PLIST_SUB+= VERSION=${VERSION} .include @@ -34,14 +33,18 @@ do-fetch: @echo 'as described in' @echo ' http://java.sun.com/feedback/faq/downloading.html' @echo '' - @exit 1 + @${FALSE} .endif +pre-install: + @if [ !`id -u` ]; then \ + /usr/sbin/chown -R root:wheel ${WRKDIR}/*; \ + fi + do-install: ${MKDIR} ${PREFIX}/jdk${VERSION} (cd ${WRKSRC} && ${TAR} -cf - docs) \ | (cd ${PREFIX}/jdk${VERSION} && ${TAR} -xf -) - @${SED} s+!!PREFIX!!+${PREFIX}+g < ${PKGDIR}/MESSAGE > ${PKGMESSAGE} - @${CAT} ${PKGMESSAGE} + @${CAT} ${PKGMESSAGE} | ${SED} s+!!PREFIX!!+${PREFIX}+g .include diff --git a/java/jdk12-doc/Makefile b/java/jdk12-doc/Makefile index c755f6222909..158930620e62 100644 --- a/java/jdk12-doc/Makefile +++ b/java/jdk12-doc/Makefile @@ -3,7 +3,7 @@ # Date created: Mon Mar 8 10:10:42 EET 1999 # Whom: Martti Kuparinen # -# $Id: Makefile,v 1.5 1999/06/21 02:56:36 cpiazza Exp $ +# $Id: Makefile,v 1.6 1999/06/28 02:22:02 billf Exp $ # DISTNAME= jdk118-doc @@ -17,7 +17,6 @@ IS_INTERACTIVE= "Requires manual fetch" VERSION= 1.1.8 WRKSRC= ${WRKDIR}/jdk${VERSION} NO_BUILD= yes -PKGMESSAGE= ${WRKDIR}/MESSAGE PLIST_SUB+= VERSION=${VERSION} .include @@ -34,14 +33,18 @@ do-fetch: @echo 'as described in' @echo ' http://java.sun.com/feedback/faq/downloading.html' @echo '' - @exit 1 + @${FALSE} .endif +pre-install: + @if [ !`id -u` ]; then \ + /usr/sbin/chown -R root:wheel ${WRKDIR}/*; \ + fi + do-install: ${MKDIR} ${PREFIX}/jdk${VERSION} (cd ${WRKSRC} && ${TAR} -cf - docs) \ | (cd ${PREFIX}/jdk${VERSION} && ${TAR} -xf -) - @${SED} s+!!PREFIX!!+${PREFIX}+g < ${PKGDIR}/MESSAGE > ${PKGMESSAGE} - @${CAT} ${PKGMESSAGE} + @${CAT} ${PKGMESSAGE} | ${SED} s+!!PREFIX!!+${PREFIX}+g .include diff --git a/java/jdk13-doc/Makefile b/java/jdk13-doc/Makefile index c755f6222909..158930620e62 100644 --- a/java/jdk13-doc/Makefile +++ b/java/jdk13-doc/Makefile @@ -3,7 +3,7 @@ # Date created: Mon Mar 8 10:10:42 EET 1999 # Whom: Martti Kuparinen # -# $Id: Makefile,v 1.5 1999/06/21 02:56:36 cpiazza Exp $ +# $Id: Makefile,v 1.6 1999/06/28 02:22:02 billf Exp $ # DISTNAME= jdk118-doc @@ -17,7 +17,6 @@ IS_INTERACTIVE= "Requires manual fetch" VERSION= 1.1.8 WRKSRC= ${WRKDIR}/jdk${VERSION} NO_BUILD= yes -PKGMESSAGE= ${WRKDIR}/MESSAGE PLIST_SUB+= VERSION=${VERSION} .include @@ -34,14 +33,18 @@ do-fetch: @echo 'as described in' @echo ' http://java.sun.com/feedback/faq/downloading.html' @echo '' - @exit 1 + @${FALSE} .endif +pre-install: + @if [ !`id -u` ]; then \ + /usr/sbin/chown -R root:wheel ${WRKDIR}/*; \ + fi + do-install: ${MKDIR} ${PREFIX}/jdk${VERSION} (cd ${WRKSRC} && ${TAR} -cf - docs) \ | (cd ${PREFIX}/jdk${VERSION} && ${TAR} -xf -) - @${SED} s+!!PREFIX!!+${PREFIX}+g < ${PKGDIR}/MESSAGE > ${PKGMESSAGE} - @${CAT} ${PKGMESSAGE} + @${CAT} ${PKGMESSAGE} | ${SED} s+!!PREFIX!!+${PREFIX}+g .include diff --git a/java/jdk14-doc/Makefile b/java/jdk14-doc/Makefile index c755f6222909..158930620e62 100644 --- a/java/jdk14-doc/Makefile +++ b/java/jdk14-doc/Makefile @@ -3,7 +3,7 @@ # Date created: Mon Mar 8 10:10:42 EET 1999 # Whom: Martti Kuparinen # -# $Id: Makefile,v 1.5 1999/06/21 02:56:36 cpiazza Exp $ +# $Id: Makefile,v 1.6 1999/06/28 02:22:02 billf Exp $ # DISTNAME= jdk118-doc @@ -17,7 +17,6 @@ IS_INTERACTIVE= "Requires manual fetch" VERSION= 1.1.8 WRKSRC= ${WRKDIR}/jdk${VERSION} NO_BUILD= yes -PKGMESSAGE= ${WRKDIR}/MESSAGE PLIST_SUB+= VERSION=${VERSION} .include @@ -34,14 +33,18 @@ do-fetch: @echo 'as described in' @echo ' http://java.sun.com/feedback/faq/downloading.html' @echo '' - @exit 1 + @${FALSE} .endif +pre-install: + @if [ !`id -u` ]; then \ + /usr/sbin/chown -R root:wheel ${WRKDIR}/*; \ + fi + do-install: ${MKDIR} ${PREFIX}/jdk${VERSION} (cd ${WRKSRC} && ${TAR} -cf - docs) \ | (cd ${PREFIX}/jdk${VERSION} && ${TAR} -xf -) - @${SED} s+!!PREFIX!!+${PREFIX}+g < ${PKGDIR}/MESSAGE > ${PKGMESSAGE} - @${CAT} ${PKGMESSAGE} + @${CAT} ${PKGMESSAGE} | ${SED} s+!!PREFIX!!+${PREFIX}+g .include