Date: Thu, 10 Sep 2009 20:59:11 GMT From: "Alexander V. Chernikov" <melifaro@ipfw.ru> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/138713: [maintainer update] devel/ptlib26 fix Message-ID: <200909102059.n8AKxB0u029365@www.freebsd.org> Resent-Message-ID: <200909102100.n8AL04HB000369@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 138713
>Category: ports
>Synopsis: [maintainer update] devel/ptlib26 fix
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Sep 10 21:00:03 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Alexander V. Chernikov
>Release: FreeBSD 9.0-CURRENT
>Organization:
>Environment:
FreeBSD ws.ipfw.ru 9.0-CURRENT FreeBSD 9.0-CURRENT #0: Mon Sep 7 21:28:23 MSD 2009 root@ws.ipfw.ru:/var/ports_tmp/usj/obj/usr/src/sys/WS amd64
>Description:
Restore original linux library versioning scheme to be able to match >= 2.6.4 version
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ru ptlib26.orig/Makefile ptlib26/Makefile
--- ptlib26.orig/Makefile 2009-09-10 23:41:27.000000000 +0400
+++ ptlib26/Makefile 2009-09-11 00:54:57.000000000 +0400
@@ -7,6 +7,7 @@
PORTNAME= ptlib
PORTVERSION= 2.6.4
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/ptlib/2.6
diff -ru ptlib26.orig/files/patch-Makefile.in ptlib26/files/patch-Makefile.in
--- ptlib26.orig/files/patch-Makefile.in 2009-09-10 23:41:27.000000000 +0400
+++ ptlib26/files/patch-Makefile.in 2009-09-11 00:42:07.000000000 +0400
@@ -1,20 +1,16 @@
---- Makefile.in.orig 2009-01-12 06:53:18.000000000 +0800
-+++ Makefile.in 2009-02-23 10:03:52.000000000 +0800
-@@ -85,11 +85,11 @@
- $(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)
+--- 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 @@
$(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@ $(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 +120,9 @@
+@@ -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)
@@ -27,7 +23,7 @@
uninstall:
rm -rf $(DESTDIR)$(PREFIX)/include/ptlib \
$(DESTDIR)$(PREFIX)/include/ptclib \
-@@ -130,9 +130,9 @@
+@@ -130,7 +131,7 @@
$(DESTDIR)$(PREFIX)/include/ptbuildopts.h \
$(DESTDIR)$(PREFIX)/share/ptlib \
$(DESTDIR)$(LIBDIR)/$(DEV_PLUGIN_DIR) \
@@ -35,7 +31,4 @@
+ $(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
+ $(DESTDIR)$(LIBDIR)/$(PTLIB_FILE).@MAJOR_VERSION@.@MINOR_VERSION@@BUILD_TYPE@@BUILD_NUMBER@
Only in ptlib26.orig/files: patch-make_lib.mak
diff -ru ptlib26.orig/pkg-plist ptlib26/pkg-plist
--- ptlib26.orig/pkg-plist 2009-09-10 23:41:27.000000000 +0400
+++ ptlib26/pkg-plist 2009-09-11 00:50:20.000000000 +0400
@@ -158,6 +158,7 @@
include/ptlib/videoio1394dc.h
lib/libpt.so
lib/libpt.so.2
+lib/libpt.so.2.6.4
lib/libpt_s.a
lib/ptlib-2.6.4/devices/sound/oss_pwplugin.so
%%BSDVIDEO%%lib/ptlib-2.6.4/devices/videoinput/bsdvideo_pwplugin.so
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200909102059.n8AKxB0u029365>