diff options
| -rw-r--r-- | devel/ptlib26/Makefile | 2 | ||||
| -rw-r--r-- | devel/ptlib26/files/patch-Makefile.in | 20 | ||||
| -rw-r--r-- | devel/ptlib26/files/patch-make_lib.mak | 14 | ||||
| -rw-r--r-- | devel/ptlib26/pkg-plist | 3 |
4 files changed, 13 insertions, 26 deletions
diff --git a/devel/ptlib26/Makefile b/devel/ptlib26/Makefile index 69570ecc101e..e93ad5efc626 100644 --- a/devel/ptlib26/Makefile +++ b/devel/ptlib26/Makefile @@ -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 @@ -135,6 +136,7 @@ PLIST_SUB+= V4L="@comment " .endif post-patch: + @${REINPLACE_CMD} -e 's|-lpt|-lpt-${PORTVERSION:C/.[0-9]+$//g}|' ${WRKSRC}/ptlib.pc.in @${REINPLACE_CMD} -e 's|SDL11/|SDL/|' ${WRKSRC}/src/ptclib/vsdl.cxx \ ${WRKSRC}/include/ptclib/vsdl.h .if ${ARCH} == sparc64 && ${OSVERSION} <= 700003 diff --git a/devel/ptlib26/files/patch-Makefile.in b/devel/ptlib26/files/patch-Makefile.in index cfd51e5ab9e7..c1919dc1e954 100644 --- a/devel/ptlib26/files/patch-Makefile.in +++ b/devel/ptlib26/files/patch-Makefile.in @@ -1,20 +1,21 @@ ---- 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 @@ +--- Makefile.in.orig 2009-07-05 09:52:57.000000000 +0400 ++++ Makefile.in 2009-09-11 01:55:40.000000000 +0400 +@@ -85,11 +85,12 @@ $(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)/$(PTLIB_FILE).@MAJOR_VERSION@.@MINOR_VERSION@@BUILD_TYPE@@BUILD_NUMBER@ $(DESTDIR)$(LIBDIR)/lib$(PTLIB_BASE)-@MAJOR_VERSION@.@MINOR_VERSION@.so@BUILD_TYPE@@BUILD_NUMBER@ $(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 lib$(PTLIB_BASE)-@MAJOR_VERSION@.@MINOR_VERSION@.so@BUILD_TYPE@@BUILD_NUMBER@ $(PTLIB_FILE) ; \ ++ ln -sf lib$(PTLIB_BASE)-@MAJOR_VERSION@.@MINOR_VERSION@.so@BUILD_TYPE@@BUILD_NUMBER@ lib$(PTLIB_BASE)-@MAJOR_VERSION@.@MINOR_VERSION@.so \ ) 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 +28,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 +36,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@ diff --git a/devel/ptlib26/files/patch-make_lib.mak b/devel/ptlib26/files/patch-make_lib.mak deleted file mode 100644 index 4100edf647e7..000000000000 --- a/devel/ptlib26/files/patch-make_lib.mak +++ /dev/null @@ -1,14 +0,0 @@ ---- make/lib.mak.orig 2008-10-17 17:02:51.000000000 +0800 -+++ make/lib.mak 2009-02-23 10:18:32.000000000 +0800 -@@ -30,9 +30,9 @@ - - ifneq ($(OSTYPE),Darwin) - ifeq ($(BUILD_TYPE),.) -- LIBNAME_PAT = $(LIB_FILENAME).$(MAJOR_VERSION).$(MINOR_VERSION).$(BUILD_NUMBER) -+ LIBNAME_PAT = $(LIB_FILENAME).$(MAJOR_VERSION) - else -- LIBNAME_PAT = $(LIB_FILENAME).$(MAJOR_VERSION).$(MINOR_VERSION)-$(BUILD_TYPE)$(BUILD_NUMBER) -+ LIBNAME_PAT = $(LIB_FILENAME).$(MAJOR_VERSION) - endif - else - ifeq ($(BUILD_TYPE),.) diff --git a/devel/ptlib26/pkg-plist b/devel/ptlib26/pkg-plist index 7e6960a0b693..513f8ae763cc 100644 --- a/devel/ptlib26/pkg-plist +++ b/devel/ptlib26/pkg-plist @@ -156,8 +156,9 @@ include/ptlib/vconvert.h include/ptlib/video.h include/ptlib/videoio.h include/ptlib/videoio1394dc.h +lib/libpt-2.6.so +lib/libpt-2.6.so.4 lib/libpt.so -lib/libpt.so.2 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 |