summaryrefslogtreecommitdiff
path: root/net/asterisk10/files/patch-Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'net/asterisk10/files/patch-Makefile')
-rw-r--r--net/asterisk10/files/patch-Makefile76
1 files changed, 36 insertions, 40 deletions
diff --git a/net/asterisk10/files/patch-Makefile b/net/asterisk10/files/patch-Makefile
index 61a2c51190b5..879d944fd9e4 100644
--- a/net/asterisk10/files/patch-Makefile
+++ b/net/asterisk10/files/patch-Makefile
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- Makefile.orig
-+++ Makefile
+--- Makefile.orig Wed Jun 14 11:59:17 2006
++++ Makefile Wed Jun 14 13:54:57 2006
@@ -19,8 +19,8 @@
# CROSS_COMPILE=/opt/montavista/pro/devkit/arm/xscale_be/bin/xscale_be-
# CROSS_COMPILE_BIN=/opt/montavista/pro/devkit/arm/xscale_be/bin/
@@ -14,7 +11,7 @@ $FreeBSD$
# CROSS_ARCH=Linux
# CROSS_PROC=arm
# SUB_PROC=xscale # or maverick
-@@ -44,14 +44,14 @@
+@@ -46,14 +46,14 @@
#K6OPT = -DK6OPT
#Tell gcc to optimize the code
@@ -32,7 +29,7 @@ $FreeBSD$
#Set NOCRYPTO to yes if you do not want to have crypto support or
#dependencies
-@@ -83,7 +83,7 @@
+@@ -85,7 +85,7 @@
# Where to install asterisk after compiling
# Default -> leave empty
@@ -41,7 +38,7 @@ $FreeBSD$
# Staging directory
# Files are copied here temporarily during the install process
-@@ -106,17 +106,17 @@
+@@ -108,17 +108,17 @@
BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE
ifneq ($(OSARCH),SunOS)
@@ -68,7 +65,7 @@ $FreeBSD$
MODULES_DIR=$(ASTLIBDIR)/modules
AGI_DIR=$(ASTVARLIBDIR)/agi-bin
else
-@@ -218,25 +218,25 @@
+@@ -220,25 +220,25 @@
endif
INCLUDE+=-Iinclude -I../include
@@ -100,7 +97,7 @@ $FreeBSD$
else
ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),)
ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)/usr/include/osp
-@@ -245,27 +245,24 @@
+@@ -247,27 +247,24 @@
ifeq ($(OSARCH),FreeBSD)
BSDVERSION=$(shell make -V OSVERSION -f $(CROSS_COMPILE_TARGET)/usr/share/mk/bsd.port.subdir.mk)
@@ -142,7 +139,7 @@ $FreeBSD$
endif # FreeBSD
-@@ -281,7 +278,7 @@
+@@ -283,7 +280,7 @@
ifeq ($(OSARCH),SunOS)
ASTCFLAGS+=-Wcast-align -DSOLARIS
@@ -151,7 +148,7 @@ $FreeBSD$
endif
ifeq ($(findstring CYGWIN,$(OSARCH)),CYGWIN)
-@@ -296,7 +293,7 @@
+@@ -298,7 +295,7 @@
ifndef WITHOUT_ZAPTEL
@@ -160,7 +157,7 @@ $FreeBSD$
ASTCFLAGS+=-DZAPTEL_OPTIMIZATIONS
endif
-@@ -388,10 +385,10 @@
+@@ -390,10 +387,10 @@
endif
ifeq ($(OSARCH),SunOS)
@@ -173,7 +170,7 @@ $FreeBSD$
endif
ifeq ($(MAKETOPLEVEL),$(MAKELEVEL))
-@@ -399,7 +396,7 @@
+@@ -401,7 +398,7 @@
endif
# This is used when generating the doxygen documentation
@@ -182,7 +179,7 @@ $FreeBSD$
HAVEDOT=yes
else
HAVEDOT=no
-@@ -418,7 +415,7 @@
+@@ -420,7 +417,7 @@
@echo " + $(MAKE) install +"
@echo " +-------------------------------------------+"
@@ -191,8 +188,8 @@ $FreeBSD$
#ifneq ($(wildcard tags),)
ctags: tags
-@@ -437,13 +434,13 @@
- cd editline && unset CFLAGS LIBS && test -f config.h || ./configure
+@@ -439,13 +436,13 @@
+ cd editline && unset CFLAGS LIBS && test -f config.h || CFLAGS="$(OPTIMIZE)" ./configure
$(MAKE) -C editline libedit.a
-db1-ast/libdb1.a: FORCE
@@ -212,7 +209,7 @@ $FreeBSD$
ifneq ($(wildcard .depend),)
include .depend
-@@ -470,10 +467,10 @@
+@@ -469,10 +466,10 @@
manpage: asterisk.8
@@ -227,7 +224,7 @@ $FreeBSD$
asterisk.pdf: asterisk.sgml
docbook2pdf asterisk.sgml
-@@ -510,14 +507,14 @@
+@@ -512,14 +509,14 @@
cygwin_a:
$(MAKE) -C cygwin all
@@ -244,7 +241,7 @@ $FreeBSD$
muted: muted.o
$(CC) $(AUDIO_LIBS) -o muted muted.o
-@@ -539,38 +536,38 @@
+@@ -541,38 +538,38 @@
datafiles: all
if [ x`$(ID) -un` = xroot ]; then sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
@@ -292,7 +289,7 @@ $FreeBSD$
else \
echo "No description for $$x"; \
exit 1; \
-@@ -578,18 +575,18 @@
+@@ -580,18 +577,18 @@
done
for x in sounds/demo-* sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-* sounds/queue-* sounds/spy-* sounds/priv-* sounds/screen-* sounds/hello-*; do \
if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
@@ -316,7 +313,7 @@ $FreeBSD$
update:
@if [ -d .svn ]; then \
-@@ -618,73 +615,51 @@
+@@ -620,47 +617,47 @@
OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
bininstall: all
@@ -357,7 +354,6 @@ $FreeBSD$
cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\
chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
fi
- for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done
- $(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)
- $(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
+ $(MKDIR) $(DESTDIR)$(ASTHEADERDIR)
@@ -397,7 +393,15 @@ $FreeBSD$
else \
echo "You need to do cvs update -d not just cvs update" ; \
fi
-- if [ -f mpg123-0.59r/mpg123 ]; then $(MAKE) -C mpg123-0.59r install; fi
+@@ -690,46 +687,28 @@
+ echo " WARNING WARNING WARNING" ;\
+ fi
+
+-install: all datafiles bininstall install-subdirs
++install: all datafiles bininstall install-subdirs samples
+ @if [ -x /usr/sbin/asterisk-post-install ]; then \
+ /usr/sbin/asterisk-post-install $(DESTDIR) . ; \
+ fi
- @echo " +---- Asterisk Installation Complete -------+"
- @echo " + +"
- @echo " + YOU MUST READ THE SECURITY DOCUMENT +"
@@ -421,17 +425,6 @@ $FreeBSD$
- @echo " +-------------------------------------------+"
@$(MAKE) -s oldmodcheck
- NEWMODS=$(notdir $(wildcard */*.so))
-@@ -710,7 +685,7 @@
- echo " WARNING WARNING WARNING" ;\
- fi
-
--install: all datafiles bininstall
-+install: all datafiles bininstall samples
- @if [ -x /usr/sbin/asterisk-post-install ]; then \
- /usr/sbin/asterisk-post-install $(DESTDIR) . ; \
- fi
-@@ -718,16 +693,19 @@
upgrade: all bininstall
adsi:
@@ -454,7 +447,7 @@ $FreeBSD$
if [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \
if [ "$(OVERWRITE)" = "y" ]; then \
if cmp -s $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $$x ; then \
-@@ -740,7 +718,7 @@
+@@ -742,7 +721,7 @@
continue; \
fi ;\
fi ; \
@@ -463,7 +456,7 @@ $FreeBSD$
done
if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \
( \
-@@ -800,25 +778,25 @@
+@@ -802,25 +781,25 @@
echo "; Default: strict"; \
echo ";"; \
echo ";translation_algorithm = strict"; \
@@ -495,16 +488,19 @@ $FreeBSD$
:> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm
for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \
cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm ; \
-@@ -832,7 +810,7 @@
+@@ -834,9 +813,9 @@
@[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 )
@[ -d $(DESTDIR)$(HTTP_CGIDIR) ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 )
$(INSTALL) -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi
- mkdir -p $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk
+ $(MKDIR) $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk
for x in images/*.gif; do \
- $(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \
+- $(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \
++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \
done
-@@ -861,10 +839,10 @@
+ @echo " +--------- Asterisk Web Voicemail ----------+"
+ @echo " + +"
+@@ -863,10 +842,10 @@
__rpm: include/asterisk/version.h spec
rm -rf /tmp/asterisk ; \
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-04 05:27:40 +0000