- Fix pkg-plist

- Remove conflict with pwlib-*, since they have different installed path.
- Depends on pkgconfig not gnometarget, it uses pkgconfig actuallly.

PR:		ports/131961
Submitted by:	Eric L. Chen <d9364104@mail.nchu.edu.tw> (maintainer)

3 files changed, 31 insertions, 9 deletions

diff --git a/devel/ptlib26/Makefile b/devel/ptlib26/Makefile
index ae29967e8dfc..feeb4be96de2 100644
--- a/devel/ptlib26/Makefile
+++ b/devel/ptlib26/Makefile
@@ -17,12 +17,10 @@ COMMENT=	A cross platform C++ library, used by OpenH323
 
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
-CONFLICTS=	pwlib-*
-
 USE_BISON=	build
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnometarget
+USE_GNOME=	pkgconfig
 WANT_GNOME=	yes
 WANT_SDL=	yes
 USE_OPENSSL=	yes
@@ -42,6 +40,7 @@ CONFIGURE_ARGS+=	\
 		--with-expat-dir="${LOCALBASE}" \
 		--enable-oss \
 		--disable-odbc
+ALL_TARGET=	optshared
 
 # if explicitely asked for, depend upon it
 .if defined(WITH_SDL)
diff --git a/devel/ptlib26/files/patch-Makefile.in b/devel/ptlib26/files/patch-Makefile.in
index 9ae1fc01d3ec..cfd51e5ab9e7 100644
--- a/devel/ptlib26/files/patch-Makefile.in
+++ b/devel/ptlib26/files/patch-Makefile.in
@@ -1,5 +1,19 @@
---- Makefile.in.orig	2009-01-11 17:53:18.000000000 -0500
-+++ Makefile.in	2009-01-26 15:09:22.000000000 -0500
+--- 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)
+ 	$(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) \
+ 	)
+ ifeq (1, $(HAS_PLUGINS))
+ 	if test -e $(PT_LIBDIR)/device/; then \
 @@ -120,9 +120,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)
@@ -13,7 +27,7 @@
  uninstall:
  	rm -rf $(DESTDIR)$(PREFIX)/include/ptlib \
  	       $(DESTDIR)$(PREFIX)/include/ptclib \
-@@ -130,7 +130,7 @@
+@@ -130,9 +130,9 @@
  	       $(DESTDIR)$(PREFIX)/include/ptbuildopts.h \
  	       $(DESTDIR)$(PREFIX)/share/ptlib \
  	       $(DESTDIR)$(LIBDIR)/$(DEV_PLUGIN_DIR) \
@@ -21,4 +35,7 @@
 +	       $(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@.@MINOR_VERSION@@BUILD_TYPE@@BUILD_NUMBER@
++	      $(DESTDIR)$(LIBDIR)/$(PTLIB_FILE).@MAJOR_VERSION@
+ 
+ # End of Makefile.in
diff --git a/devel/ptlib26/pkg-plist b/devel/ptlib26/pkg-plist
index 3ff54b240aca..26372f97e601 100644
--- a/devel/ptlib26/pkg-plist
+++ b/devel/ptlib26/pkg-plist
@@ -161,6 +161,7 @@ include/ptlib/video.h
 include/ptlib/videoio.h
 include/ptlib/videoio1394dc.h
 @dirrm include/ptlib
+include/ptbuildopts.h
 include/ptlib.h
 share/ptlib/make/common.mak
 share/ptlib/make/lib.mak
@@ -171,8 +172,13 @@ share/ptlib/make/ptlib.mak
 share/ptlib/make/unix.mak
 @dirrm share/ptlib/make
 @dirrm share/ptlib
-lib/libpt.so.2.4.4
-lib/libpt.so.2.4
+lib/ptlib-2.4.4/devices/sound/oss_pwplugin.so
+@dirrm lib/ptlib-2.4.4/devices/sound
+lib/ptlib-2.4.4/devices/videoinput/bsdvideo_pwplugin.so
+@dirrm lib/ptlib-2.4.4/devices/videoinput
+@dirrm lib/ptlib-2.4.4/devices
+@dirrm lib/ptlib-2.4.4
 lib/libpt.so.2
+lib/libpt.so
 lib/libpt_s.a
 libdata/pkgconfig/ptlib.pc