After update of linux_base to 7.1 in rev 1.60, correct detection

of strip tool since it is not part of 7.1

15 files changed, 120 insertions, 90 deletions

diff --git a/graphics/linux-divxplayer/Makefile b/graphics/linux-divxplayer/Makefile
index 86f3505a91e3..a1a871e86e61 100644
--- a/graphics/linux-divxplayer/Makefile
+++ b/graphics/linux-divxplayer/Makefile
@@ -35,12 +35,6 @@ post-patch:
 	@${SED} -e "s|%%DATADIR%%|${DATADIR}|" ${FILESDIR}/wrapper.sh \
 		> ${WRKDIR}/wrapper.sh
 
-pre-install:
-.if exists(${STRIP_CMD})
-	@${STRIP_CMD} ${WRKSRC}/${BINARY_NAME}
-.endif
-	@${BRANDELF} -t Linux ${WRKSRC}/${BINARY_NAME}
-
 do-install:
 # skin files
 	@${MKDIR} ${DATADIR}
@@ -52,4 +46,12 @@ do-install:
 		${PREFIX}/bin/${BINARY_NAME:S/.bin$//}
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+pre-install:
+.if exists(${STRIP_CMD})
+	@${STRIP_CMD} ${WRKSRC}/${BINARY_NAME}
+.endif
+	@${BRANDELF} -t Linux ${WRKSRC}/${BINARY_NAME}
+
+.include <bsd.port.post.mk>
diff --git a/misc/edonkey-tool-list/Makefile b/misc/edonkey-tool-list/Makefile
index 483dcab0bda7..d3c625a0b96e 100644
--- a/misc/edonkey-tool-list/Makefile
+++ b/misc/edonkey-tool-list/Makefile
@@ -35,13 +35,15 @@ BINARY_NAME=	${PORTNAME}${PKGNAMESUFFIX}
 post-extract:
 	@${GZCAT} ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} > ${WRKSRC}/${BINARY_NAME}
 
+do-install:
+	@${INSTALL_PROGRAM} ${WRKSRC}/${BINARY_NAME} ${PREFIX}/bin
+
+.include <bsd.port.pre.mk>
+
 pre-install:
 .if exists(${STRIP_CMD})
 	@${STRIP_CMD} ${WRKSRC}/${BINARY_NAME}
 .endif
 	@${BRANDELF} -t Linux ${WRKSRC}/${BINARY_NAME}
 
-do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/${BINARY_NAME} ${PREFIX}/bin
-
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/misc/edonkey-tool-recovermet/Makefile b/misc/edonkey-tool-recovermet/Makefile
index a5e3252bf68d..90520ee63983 100644
--- a/misc/edonkey-tool-recovermet/Makefile
+++ b/misc/edonkey-tool-recovermet/Makefile
@@ -35,13 +35,15 @@ BINARY_NAME=	${PORTNAME}${PKGNAMESUFFIX}
 post-extract:
 	@${GZCAT} ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} > ${WRKSRC}/${BINARY_NAME}
 
+do-install:
+	@${INSTALL_PROGRAM} ${WRKSRC}/${BINARY_NAME} ${PREFIX}/bin
+
+.include <bsd.port.pre.mk>
+
 pre-install:
 .if exists(${STRIP_CMD})
 	@${STRIP_CMD} ${WRKSRC}/${BINARY_NAME}
 .endif
 	@${BRANDELF} -t Linux ${WRKSRC}/${BINARY_NAME}
 
-do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/${BINARY_NAME} ${PREFIX}/bin
-
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/misc/linux-edonkey-tool-list/Makefile b/misc/linux-edonkey-tool-list/Makefile
index 483dcab0bda7..d3c625a0b96e 100644
--- a/misc/linux-edonkey-tool-list/Makefile
+++ b/misc/linux-edonkey-tool-list/Makefile
@@ -35,13 +35,15 @@ BINARY_NAME=	${PORTNAME}${PKGNAMESUFFIX}
 post-extract:
 	@${GZCAT} ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} > ${WRKSRC}/${BINARY_NAME}
 
+do-install:
+	@${INSTALL_PROGRAM} ${WRKSRC}/${BINARY_NAME} ${PREFIX}/bin
+
+.include <bsd.port.pre.mk>
+
 pre-install:
 .if exists(${STRIP_CMD})
 	@${STRIP_CMD} ${WRKSRC}/${BINARY_NAME}
 .endif
 	@${BRANDELF} -t Linux ${WRKSRC}/${BINARY_NAME}
 
-do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/${BINARY_NAME} ${PREFIX}/bin
-
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/misc/linux-edonkey-tool-recovermet/Makefile b/misc/linux-edonkey-tool-recovermet/Makefile
index a5e3252bf68d..90520ee63983 100644
--- a/misc/linux-edonkey-tool-recovermet/Makefile
+++ b/misc/linux-edonkey-tool-recovermet/Makefile
@@ -35,13 +35,15 @@ BINARY_NAME=	${PORTNAME}${PKGNAMESUFFIX}
 post-extract:
 	@${GZCAT} ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} > ${WRKSRC}/${BINARY_NAME}
 
+do-install:
+	@${INSTALL_PROGRAM} ${WRKSRC}/${BINARY_NAME} ${PREFIX}/bin
+
+.include <bsd.port.pre.mk>
+
 pre-install:
 .if exists(${STRIP_CMD})
 	@${STRIP_CMD} ${WRKSRC}/${BINARY_NAME}
 .endif
 	@${BRANDELF} -t Linux ${WRKSRC}/${BINARY_NAME}
 
-do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/${BINARY_NAME} ${PREFIX}/bin
-
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/multimedia/linux-divxplayer/Makefile b/multimedia/linux-divxplayer/Makefile
index 86f3505a91e3..a1a871e86e61 100644
--- a/multimedia/linux-divxplayer/Makefile
+++ b/multimedia/linux-divxplayer/Makefile
@@ -35,12 +35,6 @@ post-patch:
 	@${SED} -e "s|%%DATADIR%%|${DATADIR}|" ${FILESDIR}/wrapper.sh \
 		> ${WRKDIR}/wrapper.sh
 
-pre-install:
-.if exists(${STRIP_CMD})
-	@${STRIP_CMD} ${WRKSRC}/${BINARY_NAME}
-.endif
-	@${BRANDELF} -t Linux ${WRKSRC}/${BINARY_NAME}
-
 do-install:
 # skin files
 	@${MKDIR} ${DATADIR}
@@ -52,4 +46,12 @@ do-install:
 		${PREFIX}/bin/${BINARY_NAME:S/.bin$//}
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+pre-install:
+.if exists(${STRIP_CMD})
+	@${STRIP_CMD} ${WRKSRC}/${BINARY_NAME}
+.endif
+	@${BRANDELF} -t Linux ${WRKSRC}/${BINARY_NAME}
+
+.include <bsd.port.post.mk>
diff --git a/net-p2p/edonkey-gui-gtk/Makefile b/net-p2p/edonkey-gui-gtk/Makefile
index 59b85097c7e9..2eec439fc145 100644
--- a/net-p2p/edonkey-gui-gtk/Makefile
+++ b/net-p2p/edonkey-gui-gtk/Makefile
@@ -40,12 +40,6 @@ post-patch:
 		s|%%DATAFILES%%|${DATA_FILES}|" \
 		${FILESDIR}/wrapper.sh > ${WRKDIR}/wrapper.sh
 
-pre-install:
-.if exists(${STRIP_CMD})
-	@${STRIP_CMD} ${WRKSRC}/${BINARY_NAME}
-.endif
-	@${BRANDELF} -t Linux ${WRKSRC}/${BINARY_NAME}
-
 do-install:
 .ifndef(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
@@ -58,4 +52,12 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${BINARY_NAME} ${PREFIX}/bin/${BINARY_NAME}-real
 	${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/${BINARY_NAME}
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+pre-install:
+.if exists(${STRIP_CMD})
+	@${STRIP_CMD} ${WRKSRC}/${BINARY_NAME}
+.endif
+	@${BRANDELF} -t Linux ${WRKSRC}/${BINARY_NAME}
+
+.include <bsd.port.post.mk>
diff --git a/net-p2p/linux-edonkey-core/Makefile b/net-p2p/linux-edonkey-core/Makefile
index 14526c4fb076..a29b56d3d6a7 100644
--- a/net-p2p/linux-edonkey-core/Makefile
+++ b/net-p2p/linux-edonkey-core/Makefile
@@ -40,12 +40,6 @@ post-patch:
 	@${SED} -e "s|%%PREFIX%%|${PREFIX}|" ${FILESDIR}/wrapper.sh > \
 		${WRKDIR}/wrapper.sh
 
-pre-install:
-.if exists(${STRIP_CMD})
-	@${STRIP_CMD} ${WRKSRC}/${BINARY_NAME}
-.endif
-	@${BRANDELF} -t Linux ${WRKSRC}/${BINARY_NAME}
-
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/${BINARY_NAME} ${PREFIX}/sbin/${BINARY_NAME}-real
 	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/${BINARY_NAME}
@@ -55,4 +49,12 @@ do-install:
 .endif
 	@${SED} s!/usr/local/share/doc/edonkey-core!${DOCSDIR}${PKGNAMESUFFIX}! ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+pre-install:
+.if exists(${STRIP_CMD})
+	@${STRIP_CMD} ${WRKSRC}/${BINARY_NAME}
+.endif
+	@${BRANDELF} -t Linux ${WRKSRC}/${BINARY_NAME}
+
+.include <bsd.port.post.mk>
diff --git a/net-p2p/linux-edonkey-server/Makefile b/net-p2p/linux-edonkey-server/Makefile
index bdea5750e4a8..48bbcf85e5b3 100644
--- a/net-p2p/linux-edonkey-server/Makefile
+++ b/net-p2p/linux-edonkey-server/Makefile
@@ -44,12 +44,6 @@ post-patch:
 		-e "s|%%LOCALBASE%%|${LOCALBASE}|" ${FILESDIR}/${RC_SAMPLE} \
 		> ${WRKDIR}/${RC_SAMPLE}
 
-pre-install:
-.if exists(${STRIP_CMD})
-#	@${STRIP_CMD} ${WRKSRC}/${BINARY_NAME}
-.endif
-	@${BRANDELF} -t Linux ${WRKSRC}/${BINARY_NAME}
-
 do-install:
 # pre-install work: create user ids, ...
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} \
@@ -58,4 +52,12 @@ do-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/${RC_SAMPLE} ${PREFIX}/etc/rc.d
 	@${INSTALL_DATA} ${FILESDIR}/donkey.ini ${PREFIX}/etc/edonkey2000
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+pre-install:
+.if exists(${STRIP_CMD})
+	@${STRIP_CMD} ${WRKSRC}/${BINARY_NAME}
+.endif
+	@${BRANDELF} -t Linux ${WRKSRC}/${BINARY_NAME}
+
+.include <bsd.port.post.mk>
diff --git a/net-p2p/linux-edonkey-tool-recovermet/Makefile b/net-p2p/linux-edonkey-tool-recovermet/Makefile
index a5e3252bf68d..90520ee63983 100644
--- a/net-p2p/linux-edonkey-tool-recovermet/Makefile
+++ b/net-p2p/linux-edonkey-tool-recovermet/Makefile
@@ -35,13 +35,15 @@ BINARY_NAME=	${PORTNAME}${PKGNAMESUFFIX}
 post-extract:
 	@${GZCAT} ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} > ${WRKSRC}/${BINARY_NAME}
 
+do-install:
+	@${INSTALL_PROGRAM} ${WRKSRC}/${BINARY_NAME} ${PREFIX}/bin
+
+.include <bsd.port.pre.mk>
+
 pre-install:
 .if exists(${STRIP_CMD})
 	@${STRIP_CMD} ${WRKSRC}/${BINARY_NAME}
 .endif
 	@${BRANDELF} -t Linux ${WRKSRC}/${BINARY_NAME}
 
-do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/${BINARY_NAME} ${PREFIX}/bin
-
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/edonkey-core/Makefile b/net/edonkey-core/Makefile
index 14526c4fb076..a29b56d3d6a7 100644
--- a/net/edonkey-core/Makefile
+++ b/net/edonkey-core/Makefile
@@ -40,12 +40,6 @@ post-patch:
 	@${SED} -e "s|%%PREFIX%%|${PREFIX}|" ${FILESDIR}/wrapper.sh > \
 		${WRKDIR}/wrapper.sh
 
-pre-install:
-.if exists(${STRIP_CMD})
-	@${STRIP_CMD} ${WRKSRC}/${BINARY_NAME}
-.endif
-	@${BRANDELF} -t Linux ${WRKSRC}/${BINARY_NAME}
-
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/${BINARY_NAME} ${PREFIX}/sbin/${BINARY_NAME}-real
 	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/${BINARY_NAME}
@@ -55,4 +49,12 @@ do-install:
 .endif
 	@${SED} s!/usr/local/share/doc/edonkey-core!${DOCSDIR}${PKGNAMESUFFIX}! ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+pre-install:
+.if exists(${STRIP_CMD})
+	@${STRIP_CMD} ${WRKSRC}/${BINARY_NAME}
+.endif
+	@${BRANDELF} -t Linux ${WRKSRC}/${BINARY_NAME}
+
+.include <bsd.port.post.mk>
diff --git a/net/edonkey-gui-gtk/Makefile b/net/edonkey-gui-gtk/Makefile
index 59b85097c7e9..2eec439fc145 100644
--- a/net/edonkey-gui-gtk/Makefile
+++ b/net/edonkey-gui-gtk/Makefile
@@ -40,12 +40,6 @@ post-patch:
 		s|%%DATAFILES%%|${DATA_FILES}|" \
 		${FILESDIR}/wrapper.sh > ${WRKDIR}/wrapper.sh
 
-pre-install:
-.if exists(${STRIP_CMD})
-	@${STRIP_CMD} ${WRKSRC}/${BINARY_NAME}
-.endif
-	@${BRANDELF} -t Linux ${WRKSRC}/${BINARY_NAME}
-
 do-install:
 .ifndef(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
@@ -58,4 +52,12 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${BINARY_NAME} ${PREFIX}/bin/${BINARY_NAME}-real
 	${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/${BINARY_NAME}
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+pre-install:
+.if exists(${STRIP_CMD})
+	@${STRIP_CMD} ${WRKSRC}/${BINARY_NAME}
+.endif
+	@${BRANDELF} -t Linux ${WRKSRC}/${BINARY_NAME}
+
+.include <bsd.port.post.mk>
diff --git a/net/linux-edonkey-core/Makefile b/net/linux-edonkey-core/Makefile
index 14526c4fb076..a29b56d3d6a7 100644
--- a/net/linux-edonkey-core/Makefile
+++ b/net/linux-edonkey-core/Makefile
@@ -40,12 +40,6 @@ post-patch:
 	@${SED} -e "s|%%PREFIX%%|${PREFIX}|" ${FILESDIR}/wrapper.sh > \
 		${WRKDIR}/wrapper.sh
 
-pre-install:
-.if exists(${STRIP_CMD})
-	@${STRIP_CMD} ${WRKSRC}/${BINARY_NAME}
-.endif
-	@${BRANDELF} -t Linux ${WRKSRC}/${BINARY_NAME}
-
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/${BINARY_NAME} ${PREFIX}/sbin/${BINARY_NAME}-real
 	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/${BINARY_NAME}
@@ -55,4 +49,12 @@ do-install:
 .endif
 	@${SED} s!/usr/local/share/doc/edonkey-core!${DOCSDIR}${PKGNAMESUFFIX}! ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+pre-install:
+.if exists(${STRIP_CMD})
+	@${STRIP_CMD} ${WRKSRC}/${BINARY_NAME}
+.endif
+	@${BRANDELF} -t Linux ${WRKSRC}/${BINARY_NAME}
+
+.include <bsd.port.post.mk>
diff --git a/net/linux-edonkey-gui-gtk/Makefile b/net/linux-edonkey-gui-gtk/Makefile
index 59b85097c7e9..2eec439fc145 100644
--- a/net/linux-edonkey-gui-gtk/Makefile
+++ b/net/linux-edonkey-gui-gtk/Makefile
@@ -40,12 +40,6 @@ post-patch:
 		s|%%DATAFILES%%|${DATA_FILES}|" \
 		${FILESDIR}/wrapper.sh > ${WRKDIR}/wrapper.sh
 
-pre-install:
-.if exists(${STRIP_CMD})
-	@${STRIP_CMD} ${WRKSRC}/${BINARY_NAME}
-.endif
-	@${BRANDELF} -t Linux ${WRKSRC}/${BINARY_NAME}
-
 do-install:
 .ifndef(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
@@ -58,4 +52,12 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${BINARY_NAME} ${PREFIX}/bin/${BINARY_NAME}-real
 	${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/${BINARY_NAME}
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+pre-install:
+.if exists(${STRIP_CMD})
+	@${STRIP_CMD} ${WRKSRC}/${BINARY_NAME}
+.endif
+	@${BRANDELF} -t Linux ${WRKSRC}/${BINARY_NAME}
+
+.include <bsd.port.post.mk>
diff --git a/net/linux-edonkey-server/Makefile b/net/linux-edonkey-server/Makefile
index bdea5750e4a8..48bbcf85e5b3 100644
--- a/net/linux-edonkey-server/Makefile
+++ b/net/linux-edonkey-server/Makefile
@@ -44,12 +44,6 @@ post-patch:
 		-e "s|%%LOCALBASE%%|${LOCALBASE}|" ${FILESDIR}/${RC_SAMPLE} \
 		> ${WRKDIR}/${RC_SAMPLE}
 
-pre-install:
-.if exists(${STRIP_CMD})
-#	@${STRIP_CMD} ${WRKSRC}/${BINARY_NAME}
-.endif
-	@${BRANDELF} -t Linux ${WRKSRC}/${BINARY_NAME}
-
 do-install:
 # pre-install work: create user ids, ...
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} \
@@ -58,4 +52,12 @@ do-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/${RC_SAMPLE} ${PREFIX}/etc/rc.d
 	@${INSTALL_DATA} ${FILESDIR}/donkey.ini ${PREFIX}/etc/edonkey2000
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+pre-install:
+.if exists(${STRIP_CMD})
+	@${STRIP_CMD} ${WRKSRC}/${BINARY_NAME}
+.endif
+	@${BRANDELF} -t Linux ${WRKSRC}/${BINARY_NAME}
+
+.include <bsd.port.post.mk>