From cf0cc349611b259f26f34901d6da0817504f1451 Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Thu, 24 Apr 2014 15:01:05 +0000 Subject: [PATCH] - Unbreak on 10.x+ by using gcc - Support staging - Switch USE_GMAKE to USES - Use mew LIB_DEPENDS syntax - Optionize --- net/ohphone/Makefile | 34 ++++++++++++++++++---------------- net/ohphone/pkg-plist | 9 --------- 2 files changed, 18 insertions(+), 25 deletions(-) delete mode 100644 net/ohphone/pkg-plist diff --git a/net/ohphone/Makefile b/net/ohphone/Makefile index c269fdaee090..905e826e8fad 100644 --- a/net/ohphone/Makefile +++ b/net/ohphone/Makefile @@ -10,34 +10,36 @@ MASTER_SITES= ftp://ftp.frm2.tum.de/pub/jpulz/FreeBSD/distfiles/ MAINTAINER= ports@FreeBSD.org COMMENT= H323 Video Conferencing Program, compatible with NetMeeting -LIB_DEPENDS= h323_r.1:${PORTSDIR}/net/openh323 +LIB_DEPENDS= libh323_r.so:${PORTSDIR}/net/openh323 -USES= bison -USE_GMAKE= yes +USES= bison gmake ALL_TARGET= optshared MAKE_ENV= PWLIBDIR=${LOCALBASE}/share/pwlib \ OPENH323DIR=${LOCALBASE}/share/openh323 \ SYSLIBDIR=${LOCALBASE}/lib MAKE_ARGS= OSTYPE=${OPSYS} MACHTYPE=${ARCH:S/i386/x86/} \ OSRELEASE=${OSVERSION} CPLUS=${CXX} - -MAN1= ohphone.1 +USE_GCC= any PLIST_SUB= PORTNAME=${PORTNAME} DOCSDIR= ${PREFIX}/share/doc/openh323 EXAMPLESDIR= ${PREFIX}/share/examples/openh323 -NO_STAGE= yes +PLIST_FILES= bin/${PORTNAME} \ + man/man1/${PORTNAME}.1.gz +PORTDOCS= * +PORTEXAMPLES= * + +OPTIONS_DEFINE= DOCS EXAMPLES + do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/obj_r/ohphone ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/ohphone.1 ${PREFIX}/man/man1 -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR}/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/ReadMe.txt ${DOCSDIR}/${PORTNAME} -.endif - ${MKDIR} ${EXAMPLESDIR}/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/check_listen.awk ${EXAMPLESDIR}/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/regtest ${EXAMPLESDIR}/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/stresstest ${EXAMPLESDIR}/${PORTNAME} + ${INSTALL_PROGRAM} ${WRKSRC}/obj_r/ohphone ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/ohphone.1 ${STAGEDIR}${PREFIX}/man/man1 + ${MKDIR} ${STAGEDIR}${DOCSDIR}/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/ReadMe.txt ${STAGEDIR}${DOCSDIR}/${PORTNAME} + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/check_listen.awk ${STAGEDIR}${EXAMPLESDIR}/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/regtest ${STAGEDIR}${EXAMPLESDIR}/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/stresstest ${STAGEDIR}${EXAMPLESDIR}/${PORTNAME} .include diff --git a/net/ohphone/pkg-plist b/net/ohphone/pkg-plist deleted file mode 100644 index 549e1fee9d71..000000000000 --- a/net/ohphone/pkg-plist +++ /dev/null @@ -1,9 +0,0 @@ -bin/ohphone -%%EXAMPLESDIR%%/%%PORTNAME%%/check_listen.awk -%%EXAMPLESDIR%%/%%PORTNAME%%/regtest -%%EXAMPLESDIR%%/%%PORTNAME%%/stresstest -@dirrm %%EXAMPLESDIR%%/%%PORTNAME%% -@dirrmtry %%EXAMPLESDIR%% -%%PORTDOCS%%%%DOCSDIR%%/%%PORTNAME%%/ReadMe.txt -%%PORTDOCS%%@dirrm %%DOCSDIR%%/%%PORTNAME%% -%%PORTDOCS%%@dirrmtry %%DOCSDIR%%