diff options
author | Roger Hardiman <roger@FreeBSD.org> | 2002-01-15 15:06:17 +0000 |
---|---|---|
committer | Roger Hardiman <roger@FreeBSD.org> | 2002-01-15 15:06:17 +0000 |
commit | 87de83a55d8095c2179a98f6c91f7b14a5b6477d (patch) | |
tree | f694d96d823db1c46535859dd1b53f352d141945 | |
parent | 20d295dead62b5c1653984fcf46014fa0027f20e (diff) | |
download | ports-87de83a55d8095c2179a98f6c91f7b14a5b6477d.tar.gz ports-87de83a55d8095c2179a98f6c91f7b14a5b6477d.zip |
Notes
-rw-r--r-- | net/opal/Makefile | 18 | ||||
-rw-r--r-- | net/opal/files/patch-ab | 11 | ||||
-rw-r--r-- | net/opal3/Makefile | 18 | ||||
-rw-r--r-- | net/opal3/files/patch-ab | 11 | ||||
-rw-r--r-- | net/openh323-112/Makefile | 18 | ||||
-rw-r--r-- | net/openh323-112/files/patch-ab | 11 | ||||
-rw-r--r-- | net/openh323/Makefile | 18 | ||||
-rw-r--r-- | net/openh323/files/patch-ab | 11 |
8 files changed, 100 insertions, 16 deletions
diff --git a/net/opal/Makefile b/net/opal/Makefile index bebd1444e269..58e4a9cfb7e9 100644 --- a/net/opal/Makefile +++ b/net/opal/Makefile @@ -7,7 +7,7 @@ PORTNAME= openh323 PORTVERSION= 1.7.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://www.openh323.org/bin/ \ http://www.de.openh323.org/bin/ \ @@ -17,6 +17,12 @@ DISTFILES= openh323_1.7.4.tar.gz \ MAINTAINER= roger@freebsd.org +# Check for telephony.h in /usr/include/sys and in $PREFIX/include/sys. +# If it is not present, extract it from the comms/ixj port +.if !exists(/usr/include/sys/telephony.h) +BUILD_DEPENDS= ${PREFIX}/include/sys/telephony.h:${PORTSDIR}/comms/ixj:patch +.endif + WRKSRC= ${WRKDIR}/${PORTNAME} USE_NEWGCC= yes @@ -29,6 +35,16 @@ MAKE_ENV= PWLIBDIR=${WRKDIR}/pwlib \ THE_MACHTYPE= ${ARCH:S/i386/x86/} MAKE_ARGS= OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} CPLUS=${CXX} +post-patch: +.if !exists(/usr/include/sys/telephony.h) +.if !exists($(PREFIX)/sys/telephony.h) + # Copy over ixj driver include files into OpenH323 include directory + ${MKDIR} ${WRKDIR}/openh323/include/sys + ${CP} ${PORTSDIR}/comms/ixj/work/ixj_freebsd/telephony.h ${WRKDIR}/openh323/include/sys + ${CP} ${PORTSDIR}/comms/ixj/work/ixj_freebsd/ixjuser.h ${WRKDIR}/openh323/include/sys +.endif +.endif + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/samples/simple/obj_${OPSYS}_${THE_MACHTYPE}_r/simph323 ${PREFIX}/bin diff --git a/net/opal/files/patch-ab b/net/opal/files/patch-ab index 44efc143eb93..1d4daf2501a5 100644 --- a/net/opal/files/patch-ab +++ b/net/opal/files/patch-ab @@ -1,8 +1,8 @@ -*** openh323u.mak.orig Tue Jan 15 09:05:05 2002 ---- openh323u.mak Tue Jan 15 09:05:41 2002 +*** openh323u.mak.orig Tue Oct 9 10:05:24 2001 +--- openh323u.mak Tue Jan 15 14:01:29 2002 *************** HAS_IXJ = 1 *** 124,129 **** ---- 124,134 ---- +--- 124,139 ---- STDCCFLAGS += -DHAS_IXJ endif @@ -11,6 +11,11 @@ + STDCCFLAGS += -DHAS_IXJ -I/usr/local/include + endif + ++ ifneq (,$(wildcard $(OPENH323DIR)/include/sys/telephony.h)) ++ HAS_IXJ = 1 ++ STDCCFLAGS += -DHAS_IXJ ++ endif ++ ifneq (,$(wildcard /usr/include/linux/soundcard.h)) HAS_OSS = 1 STDCCFLAGS += -DHAS_OSS diff --git a/net/opal3/Makefile b/net/opal3/Makefile index bebd1444e269..58e4a9cfb7e9 100644 --- a/net/opal3/Makefile +++ b/net/opal3/Makefile @@ -7,7 +7,7 @@ PORTNAME= openh323 PORTVERSION= 1.7.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://www.openh323.org/bin/ \ http://www.de.openh323.org/bin/ \ @@ -17,6 +17,12 @@ DISTFILES= openh323_1.7.4.tar.gz \ MAINTAINER= roger@freebsd.org +# Check for telephony.h in /usr/include/sys and in $PREFIX/include/sys. +# If it is not present, extract it from the comms/ixj port +.if !exists(/usr/include/sys/telephony.h) +BUILD_DEPENDS= ${PREFIX}/include/sys/telephony.h:${PORTSDIR}/comms/ixj:patch +.endif + WRKSRC= ${WRKDIR}/${PORTNAME} USE_NEWGCC= yes @@ -29,6 +35,16 @@ MAKE_ENV= PWLIBDIR=${WRKDIR}/pwlib \ THE_MACHTYPE= ${ARCH:S/i386/x86/} MAKE_ARGS= OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} CPLUS=${CXX} +post-patch: +.if !exists(/usr/include/sys/telephony.h) +.if !exists($(PREFIX)/sys/telephony.h) + # Copy over ixj driver include files into OpenH323 include directory + ${MKDIR} ${WRKDIR}/openh323/include/sys + ${CP} ${PORTSDIR}/comms/ixj/work/ixj_freebsd/telephony.h ${WRKDIR}/openh323/include/sys + ${CP} ${PORTSDIR}/comms/ixj/work/ixj_freebsd/ixjuser.h ${WRKDIR}/openh323/include/sys +.endif +.endif + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/samples/simple/obj_${OPSYS}_${THE_MACHTYPE}_r/simph323 ${PREFIX}/bin diff --git a/net/opal3/files/patch-ab b/net/opal3/files/patch-ab index 44efc143eb93..1d4daf2501a5 100644 --- a/net/opal3/files/patch-ab +++ b/net/opal3/files/patch-ab @@ -1,8 +1,8 @@ -*** openh323u.mak.orig Tue Jan 15 09:05:05 2002 ---- openh323u.mak Tue Jan 15 09:05:41 2002 +*** openh323u.mak.orig Tue Oct 9 10:05:24 2001 +--- openh323u.mak Tue Jan 15 14:01:29 2002 *************** HAS_IXJ = 1 *** 124,129 **** ---- 124,134 ---- +--- 124,139 ---- STDCCFLAGS += -DHAS_IXJ endif @@ -11,6 +11,11 @@ + STDCCFLAGS += -DHAS_IXJ -I/usr/local/include + endif + ++ ifneq (,$(wildcard $(OPENH323DIR)/include/sys/telephony.h)) ++ HAS_IXJ = 1 ++ STDCCFLAGS += -DHAS_IXJ ++ endif ++ ifneq (,$(wildcard /usr/include/linux/soundcard.h)) HAS_OSS = 1 STDCCFLAGS += -DHAS_OSS diff --git a/net/openh323-112/Makefile b/net/openh323-112/Makefile index bebd1444e269..58e4a9cfb7e9 100644 --- a/net/openh323-112/Makefile +++ b/net/openh323-112/Makefile @@ -7,7 +7,7 @@ PORTNAME= openh323 PORTVERSION= 1.7.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://www.openh323.org/bin/ \ http://www.de.openh323.org/bin/ \ @@ -17,6 +17,12 @@ DISTFILES= openh323_1.7.4.tar.gz \ MAINTAINER= roger@freebsd.org +# Check for telephony.h in /usr/include/sys and in $PREFIX/include/sys. +# If it is not present, extract it from the comms/ixj port +.if !exists(/usr/include/sys/telephony.h) +BUILD_DEPENDS= ${PREFIX}/include/sys/telephony.h:${PORTSDIR}/comms/ixj:patch +.endif + WRKSRC= ${WRKDIR}/${PORTNAME} USE_NEWGCC= yes @@ -29,6 +35,16 @@ MAKE_ENV= PWLIBDIR=${WRKDIR}/pwlib \ THE_MACHTYPE= ${ARCH:S/i386/x86/} MAKE_ARGS= OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} CPLUS=${CXX} +post-patch: +.if !exists(/usr/include/sys/telephony.h) +.if !exists($(PREFIX)/sys/telephony.h) + # Copy over ixj driver include files into OpenH323 include directory + ${MKDIR} ${WRKDIR}/openh323/include/sys + ${CP} ${PORTSDIR}/comms/ixj/work/ixj_freebsd/telephony.h ${WRKDIR}/openh323/include/sys + ${CP} ${PORTSDIR}/comms/ixj/work/ixj_freebsd/ixjuser.h ${WRKDIR}/openh323/include/sys +.endif +.endif + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/samples/simple/obj_${OPSYS}_${THE_MACHTYPE}_r/simph323 ${PREFIX}/bin diff --git a/net/openh323-112/files/patch-ab b/net/openh323-112/files/patch-ab index 44efc143eb93..1d4daf2501a5 100644 --- a/net/openh323-112/files/patch-ab +++ b/net/openh323-112/files/patch-ab @@ -1,8 +1,8 @@ -*** openh323u.mak.orig Tue Jan 15 09:05:05 2002 ---- openh323u.mak Tue Jan 15 09:05:41 2002 +*** openh323u.mak.orig Tue Oct 9 10:05:24 2001 +--- openh323u.mak Tue Jan 15 14:01:29 2002 *************** HAS_IXJ = 1 *** 124,129 **** ---- 124,134 ---- +--- 124,139 ---- STDCCFLAGS += -DHAS_IXJ endif @@ -11,6 +11,11 @@ + STDCCFLAGS += -DHAS_IXJ -I/usr/local/include + endif + ++ ifneq (,$(wildcard $(OPENH323DIR)/include/sys/telephony.h)) ++ HAS_IXJ = 1 ++ STDCCFLAGS += -DHAS_IXJ ++ endif ++ ifneq (,$(wildcard /usr/include/linux/soundcard.h)) HAS_OSS = 1 STDCCFLAGS += -DHAS_OSS diff --git a/net/openh323/Makefile b/net/openh323/Makefile index bebd1444e269..58e4a9cfb7e9 100644 --- a/net/openh323/Makefile +++ b/net/openh323/Makefile @@ -7,7 +7,7 @@ PORTNAME= openh323 PORTVERSION= 1.7.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://www.openh323.org/bin/ \ http://www.de.openh323.org/bin/ \ @@ -17,6 +17,12 @@ DISTFILES= openh323_1.7.4.tar.gz \ MAINTAINER= roger@freebsd.org +# Check for telephony.h in /usr/include/sys and in $PREFIX/include/sys. +# If it is not present, extract it from the comms/ixj port +.if !exists(/usr/include/sys/telephony.h) +BUILD_DEPENDS= ${PREFIX}/include/sys/telephony.h:${PORTSDIR}/comms/ixj:patch +.endif + WRKSRC= ${WRKDIR}/${PORTNAME} USE_NEWGCC= yes @@ -29,6 +35,16 @@ MAKE_ENV= PWLIBDIR=${WRKDIR}/pwlib \ THE_MACHTYPE= ${ARCH:S/i386/x86/} MAKE_ARGS= OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} CPLUS=${CXX} +post-patch: +.if !exists(/usr/include/sys/telephony.h) +.if !exists($(PREFIX)/sys/telephony.h) + # Copy over ixj driver include files into OpenH323 include directory + ${MKDIR} ${WRKDIR}/openh323/include/sys + ${CP} ${PORTSDIR}/comms/ixj/work/ixj_freebsd/telephony.h ${WRKDIR}/openh323/include/sys + ${CP} ${PORTSDIR}/comms/ixj/work/ixj_freebsd/ixjuser.h ${WRKDIR}/openh323/include/sys +.endif +.endif + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/samples/simple/obj_${OPSYS}_${THE_MACHTYPE}_r/simph323 ${PREFIX}/bin diff --git a/net/openh323/files/patch-ab b/net/openh323/files/patch-ab index 44efc143eb93..1d4daf2501a5 100644 --- a/net/openh323/files/patch-ab +++ b/net/openh323/files/patch-ab @@ -1,8 +1,8 @@ -*** openh323u.mak.orig Tue Jan 15 09:05:05 2002 ---- openh323u.mak Tue Jan 15 09:05:41 2002 +*** openh323u.mak.orig Tue Oct 9 10:05:24 2001 +--- openh323u.mak Tue Jan 15 14:01:29 2002 *************** HAS_IXJ = 1 *** 124,129 **** ---- 124,134 ---- +--- 124,139 ---- STDCCFLAGS += -DHAS_IXJ endif @@ -11,6 +11,11 @@ + STDCCFLAGS += -DHAS_IXJ -I/usr/local/include + endif + ++ ifneq (,$(wildcard $(OPENH323DIR)/include/sys/telephony.h)) ++ HAS_IXJ = 1 ++ STDCCFLAGS += -DHAS_IXJ ++ endif ++ ifneq (,$(wildcard /usr/include/linux/soundcard.h)) HAS_OSS = 1 STDCCFLAGS += -DHAS_OSS |