aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorsobomax <sobomax@FreeBSD.org>2008-08-21 15:32:48 +0800
committersobomax <sobomax@FreeBSD.org>2008-08-21 15:32:48 +0800
commit6d070694da1d0e41b2bcd2e2f629807372dd0c41 (patch)
treee85d066d50a61df59cc68e4f65357282b04c7c4c /net
parentc70ae76a7cbe638a755d2ce8753e5e04275f6226 (diff)
downloadfreebsd-ports-graphics-6d070694da1d0e41b2bcd2e2f629807372dd0c41.tar.gz
freebsd-ports-graphics-6d070694da1d0e41b2bcd2e2f629807372dd0c41.tar.zst
freebsd-ports-graphics-6d070694da1d0e41b2bcd2e2f629807372dd0c41.zip
Properly link H323 module with ptlib and oh323 libraries. Otherwise
H323 channel fails to load. Bump PORTREVISION. Reported by: Rodrigo Graeff
Diffstat (limited to 'net')
-rw-r--r--net/asterisk/Makefile2
-rw-r--r--net/asterisk/files/patch-channels::Makefile10
-rw-r--r--net/asterisk10/Makefile2
-rw-r--r--net/asterisk10/files/patch-channels::Makefile10
-rw-r--r--net/asterisk14/Makefile2
-rw-r--r--net/asterisk14/files/patch-channels::Makefile10
-rw-r--r--net/asterisk16/Makefile2
-rw-r--r--net/asterisk16/files/patch-channels::Makefile10
8 files changed, 28 insertions, 20 deletions
diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile
index a1dd5821cae..81836339e41 100644
--- a/net/asterisk/Makefile
+++ b/net/asterisk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= asterisk
PORTVERSION= 1.4.21.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \
http://ftp.digium.com/pub/asterisk/old-releases/
diff --git a/net/asterisk/files/patch-channels::Makefile b/net/asterisk/files/patch-channels::Makefile
index 833abdac156..fa5a90a988f 100644
--- a/net/asterisk/files/patch-channels::Makefile
+++ b/net/asterisk/files/patch-channels::Makefile
@@ -3,7 +3,7 @@ $FreeBSD$
--- channels/Makefile.orig
+++ channels/Makefile
-@@ -32,8 +32,8 @@
+@@ -32,9 +32,10 @@
endif
ifeq ($(OSARCH),FreeBSD)
@@ -12,9 +12,11 @@ $FreeBSD$
+ PTLIB=-lpt_r
+ H323LIB=-lh323_r
CHANH323LIB=-pthread
++ H323LDLIBS=$(PTLIB) $(H323LIB) $(CHANH323LIB)
endif
-@@ -78,12 +78,13 @@
+ ifeq ($(OSARCH),NetBSD)
+@@ -78,12 +79,13 @@
h323/libchanh323.a h323/Makefile.ast:
$(CMD_PREFIX) $(MAKE) -C h323
$(CMD_PREFIX) rm -f ../main/asterisk
@@ -34,12 +36,12 @@ $FreeBSD$
endif
dist-clean::
-@@ -113,8 +114,12 @@
+@@ -113,8 +115,12 @@
else
chan_h323.so: chan_h323.o h323/libchanh323.a
$(ECHO_PREFIX) echo " [LD] $^ -> $@"
+ifeq ($(OSARCH),FreeBSD)
-+ $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS)
++ $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) $(CHANH323LIB)
+else
$(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat
endif
diff --git a/net/asterisk10/Makefile b/net/asterisk10/Makefile
index a1dd5821cae..81836339e41 100644
--- a/net/asterisk10/Makefile
+++ b/net/asterisk10/Makefile
@@ -7,7 +7,7 @@
PORTNAME= asterisk
PORTVERSION= 1.4.21.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \
http://ftp.digium.com/pub/asterisk/old-releases/
diff --git a/net/asterisk10/files/patch-channels::Makefile b/net/asterisk10/files/patch-channels::Makefile
index 833abdac156..fa5a90a988f 100644
--- a/net/asterisk10/files/patch-channels::Makefile
+++ b/net/asterisk10/files/patch-channels::Makefile
@@ -3,7 +3,7 @@ $FreeBSD$
--- channels/Makefile.orig
+++ channels/Makefile
-@@ -32,8 +32,8 @@
+@@ -32,9 +32,10 @@
endif
ifeq ($(OSARCH),FreeBSD)
@@ -12,9 +12,11 @@ $FreeBSD$
+ PTLIB=-lpt_r
+ H323LIB=-lh323_r
CHANH323LIB=-pthread
++ H323LDLIBS=$(PTLIB) $(H323LIB) $(CHANH323LIB)
endif
-@@ -78,12 +78,13 @@
+ ifeq ($(OSARCH),NetBSD)
+@@ -78,12 +79,13 @@
h323/libchanh323.a h323/Makefile.ast:
$(CMD_PREFIX) $(MAKE) -C h323
$(CMD_PREFIX) rm -f ../main/asterisk
@@ -34,12 +36,12 @@ $FreeBSD$
endif
dist-clean::
-@@ -113,8 +114,12 @@
+@@ -113,8 +115,12 @@
else
chan_h323.so: chan_h323.o h323/libchanh323.a
$(ECHO_PREFIX) echo " [LD] $^ -> $@"
+ifeq ($(OSARCH),FreeBSD)
-+ $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS)
++ $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) $(CHANH323LIB)
+else
$(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat
endif
diff --git a/net/asterisk14/Makefile b/net/asterisk14/Makefile
index a1dd5821cae..81836339e41 100644
--- a/net/asterisk14/Makefile
+++ b/net/asterisk14/Makefile
@@ -7,7 +7,7 @@
PORTNAME= asterisk
PORTVERSION= 1.4.21.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \
http://ftp.digium.com/pub/asterisk/old-releases/
diff --git a/net/asterisk14/files/patch-channels::Makefile b/net/asterisk14/files/patch-channels::Makefile
index 833abdac156..fa5a90a988f 100644
--- a/net/asterisk14/files/patch-channels::Makefile
+++ b/net/asterisk14/files/patch-channels::Makefile
@@ -3,7 +3,7 @@ $FreeBSD$
--- channels/Makefile.orig
+++ channels/Makefile
-@@ -32,8 +32,8 @@
+@@ -32,9 +32,10 @@
endif
ifeq ($(OSARCH),FreeBSD)
@@ -12,9 +12,11 @@ $FreeBSD$
+ PTLIB=-lpt_r
+ H323LIB=-lh323_r
CHANH323LIB=-pthread
++ H323LDLIBS=$(PTLIB) $(H323LIB) $(CHANH323LIB)
endif
-@@ -78,12 +78,13 @@
+ ifeq ($(OSARCH),NetBSD)
+@@ -78,12 +79,13 @@
h323/libchanh323.a h323/Makefile.ast:
$(CMD_PREFIX) $(MAKE) -C h323
$(CMD_PREFIX) rm -f ../main/asterisk
@@ -34,12 +36,12 @@ $FreeBSD$
endif
dist-clean::
-@@ -113,8 +114,12 @@
+@@ -113,8 +115,12 @@
else
chan_h323.so: chan_h323.o h323/libchanh323.a
$(ECHO_PREFIX) echo " [LD] $^ -> $@"
+ifeq ($(OSARCH),FreeBSD)
-+ $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS)
++ $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) $(CHANH323LIB)
+else
$(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat
endif
diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile
index a1dd5821cae..81836339e41 100644
--- a/net/asterisk16/Makefile
+++ b/net/asterisk16/Makefile
@@ -7,7 +7,7 @@
PORTNAME= asterisk
PORTVERSION= 1.4.21.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \
http://ftp.digium.com/pub/asterisk/old-releases/
diff --git a/net/asterisk16/files/patch-channels::Makefile b/net/asterisk16/files/patch-channels::Makefile
index 833abdac156..fa5a90a988f 100644
--- a/net/asterisk16/files/patch-channels::Makefile
+++ b/net/asterisk16/files/patch-channels::Makefile
@@ -3,7 +3,7 @@ $FreeBSD$
--- channels/Makefile.orig
+++ channels/Makefile
-@@ -32,8 +32,8 @@
+@@ -32,9 +32,10 @@
endif
ifeq ($(OSARCH),FreeBSD)
@@ -12,9 +12,11 @@ $FreeBSD$
+ PTLIB=-lpt_r
+ H323LIB=-lh323_r
CHANH323LIB=-pthread
++ H323LDLIBS=$(PTLIB) $(H323LIB) $(CHANH323LIB)
endif
-@@ -78,12 +78,13 @@
+ ifeq ($(OSARCH),NetBSD)
+@@ -78,12 +79,13 @@
h323/libchanh323.a h323/Makefile.ast:
$(CMD_PREFIX) $(MAKE) -C h323
$(CMD_PREFIX) rm -f ../main/asterisk
@@ -34,12 +36,12 @@ $FreeBSD$
endif
dist-clean::
-@@ -113,8 +114,12 @@
+@@ -113,8 +115,12 @@
else
chan_h323.so: chan_h323.o h323/libchanh323.a
$(ECHO_PREFIX) echo " [LD] $^ -> $@"
+ifeq ($(OSARCH),FreeBSD)
-+ $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS)
++ $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) $(CHANH323LIB)
+else
$(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat
endif
generated by cgit (git 2.34.1) at 2025-02-06 05:45:18 +0800