diff options
author | roger <roger@FreeBSD.org> | 2000-04-04 21:38:09 +0800 |
---|---|---|
committer | roger <roger@FreeBSD.org> | 2000-04-04 21:38:09 +0800 |
commit | f7175e1a5cb5a528ca3c04c9ffdaccf4e7a6ef5f (patch) | |
tree | 756760338d746a447fa49c967e00ff78af87a26c /net | |
parent | 9673e889dfbf89ed9ff027424ea475605f4a64c3 (diff) | |
download | freebsd-ports-gnome-f7175e1a5cb5a528ca3c04c9ffdaccf4e7a6ef5f.tar.gz freebsd-ports-gnome-f7175e1a5cb5a528ca3c04c9ffdaccf4e7a6ef5f.tar.zst freebsd-ports-gnome-f7175e1a5cb5a528ca3c04c9ffdaccf4e7a6ef5f.zip |
Do not allow OpenH323 to autodetect the OS, OS Version and
CPU architecture.
Instead pass in the actual values, as defined in bsd.port.mk
Also, fix bug in do-install which prevented Alpha installs.
Submitted by: Karl.Dietz@frankfurt.netsurf.de
Diffstat (limited to 'net')
-rw-r--r-- | net/opal/Makefile | 5 | ||||
-rw-r--r-- | net/opal3/Makefile | 5 | ||||
-rw-r--r-- | net/openh323-112/Makefile | 5 | ||||
-rw-r--r-- | net/openh323/Makefile | 5 |
4 files changed, 16 insertions, 4 deletions
diff --git a/net/opal/Makefile b/net/opal/Makefile index a0ae626cd7d5..1bec4b123bbd 100644 --- a/net/opal/Makefile +++ b/net/opal/Makefile @@ -25,8 +25,11 @@ USE_GMAKE= yes ALL_TARGET= opt MAKE_ENV= PWLIBDIR=${WRKDIR}/pwlib \ OPENH323DIR=${WRKDIR}/openh323 +THE_MACHTYPE= ${ARCH:S/i386/x86/} +MAKE_ARGS= OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} + do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/test/obj_FreeBSD_x86_r/voxilla ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/test/obj_${OPSYS}_${THE_MACHTYPE}_r/voxilla ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/test/voxilla.1 ${PREFIX}/man/man1/voxilla.1 MAN1= voxilla.1 diff --git a/net/opal3/Makefile b/net/opal3/Makefile index a0ae626cd7d5..1bec4b123bbd 100644 --- a/net/opal3/Makefile +++ b/net/opal3/Makefile @@ -25,8 +25,11 @@ USE_GMAKE= yes ALL_TARGET= opt MAKE_ENV= PWLIBDIR=${WRKDIR}/pwlib \ OPENH323DIR=${WRKDIR}/openh323 +THE_MACHTYPE= ${ARCH:S/i386/x86/} +MAKE_ARGS= OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} + do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/test/obj_FreeBSD_x86_r/voxilla ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/test/obj_${OPSYS}_${THE_MACHTYPE}_r/voxilla ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/test/voxilla.1 ${PREFIX}/man/man1/voxilla.1 MAN1= voxilla.1 diff --git a/net/openh323-112/Makefile b/net/openh323-112/Makefile index a0ae626cd7d5..1bec4b123bbd 100644 --- a/net/openh323-112/Makefile +++ b/net/openh323-112/Makefile @@ -25,8 +25,11 @@ USE_GMAKE= yes ALL_TARGET= opt MAKE_ENV= PWLIBDIR=${WRKDIR}/pwlib \ OPENH323DIR=${WRKDIR}/openh323 +THE_MACHTYPE= ${ARCH:S/i386/x86/} +MAKE_ARGS= OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} + do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/test/obj_FreeBSD_x86_r/voxilla ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/test/obj_${OPSYS}_${THE_MACHTYPE}_r/voxilla ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/test/voxilla.1 ${PREFIX}/man/man1/voxilla.1 MAN1= voxilla.1 diff --git a/net/openh323/Makefile b/net/openh323/Makefile index a0ae626cd7d5..1bec4b123bbd 100644 --- a/net/openh323/Makefile +++ b/net/openh323/Makefile @@ -25,8 +25,11 @@ USE_GMAKE= yes ALL_TARGET= opt MAKE_ENV= PWLIBDIR=${WRKDIR}/pwlib \ OPENH323DIR=${WRKDIR}/openh323 +THE_MACHTYPE= ${ARCH:S/i386/x86/} +MAKE_ARGS= OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} + do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/test/obj_FreeBSD_x86_r/voxilla ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/test/obj_${OPSYS}_${THE_MACHTYPE}_r/voxilla ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/test/voxilla.1 ${PREFIX}/man/man1/voxilla.1 MAN1= voxilla.1 |