Attachment #112575 for bug #154002

View | Details | Raw Unified | Return to bug 154002
Collapse All | Expand All

Lines 6-13 Link Here

(-)/usr/ports/net/asterisk/Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= asterisk	8	PORTNAME= asterisk
9	PORTVERSION= 1.8.1.1	9	PORTVERSION= 1.8.2
10	PORTREVISION= 1	10	PORTREVISION= 0
11	CATEGORIES= net	11	CATEGORIES= net
12	MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \	12	MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \
13	http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/	13	http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/

Lines 1-2 Link Here

(-)/usr/ports/net/asterisk/distinfo (-2 / +2 lines)
1	SHA256 (asterisk-1.8.1.1.tar.gz) = 71016372d81dd6c0b2977b8994aa626afa8aa71a2379005fc8fe30625ceedafa	1	SHA256 (asterisk-1.8.2.tar.gz) = 864a66bd2c6bed2799d5e42f3b71ad4ce13715aa615bf1a50fb7fb6233f4d42e
2	SIZE (asterisk-1.8.1.1.tar.gz) = 26198619	2	SIZE (asterisk-1.8.2.tar.gz) = 26237515




--- Makefile.orig	2010-12-08 03:51:05.000000000 +0500
+++ Makefile	2011-01-15 04:05:06.000000000 +0500
@@ -122,7 +122,7 @@
 OVERWRITE=y
 

 
 ifeq ($(PROC),ppc)
   _ASTCFLAGS+=-fsigned-char
@@ -235,7 +237,7 @@
     _ASTCFLAGS+=-march=i686
   endif
   # -V is understood by BSD Make, not by GNU make.
-  BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
+  BSDVERSION=$(OSVERSION)
   _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
 endif
 
@@ -463,13 +465,17 @@
 	done
 	$(INSTALL) -m 644 doc/core-en_US.xml $(DESTDIR)$(ASTDATADIR)/static-http;
 	if [ -d doc/tex/asterisk ] ; then \

 	done
 	$(MAKE) -C sounds install
 
@@ -529,6 +535,7 @@
 	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/dictate"
 	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/meetme"
 	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/monitor"

 	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/system"
 	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/tmp"
 	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail"
@@ -550,6 +557,7 @@
 	$(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/static-http"
 	$(INSTALL) -d "$(DESTDIR)$(ASTMANDIR)/man8"
 	$(INSTALL) -d "$(DESTDIR)$(AGI_DIR)"

 
 bininstall: _all installdirs $(SUBDIRS_INSTALL)
 	$(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/
@@ -609,7 +617,7 @@
 	@exit 1
 endif
 

 	@if [ -x /usr/sbin/asterisk-post-install ]; then \
 		/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
 	fi
@@ -651,29 +659,18 @@
 		else \
 			echo "Installing $$x" ; \
 		fi ; \

-				echo "Skipping config file $$x"; \
-				continue; \
-			fi ;\
+		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`-dist ; \
+		if [ ! -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \
+			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`; \
 		fi ; \
-		echo "Installing file $$x"; \
-		$(INSTALL) -m 644 $$x $${dst} ;\

Return to bug 154002

Lines 1-5 Link Here

(-)/usr/ports/net/asterisk/files/patch-Makefile (-12 / +12 lines)
1	--- Makefile.orig 2010-12-28 10:32:35.000000000 +0100	1	--- Makefile.orig 2010-12-08 03:51:05.000000000 +0500
2	+++ Makefile 2010-12-28 10:33:10.000000000 +0100	2	+++ Makefile 2011-01-15 04:05:06.000000000 +0500
3	@@ -122,7 +122,7 @@	3	@@ -122,7 +122,7 @@
4	OVERWRITE=y	4	OVERWRITE=y
5		5
Lines 23-38 Link Here
23		23
24	ifeq ($(PROC),ppc)	24	ifeq ($(PROC),ppc)
25	_ASTCFLAGS+=-fsigned-char	25	_ASTCFLAGS+=-fsigned-char
26	@@ -232,7 +234,7 @@	26	@@ -235,7 +237,7 @@
27		27	_ASTCFLAGS+=-march=i686
28	ifeq ($(OSARCH),FreeBSD)	28	endif
29	# -V is understood by BSD Make, not by GNU make.	29	# -V is understood by BSD Make, not by GNU make.
30	- BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)	30	- BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
31	+ BSDVERSION=$(OSVERSION)	31	+ BSDVERSION=$(OSVERSION)
32	_ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)	32	_ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
33	endif	33	endif
34		34
35	@@ -460,13 +462,17 @@	35	@@ -463,13 +465,17 @@
36	done	36	done
37	$(INSTALL) -m 644 doc/core-en_US.xml $(DESTDIR)$(ASTDATADIR)/static-http;	37	$(INSTALL) -m 644 doc/core-en_US.xml $(DESTDIR)$(ASTDATADIR)/static-http;
38	if [ -d doc/tex/asterisk ] ; then \	38	if [ -d doc/tex/asterisk ] ; then \
Lines 53-59 Link Here
53	done	53	done
54	$(MAKE) -C sounds install	54	$(MAKE) -C sounds install
55		55
56	@@ -526,6 +532,7 @@	56	@@ -529,6 +535,7 @@
57	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/dictate"	57	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/dictate"
58	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/meetme"	58	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/meetme"
59	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/monitor"	59	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/monitor"
Lines 61-67 Link Here
61	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/system"	61	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/system"
62	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/tmp"	62	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/tmp"
63	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail"	63	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail"
64	@@ -547,6 +554,7 @@	64	@@ -550,6 +557,7 @@
65	$(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/static-http"	65	$(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/static-http"
66	$(INSTALL) -d "$(DESTDIR)$(ASTMANDIR)/man8"	66	$(INSTALL) -d "$(DESTDIR)$(ASTMANDIR)/man8"
67	$(INSTALL) -d "$(DESTDIR)$(AGI_DIR)"	67	$(INSTALL) -d "$(DESTDIR)$(AGI_DIR)"
Lines 69-75 Link Here
69		69
70	bininstall: _all installdirs $(SUBDIRS_INSTALL)	70	bininstall: _all installdirs $(SUBDIRS_INSTALL)
71	$(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/	71	$(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/
72	@@ -606,7 +614,7 @@	72	@@ -609,7 +617,7 @@
73	@exit 1	73	@exit 1
74	endif	74	endif
75		75
Lines 78-84 Link Here
78	@if [ -x /usr/sbin/asterisk-post-install ]; then \	78	@if [ -x /usr/sbin/asterisk-post-install ]; then \
79	/usr/sbin/asterisk-post-install $(DESTDIR) . ; \	79	/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
80	fi	80	fi
81	@@ -648,29 +656,18 @@	81	@@ -651,29 +659,18 @@
82	else \	82	else \
83	echo "Installing $$x" ; \	83	echo "Installing $$x" ; \
84	fi ; \	84	fi ; \
Lines 101-109 Link Here
101	- echo "Skipping config file $$x"; \	101	- echo "Skipping config file $$x"; \
102	- continue; \	102	- continue; \
103	- fi ;\	103	- fi ;\
104	+ $(INSTALL) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`-dist ; \	104	+ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`-dist ; \
105	+ if [ ! -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \	105	+ if [ ! -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \
106	+ $(INSTALL) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`; \	106	+ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`; \
107	fi ; \	107	fi ; \
108	- echo "Installing file $$x"; \	108	- echo "Installing file $$x"; \
109	- $(INSTALL) -m 644 $$x $${dst} ;\	109	- $(INSTALL) -m 644 $$x $${dst} ;\