Attachment #99602 for bug #138713

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

Lines 7-12 Link Here

(-)ptlib26/Makefile (+1 lines)
7		7
8	PORTNAME= ptlib	8	PORTNAME= ptlib
9	PORTVERSION= 2.6.4	9	PORTVERSION= 2.6.4
		10	PORTREVISION= 1
10	CATEGORIES= devel	11	CATEGORIES= devel
11	MASTER_SITES= ${MASTER_SITE_GNOME}	12	MASTER_SITES= ${MASTER_SITE_GNOME}
12	MASTER_SITE_SUBDIR= sources/ptlib/2.6	13	MASTER_SITE_SUBDIR= sources/ptlib/2.6




--- Makefile.in.orig	2009-07-05 09:52:57.000000000 +0400
+++ Makefile.in	2009-09-11 00:40:45.000000000 +0400
@@ -89,7 +89,8 @@
                      $(DESTDIR)$(PREFIX)/share/ptlib/make ; \
 		do mkdir -p $$dir ; chmod 755 $$dir ; \
 	done )
-	$(INSTALL) -m 444 $(PT_LIBDIR)/$(PTLIB_FILE).@MAJOR_VERSION@.@MINOR_VERSION@@BUILD_TYPE@@BUILD_NUMBER@ $(DESTDIR)$(LIBDIR)
+	$(INSTALL) -m 444 $(PT_LIBDIR)/$(PTLIB_FILE).@MAJOR_VERSION@ $(DESTDIR)$(LIBDIR)
 	$(INSTALL) -m 444 $(PT_LIBDIR)/lib$(PTLIB_BASE)_s.a $(DESTDIR)$(LIBDIR)
 	(cd $(DESTDIR)$(LIBDIR) ; \
 		rm -f  $(PTLIB_FILE) ; \
-		ln -sf $(PTLIB_FILE).@MAJOR_VERSION@.@MINOR_VERSION@@BUILD_TYPE@@BUILD_NUMBER@ $(PTLIB_FILE) \
+		ln -sf $(PTLIB_FILE).@MAJOR_VERSION@ $(PTLIB_FILE) ; \
+		ln -sf $(PTLIB_FILE).@MAJOR_VERSION@.@MINOR_VERSION@@BUILD_TYPE@@BUILD_NUMBER@ $(PTLIB_FILE).@MAJOR_VERSION@ \
 	)
 ifeq (1, $(HAS_PLUGINS))
 	if test -e $(PT_LIBDIR)/device/; then \
@@ -120,9 +121,9 @@
 	$(INSTALL) -m 755 make/ptlib-config $(DESTDIR)$(PREFIX)/share/ptlib/make/
 	(cd $(DESTDIR)$(PREFIX)/bin; rm -f ptlib-config ; ln -snf ../share/ptlib/make/ptlib-config ptlib-config)
 

 uninstall:
 	rm -rf $(DESTDIR)$(PREFIX)/include/ptlib \
 	       $(DESTDIR)$(PREFIX)/include/ptclib \
@@ -130,7 +131,7 @@
 	       $(DESTDIR)$(PREFIX)/include/ptbuildopts.h \
 	       $(DESTDIR)$(PREFIX)/share/ptlib \
 	       $(DESTDIR)$(LIBDIR)/$(DEV_PLUGIN_DIR) \

+	       $(DESTDIR)$(PREFIX)/libdata/pkgconfig/ptlib.pc
 	rm -f $(DESTDIR)$(LIBDIR)/lib$(PTLIB_BASE)_s.a \
 	      $(DESTDIR)$(LIBDIR)/$(PTLIB_FILE) \
 	      $(DESTDIR)$(LIBDIR)/$(PTLIB_FILE).@MAJOR_VERSION@.@MINOR_VERSION@@BUILD_TYPE@@BUILD_NUMBER@
+	      $(DESTDIR)$(LIBDIR)/$(PTLIB_FILE).@MAJOR_VERSION@
 
 # End of Makefile.in

Lines 158-163 Link Here

(-)ptlib26/pkg-plist (+1 lines)
158	include/ptlib/videoio1394dc.h	158	include/ptlib/videoio1394dc.h
159	lib/libpt.so	159	lib/libpt.so
160	lib/libpt.so.2	160	lib/libpt.so.2
		161	lib/libpt.so.2.6.4
161	lib/libpt_s.a	162	lib/libpt_s.a
162	lib/ptlib-2.6.4/devices/sound/oss_pwplugin.so	163	lib/ptlib-2.6.4/devices/sound/oss_pwplugin.so
163	%%BSDVIDEO%%lib/ptlib-2.6.4/devices/videoinput/bsdvideo_pwplugin.so	164	%%BSDVIDEO%%lib/ptlib-2.6.4/devices/videoinput/bsdvideo_pwplugin.so

Return to bug 138713

Lines 1-20 Link Here

(-)ptlib26/files/patch-Makefile.in (-15 / +8 lines)
1	--- Makefile.in.orig 2009-01-12 06:53:18.000000000 +0800	1	--- Makefile.in.orig 2009-07-05 09:52:57.000000000 +0400
2	+++ Makefile.in 2009-02-23 10:03:52.000000000 +0800	2	+++ Makefile.in 2009-09-11 00:40:45.000000000 +0400
3	@@ -85,11 +85,11 @@	3	@@ -89,7 +89,8 @@
4	$(DESTDIR)$(PREFIX)/share/ptlib/make ; \
5	do mkdir -p $$dir ; chmod 755 $$dir ; \
6	done )
7	- $(INSTALL) -m 444 $(PT_LIBDIR)/$(PTLIB_FILE).@MAJOR_VERSION@.@MINOR_VERSION@@BUILD_TYPE@@BUILD_NUMBER@ $(DESTDIR)$(LIBDIR)
8	+ $(INSTALL) -m 444 $(PT_LIBDIR)/$(PTLIB_FILE).@MAJOR_VERSION@ $(DESTDIR)$(LIBDIR)
9	$(INSTALL) -m 444 $(PT_LIBDIR)/lib$(PTLIB_BASE)_s.a $(DESTDIR)$(LIBDIR)	4	$(INSTALL) -m 444 $(PT_LIBDIR)/lib$(PTLIB_BASE)_s.a $(DESTDIR)$(LIBDIR)
10	(cd $(DESTDIR)$(LIBDIR) ; \	5	(cd $(DESTDIR)$(LIBDIR) ; \
11	rm -f $(PTLIB_FILE) ; \	6	rm -f $(PTLIB_FILE) ; \
12	- ln -sf $(PTLIB_FILE).@MAJOR_VERSION@.@MINOR_VERSION@@BUILD_TYPE@@BUILD_NUMBER@ $(PTLIB_FILE) \	7	- ln -sf $(PTLIB_FILE).@MAJOR_VERSION@.@MINOR_VERSION@@BUILD_TYPE@@BUILD_NUMBER@ $(PTLIB_FILE) \
13	+ ln -sf $(PTLIB_FILE).@MAJOR_VERSION@ $(PTLIB_FILE) \	8	+ ln -sf $(PTLIB_FILE).@MAJOR_VERSION@ $(PTLIB_FILE) ; \
		9	+ ln -sf $(PTLIB_FILE).@MAJOR_VERSION@.@MINOR_VERSION@@BUILD_TYPE@@BUILD_NUMBER@ $(PTLIB_FILE).@MAJOR_VERSION@ \
14	)	10	)
15	ifeq (1, $(HAS_PLUGINS))	11	ifeq (1, $(HAS_PLUGINS))
16	if test -e $(PT_LIBDIR)/device/; then \	12	if test -e $(PT_LIBDIR)/device/; then \
17	@@ -120,9 +120,9 @@	13	@@ -120,9 +121,9 @@
18	$(INSTALL) -m 755 make/ptlib-config $(DESTDIR)$(PREFIX)/share/ptlib/make/	14	$(INSTALL) -m 755 make/ptlib-config $(DESTDIR)$(PREFIX)/share/ptlib/make/
19	(cd $(DESTDIR)$(PREFIX)/bin; rm -f ptlib-config ; ln -snf ../share/ptlib/make/ptlib-config ptlib-config)	15	(cd $(DESTDIR)$(PREFIX)/bin; rm -f ptlib-config ; ln -snf ../share/ptlib/make/ptlib-config ptlib-config)
20		16
Lines 27-33 Link Here
27	uninstall:	23	uninstall:
28	rm -rf $(DESTDIR)$(PREFIX)/include/ptlib \	24	rm -rf $(DESTDIR)$(PREFIX)/include/ptlib \
29	$(DESTDIR)$(PREFIX)/include/ptclib \	25	$(DESTDIR)$(PREFIX)/include/ptclib \
30	@@ -130,9 +130,9 @@	26	@@ -130,7 +131,7 @@
31	$(DESTDIR)$(PREFIX)/include/ptbuildopts.h \	27	$(DESTDIR)$(PREFIX)/include/ptbuildopts.h \
32	$(DESTDIR)$(PREFIX)/share/ptlib \	28	$(DESTDIR)$(PREFIX)/share/ptlib \
33	$(DESTDIR)$(LIBDIR)/$(DEV_PLUGIN_DIR) \	29	$(DESTDIR)$(LIBDIR)/$(DEV_PLUGIN_DIR) \
Lines 35-41 Link Here
35	+ $(DESTDIR)$(PREFIX)/libdata/pkgconfig/ptlib.pc	31	+ $(DESTDIR)$(PREFIX)/libdata/pkgconfig/ptlib.pc
36	rm -f $(DESTDIR)$(LIBDIR)/lib$(PTLIB_BASE)_s.a \	32	rm -f $(DESTDIR)$(LIBDIR)/lib$(PTLIB_BASE)_s.a \
37	$(DESTDIR)$(LIBDIR)/$(PTLIB_FILE) \	33	$(DESTDIR)$(LIBDIR)/$(PTLIB_FILE) \
38	- $(DESTDIR)$(LIBDIR)/$(PTLIB_FILE).@MAJOR_VERSION@.@MINOR_VERSION@@BUILD_TYPE@@BUILD_NUMBER@	34	$(DESTDIR)$(LIBDIR)/$(PTLIB_FILE).@MAJOR_VERSION@.@MINOR_VERSION@@BUILD_TYPE@@BUILD_NUMBER@
39	+ $(DESTDIR)$(LIBDIR)/$(PTLIB_FILE).@MAJOR_VERSION@
40
41	# End of Makefile.in