131961 – devel/ptlib: fix pkg-plist and fine tune Makefile

FreeBSD Bugzilla – Bug 131961 devel/ptlib: fix pkg-plist and fine tune Makefile Last modified: 2009-02-23 06:30:05 UTC

Home
| New
| Browse
| Search
|

[?]
| Reports
| Help
| New Account
| Log In
Remember [x]
| Forgot Password
Login: [x]

Bug 131961 - devel/ptlib: fix pkg-plist and fine tune Makefile

Summary: devel/ptlib: fix pkg-plist and fine tune Makefile

Status:	Closed FIXED

Alias:	None

Product:	Ports & Packages
Classification:	Unclassified
Component:	Individual Port(s) (show other bugs)
Version:	Latest
Hardware:	Any Any

Importance:	Normal Affects Only Me
Assignee:	Beech Rintoul

URL:
Keywords:

Depends on:
Blocks:

Reported:	2009-02-22 04:10 UTC by Eric L. Chen
Modified:	2009-02-23 06:30 UTC (History)
CC List:	0 users

See Also:

Attachments
file.diff (842 bytes, patch) 2009-02-22 04:10 UTC, Eric L. Chen	no flags	Details \| Diff
ptlib.diff (2.64 KB, patch) 2009-02-22 15:40 UTC, Eric L. Chen	no flags	Details \| Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.

Description Eric L. Chen 2009-02-22 04:10:01 UTC

1) Fix pkg-plist
2) Remove conflict with pwlib-*, since they have different installed path.
3) Depends on pkgconfig not gnometarget, it uses pkgconfig actuallly.

Fix: Patch attached with submission follows:

Comment 1 Eric L. Chen 2009-02-22 15:40:11 UTC

On Sun, 2009-02-22 at 04:10 +0000, FreeBSD-gnats-submit@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).@MAJOR_VERSION@.@MINOR_VERSION@@BUILD_TYPE@@BUILD_NUMBER@ $(DESTDIR)$(LIBDIR)
++	$(INSTALL) -m 444
$(PT_LIBDIR)/$(PTLIB_FILE).@MAJOR_VERSION@.@MINOR_VERSION@@BUILD_TYPE@@BUILD_NUMBER@ $(DESTDIR)$(LIBDIR)/$(PTLIB_FILE).@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).@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 @@ 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

Comment 2 Beech Rintoul freebsd_committer

freebsd_committer

freebsd_triage

2009-02-22 21:22:52 UTC

Responsible Changed
From-To: freebsd-ports-bugs->beech

I'll take it

Comment 3 Beech Rintoul freebsd_committer

freebsd_committer

freebsd_triage

2009-02-22 21:36:58 UTC

Patch is mangled. Please post it somewhere or send directly.

Beech

-- 
---------------------------------------------------------------------------------------
Beech Rintoul - FreeBSD Developer - beech@FreeBSD.org
/"\   ASCII Ribbon Campaign  | FreeBSD Since 4.x
\ / - NO HTML/RTF in e-mail   | http://people.freebsd.org/~beech
 X  - NO Word docs in e-mail | Skype: akbeech
/ \  - http://www.FreeBSD.org/releases/7.1R/announce.html
---------------------------------------------------------------------------------------

Comment 4 Eric L. Chen 2009-02-23 02:39:28 UTC

On Sun, 2009-02-22 at 12:36 -0900, Beech Rintoul wrote:
> Patch is mangled. Please post it somewhere or send directly.
> 
> Beech
> 
Sorry, patch is here:
diff -purN devel/ptlib.orig/Makefile devel/ptlib/Makefile
--- devel/ptlib.orig/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.orig/files/patch-Makefile.in
devel/ptlib/files/patch-Makefile.in
--- devel/ptlib.orig/files/patch-Makefile.in	2009-02-22
03:01:07.000000000 +0800
+++ devel/ptlib/files/patch-Makefile.in	2009-02-23 10:04:07.000000000
+0800
@@ -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 -purN devel/ptlib.orig/files/patch-make_lib.mak
devel/ptlib/files/patch-make_lib.mak
--- devel/ptlib.orig/files/patch-make_lib.mak	1970-01-01
08:00:00.000000000 +0800
+++ devel/ptlib/files/patch-make_lib.mak	2009-02-23 10:18:53.000000000
+0800
@@ -0,0 +1,14 @@
+--- 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 -purN devel/ptlib.orig/pkg-plist devel/ptlib/pkg-plist
--- devel/ptlib.orig/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

Comment 5 dfilter service freebsd_committer

freebsd_committer

freebsd_triage

2009-02-23 06:20:47 UTC

beech       2009-02-23 06:20:35 UTC

  FreeBSD ports repository

  Modified files:
    devel/ptlib          Makefile pkg-plist 
    devel/ptlib/files    patch-Makefile.in 
  Log:
  - 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)
  
  Revision  Changes    Path
  1.2       +2 -3      ports/devel/ptlib/Makefile
  1.2       +21 -4     ports/devel/ptlib/files/patch-Makefile.in
  1.2       +8 -2      ports/devel/ptlib/pkg-plist
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"

Comment 6 dfilter service freebsd_committer

freebsd_committer

freebsd_triage

2009-02-23 06:23:05 UTC

beech       2009-02-23 06:22:49 UTC

  FreeBSD ports repository

  Added files:
    devel/ptlib/files    patch-make_lib.mak 
  Log:
  - Add files/patch-make_lib.mak
  
  PR:             ports/131961
  Submitted by:   Eric L. Chen <d9364104@mail.nchu.edu.tw> (maintainer)
  
  Revision  Changes    Path
  1.1       +14 -0     ports/devel/ptlib/files/patch-make_lib.mak (new)
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"

Comment 7 Beech Rintoul freebsd_committer

freebsd_committer

freebsd_triage

2009-02-23 06:27:08 UTC

State Changed
From-To: open->closed

Committed, Thanks!