ports/131961: fix pkg-plist and fine tune Makefil

Sun Feb 22 15:50:04 UTC 2009

The following reply was made to PR ports/131961; it has been noted by GNATS.

From: "Eric L. Chen" <d9364104 at mail.nchu.edu.tw>
To: FreeBSD-gnats-submit at FreeBSD.org, freebsd-ports-bugs at FreeBSD.org
Cc:  
Subject: Re: ports/131961: fix pkg-plist and fine tune Makefil
Date: Sun, 22 Feb 2009 23:40:11 +0800

 --=-YIBQpSAAtncUzrsbAMT+
 Content-Type: text/plain
 Content-Transfer-Encoding: 7bit

 On Sun, 2009-02-22 at 04:10 +0000, FreeBSD-gnats-submit at FreeBSD.org
 wrote:
 > Thank you very much for your problem report.
 > It has the internal identification `ports/131961'.
 > The individual assigned to look at your
 > report is: freebsd-ports-bugs. 
 > 
 > You can access the state of your problem report at any time
 > via this link:
 > 
 > http://www.freebsd.org/cgi/query-pr.cgi?pr=131961
 > 
 > >Category:       ports
 > >Responsible:    freebsd-ports-bugs
 > >Synopsis:       fix pkg-plist and fine tune Makefil
 > >Arrival-Date:   Sun Feb 22 04:10:01 UTC 2009
 New patch to satisfy shared library's policies.
 diff -purN devel/ptlib/Makefile devel/ptlib/Makefile
 --- devel/ptlib/Makefile	2009-02-22 03:01:07.000000000 +0800
 +++ devel/ptlib/Makefile	2009-02-22 11:48:49.000000000 +0800
 @@ -17,12 +17,10 @@ COMMENT=	A cross platform C++ library, u

  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
 diff -purN devel/ptlib/files/patch-Makefile.in
 devel/ptlib/files/patch-Makefile.in
 --- devel/ptlib/files/patch-Makefile.in	2009-02-22 03:01:07.000000000
 +0800
 +++ devel/ptlib/files/patch-Makefile.in	2009-02-22 21:27:30.000000000
 +0800
 @@ -1,6 +1,20 @@
 ---- Makefile.in.orig	2009-01-11 17:53:18.000000000 -0500
 -+++ Makefile.in	2009-01-26 15:09:22.000000000 -0500
 -@@ -120,9 +120,9 @@
 +--- Makefile.in.orig	2009-01-12 06:53:18.000000000 +0800
 ++++ Makefile.in	2009-02-22 21:15:46.000000000 +0800
 +@@ -85,11 +85,11 @@ install:
 +                      $(DESTDIR)$(PREFIX)/share/ptlib/make ; \
 + 		do mkdir -p $$dir ; chmod 755 $$dir ; \
 + 	done )
 +-	$(INSTALL) -m 444
 $(PT_LIBDIR)/$(PTLIB_FILE). at MAJOR_VERSION@. at MINOR_VERSION@@BUILD_TYPE@@BUILD_NUMBER@ $(DESTDIR)$(LIBDIR)
 ++	$(INSTALL) -m 444
 $(PT_LIBDIR)/$(PTLIB_FILE). at MAJOR_VERSION@. at MINOR_VERSION@@BUILD_TYPE@@BUILD_NUMBER@ $(DESTDIR)$(LIBDIR)/$(PTLIB_FILE). at MAJOR_VERSION@
 + 	$(INSTALL) -m 444 $(PT_LIBDIR)/lib$(PTLIB_BASE)_s.a
 $(DESTDIR)$(LIBDIR)
 + 	(cd $(DESTDIR)$(LIBDIR) ; \
 + 		rm -f  $(PTLIB_FILE) ; \
 +-		ln -sf
 $(PTLIB_FILE). at MAJOR_VERSION@. at MINOR_VERSION@@BUILD_TYPE@@BUILD_NUMBER@
 $(PTLIB_FILE) \
 ++		ln -sf $(PTLIB_FILE). at MAJOR_VERSION@ $(PTLIB_FILE) \
 + 	)
 + ifeq (1, $(HAS_PLUGINS))
 + 	if test -e $(PT_LIBDIR)/device/; then \
 +@@ -120,9 +120,9 @@ endif
   	$(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,7 +130,7 @@ uninstall:
   	       $(DESTDIR)$(PREFIX)/include/ptbuildopts.h \
   	       $(DESTDIR)$(PREFIX)/share/ptlib \
   	       $(DESTDIR)$(LIBDIR)/$(DEV_PLUGIN_DIR) \
 diff -purN devel/ptlib/pkg-plist devel/ptlib/pkg-plist
 --- devel/ptlib/pkg-plist	2009-02-22 03:01:07.000000000 +0800
 +++ devel/ptlib/pkg-plist	2009-02-22 21:27:36.000000000 +0800
 @@ -171,8 +171,7 @@ 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/libpt.so.2
 +lib/libpt.so
  lib/libpt_s.a
  libdata/pkgconfig/ptlib.pc

 --=-YIBQpSAAtncUzrsbAMT+
 Content-Disposition: attachment; filename="ptlib.diff"
 Content-Type: text/x-patch; name="ptlib.diff"; charset="UTF-8"
 Content-Transfer-Encoding: 7bit

 diff -purN devel/ptlib/Makefile devel/ptlib/Makefile
 --- devel/ptlib/Makefile	2009-02-22 03:01:07.000000000 +0800
 +++ devel/ptlib/Makefile	2009-02-22 11:48:49.000000000 +0800
 @@ -17,12 +17,10 @@ COMMENT=	A cross platform C++ library, u

  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
 diff -purN devel/ptlib/files/patch-Makefile.in devel/ptlib/files/patch-Makefile.in
 --- devel/ptlib/files/patch-Makefile.in	2009-02-22 03:01:07.000000000 +0800
 +++ devel/ptlib/files/patch-Makefile.in	2009-02-22 21:27:30.000000000 +0800
 @@ -1,6 +1,20 @@
 ---- Makefile.in.orig	2009-01-11 17:53:18.000000000 -0500
 -+++ Makefile.in	2009-01-26 15:09:22.000000000 -0500
 -@@ -120,9 +120,9 @@
 +--- Makefile.in.orig	2009-01-12 06:53:18.000000000 +0800
 ++++ Makefile.in	2009-02-22 21:15:46.000000000 +0800
 +@@ -85,11 +85,11 @@ install:
 +                      $(DESTDIR)$(PREFIX)/share/ptlib/make ; \
 + 		do mkdir -p $$dir ; chmod 755 $$dir ; \
 + 	done )
 +-	$(INSTALL) -m 444 $(PT_LIBDIR)/$(PTLIB_FILE). at MAJOR_VERSION@. at MINOR_VERSION@@BUILD_TYPE@@BUILD_NUMBER@ $(DESTDIR)$(LIBDIR)
 ++	$(INSTALL) -m 444 $(PT_LIBDIR)/$(PTLIB_FILE). at MAJOR_VERSION@. at MINOR_VERSION@@BUILD_TYPE@@BUILD_NUMBER@ $(DESTDIR)$(LIBDIR)/$(PTLIB_FILE). at MAJOR_VERSION@
 + 	$(INSTALL) -m 444 $(PT_LIBDIR)/lib$(PTLIB_BASE)_s.a $(DESTDIR)$(LIBDIR)
 + 	(cd $(DESTDIR)$(LIBDIR) ; \
 + 		rm -f  $(PTLIB_FILE) ; \
 +-		ln -sf $(PTLIB_FILE). at MAJOR_VERSION@. at MINOR_VERSION@@BUILD_TYPE@@BUILD_NUMBER@ $(PTLIB_FILE) \
 ++		ln -sf $(PTLIB_FILE). at MAJOR_VERSION@ $(PTLIB_FILE) \
 + 	)
 + ifeq (1, $(HAS_PLUGINS))
 + 	if test -e $(PT_LIBDIR)/device/; then \
 +@@ -120,9 +120,9 @@ endif
   	$(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,7 +130,7 @@ uninstall:
   	       $(DESTDIR)$(PREFIX)/include/ptbuildopts.h \
   	       $(DESTDIR)$(PREFIX)/share/ptlib \
   	       $(DESTDIR)$(LIBDIR)/$(DEV_PLUGIN_DIR) \
 diff -purN devel/ptlib/pkg-plist devel/ptlib/pkg-plist
 --- devel/ptlib/pkg-plist	2009-02-22 03:01:07.000000000 +0800
 +++ devel/ptlib/pkg-plist	2009-02-22 21:27:36.000000000 +0800
 @@ -171,8 +171,7 @@ 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/libpt.so.2
 +lib/libpt.so
  lib/libpt_s.a
  libdata/pkgconfig/ptlib.pc

 --=-YIBQpSAAtncUzrsbAMT+--