From d7dc992dc7fa0f1779cba84f0139c431da590ffd Mon Sep 17 00:00:00 2001 From: Mario Sergio Fujikawa Ferreira Date: Mon, 6 May 2002 16:56:31 +0000 Subject: [PATCH] o Separate donkey script wrapper and donkey-real binary: wrapper stays at bin but binary goes to sbin (this does not break hier(7)) o Bump PORTREVISION since this change is needed by the upcoming edonkey-gui-gtk port update --- net-p2p/linux-edonkey-core/Makefile | 3 ++- net-p2p/linux-edonkey-core/files/wrapper.sh | 2 +- net-p2p/linux-edonkey-core/pkg-plist | 2 +- net/edonkey-core/Makefile | 3 ++- net/edonkey-core/files/wrapper.sh | 2 +- net/edonkey-core/pkg-plist | 2 +- net/linux-edonkey-core/Makefile | 3 ++- net/linux-edonkey-core/files/wrapper.sh | 2 +- net/linux-edonkey-core/pkg-plist | 2 +- 9 files changed, 12 insertions(+), 9 deletions(-) diff --git a/net-p2p/linux-edonkey-core/Makefile b/net-p2p/linux-edonkey-core/Makefile index 91526f5a429d..14526c4fb076 100644 --- a/net-p2p/linux-edonkey-core/Makefile +++ b/net-p2p/linux-edonkey-core/Makefile @@ -7,6 +7,7 @@ PORTNAME= edonkey PORTVERSION= 0.2000.16.16.59.3 +PORTREVISION= 1 CATEGORIES= net linux MASTER_SITES= http://users.aber.ac.uk/tpm01/ PKGNAMESUFFIX= -core @@ -46,7 +47,7 @@ pre-install: @${BRANDELF} -t Linux ${WRKSRC}/${BINARY_NAME} do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/${BINARY_NAME} ${PREFIX}/bin/${BINARY_NAME}-real + @${INSTALL_PROGRAM} ${WRKSRC}/${BINARY_NAME} ${PREFIX}/sbin/${BINARY_NAME}-real @${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/${BINARY_NAME} .ifndef(NOPORTDOCS) @${MKDIR} ${DOCSDIR}${PKGNAMESUFFIX} diff --git a/net-p2p/linux-edonkey-core/files/wrapper.sh b/net-p2p/linux-edonkey-core/files/wrapper.sh index 46fd18de71cd..238d37bbd96d 100644 --- a/net-p2p/linux-edonkey-core/files/wrapper.sh +++ b/net-p2p/linux-edonkey-core/files/wrapper.sh @@ -11,7 +11,7 @@ fi if [ ! -h ${DIRNAME}/${PROGRAM##*/} ] then - ln -sf ${PREFIX}/bin/${PROGRAM##*/}-real ${DIRNAME}/${PROGRAM##*/} + ln -sf ${PREFIX}/sbin/${PROGRAM##*/}-real ${DIRNAME}/${PROGRAM##*/} fi echo " ${*} " | grep " \-createdironly " || diff --git a/net-p2p/linux-edonkey-core/pkg-plist b/net-p2p/linux-edonkey-core/pkg-plist index 3f5b8784978a..b500e2c37b31 100644 --- a/net-p2p/linux-edonkey-core/pkg-plist +++ b/net-p2p/linux-edonkey-core/pkg-plist @@ -1,4 +1,4 @@ bin/donkey -bin/donkey-real +sbin/donkey-real %%PORTDOCS%%share/doc/edonkey-core/README.FreeBSD %%PORTDOCS%%@dirrm share/doc/edonkey-core diff --git a/net/edonkey-core/Makefile b/net/edonkey-core/Makefile index 91526f5a429d..14526c4fb076 100644 --- a/net/edonkey-core/Makefile +++ b/net/edonkey-core/Makefile @@ -7,6 +7,7 @@ PORTNAME= edonkey PORTVERSION= 0.2000.16.16.59.3 +PORTREVISION= 1 CATEGORIES= net linux MASTER_SITES= http://users.aber.ac.uk/tpm01/ PKGNAMESUFFIX= -core @@ -46,7 +47,7 @@ pre-install: @${BRANDELF} -t Linux ${WRKSRC}/${BINARY_NAME} do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/${BINARY_NAME} ${PREFIX}/bin/${BINARY_NAME}-real + @${INSTALL_PROGRAM} ${WRKSRC}/${BINARY_NAME} ${PREFIX}/sbin/${BINARY_NAME}-real @${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/${BINARY_NAME} .ifndef(NOPORTDOCS) @${MKDIR} ${DOCSDIR}${PKGNAMESUFFIX} diff --git a/net/edonkey-core/files/wrapper.sh b/net/edonkey-core/files/wrapper.sh index 46fd18de71cd..238d37bbd96d 100644 --- a/net/edonkey-core/files/wrapper.sh +++ b/net/edonkey-core/files/wrapper.sh @@ -11,7 +11,7 @@ fi if [ ! -h ${DIRNAME}/${PROGRAM##*/} ] then - ln -sf ${PREFIX}/bin/${PROGRAM##*/}-real ${DIRNAME}/${PROGRAM##*/} + ln -sf ${PREFIX}/sbin/${PROGRAM##*/}-real ${DIRNAME}/${PROGRAM##*/} fi echo " ${*} " | grep " \-createdironly " || diff --git a/net/edonkey-core/pkg-plist b/net/edonkey-core/pkg-plist index 3f5b8784978a..b500e2c37b31 100644 --- a/net/edonkey-core/pkg-plist +++ b/net/edonkey-core/pkg-plist @@ -1,4 +1,4 @@ bin/donkey -bin/donkey-real +sbin/donkey-real %%PORTDOCS%%share/doc/edonkey-core/README.FreeBSD %%PORTDOCS%%@dirrm share/doc/edonkey-core diff --git a/net/linux-edonkey-core/Makefile b/net/linux-edonkey-core/Makefile index 91526f5a429d..14526c4fb076 100644 --- a/net/linux-edonkey-core/Makefile +++ b/net/linux-edonkey-core/Makefile @@ -7,6 +7,7 @@ PORTNAME= edonkey PORTVERSION= 0.2000.16.16.59.3 +PORTREVISION= 1 CATEGORIES= net linux MASTER_SITES= http://users.aber.ac.uk/tpm01/ PKGNAMESUFFIX= -core @@ -46,7 +47,7 @@ pre-install: @${BRANDELF} -t Linux ${WRKSRC}/${BINARY_NAME} do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/${BINARY_NAME} ${PREFIX}/bin/${BINARY_NAME}-real + @${INSTALL_PROGRAM} ${WRKSRC}/${BINARY_NAME} ${PREFIX}/sbin/${BINARY_NAME}-real @${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/${BINARY_NAME} .ifndef(NOPORTDOCS) @${MKDIR} ${DOCSDIR}${PKGNAMESUFFIX} diff --git a/net/linux-edonkey-core/files/wrapper.sh b/net/linux-edonkey-core/files/wrapper.sh index 46fd18de71cd..238d37bbd96d 100644 --- a/net/linux-edonkey-core/files/wrapper.sh +++ b/net/linux-edonkey-core/files/wrapper.sh @@ -11,7 +11,7 @@ fi if [ ! -h ${DIRNAME}/${PROGRAM##*/} ] then - ln -sf ${PREFIX}/bin/${PROGRAM##*/}-real ${DIRNAME}/${PROGRAM##*/} + ln -sf ${PREFIX}/sbin/${PROGRAM##*/}-real ${DIRNAME}/${PROGRAM##*/} fi echo " ${*} " | grep " \-createdironly " || diff --git a/net/linux-edonkey-core/pkg-plist b/net/linux-edonkey-core/pkg-plist index 3f5b8784978a..b500e2c37b31 100644 --- a/net/linux-edonkey-core/pkg-plist +++ b/net/linux-edonkey-core/pkg-plist @@ -1,4 +1,4 @@ bin/donkey -bin/donkey-real +sbin/donkey-real %%PORTDOCS%%share/doc/edonkey-core/README.FreeBSD %%PORTDOCS%%@dirrm share/doc/edonkey-core