pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/cfg+ make this use libtool rather than assuming ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/ad99c33d31bf
branches: trunk
changeset: 480344:ad99c33d31bf
user: danw <danw%pkgsrc.org@localhost>
date: Mon Sep 06 20:38:36 2004 +0000
description:
make this use libtool rather than assuming linux-like shlib build rules.
bump PKGREVISION for soname change
diffstat:
devel/cfg+/Makefile | 4 ++-
devel/cfg+/PLIST | 6 +++-
devel/cfg+/buildlink3.mk | 14 +----------
devel/cfg+/distinfo | 4 ++-
devel/cfg+/patches/patch-aa | 38 ++++++++++++++++++++++++++++++++++
devel/cfg+/patches/patch-ab | 50 +++++++++++++++++++++++++++++++++++++++++++++
6 files changed, 100 insertions(+), 16 deletions(-)
diffs (175 lines):
diff -r 543fbb0869fc -r ad99c33d31bf devel/cfg+/Makefile
--- a/devel/cfg+/Makefile Mon Sep 06 19:55:07 2004 +0000
+++ b/devel/cfg+/Makefile Mon Sep 06 20:38:36 2004 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/08/27 13:05:57 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2004/09/06 20:38:36 danw Exp $
#
DISTNAME= libcfg+-0.6.2
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://platon.sk/upload/_projects/00003/
@@ -12,6 +13,7 @@
USE_BUILDLINK3= yes
GNU_CONFIGURE= yes
USE_GNU_TOOLS+= make
+USE_LIBTOOL= yes
MANCOMPRESSED= yes
.include "../../mk/bsd.pkg.mk"
diff -r 543fbb0869fc -r ad99c33d31bf devel/cfg+/PLIST
--- a/devel/cfg+/PLIST Mon Sep 06 19:55:07 2004 +0000
+++ b/devel/cfg+/PLIST Mon Sep 06 20:38:36 2004 +0000
@@ -1,11 +1,13 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/08/27 13:05:58 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/09/06 20:38:36 danw Exp $
include/cfg+.h
include/cfg.h
include/platon/cfg+.h
include/platon/cfg.h
lib/libcfg+.a
+lib/libcfg+.la
lib/libcfg+.so
-lib/libcfg+.so.${PKGVERSION}
+lib/libcfg+.so.62
+lib/libcfg+.so.62.0
man/man3/cfg+.h.3
man/man3/cfg_add_property.3
man/man3/cfg_clear_context_flag.3
diff -r 543fbb0869fc -r ad99c33d31bf devel/cfg+/buildlink3.mk
--- a/devel/cfg+/buildlink3.mk Mon Sep 06 19:55:07 2004 +0000
+++ b/devel/cfg+/buildlink3.mk Mon Sep 06 20:38:36 2004 +0000
@@ -1,14 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/08/27 13:05:58 drochner Exp $
-# XXX
-# XXX This file was created automatically using createbuildlink-3.5.
-# XXX After this file has been verified as correct, the comment lines
-# XXX beginning with "XXX" should be removed. Please do not commit
-# XXX unverified buildlink3.mk files.
-# XXX
-# XXX Packages that only install static libraries or headers should
-# XXX include the following line:
-# XXX
-# XXX BUILDLINK_DEPMETHOD.libcfg?= build
+# $NetBSD: buildlink3.mk,v 1.2 2004/09/06 20:38:36 danw Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBCFG_BUILDLINK3_MK:= ${LIBCFG_BUILDLINK3_MK}+
@@ -21,7 +11,7 @@
BUILDLINK_PACKAGES+= libcfg
.if !empty(LIBCFG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libcfg+= libcfg+>=0.6.2
+BUILDLINK_DEPENDS.libcfg+= libcfg+>=0.6.2nb1
BUILDLINK_PKGSRCDIR.libcfg?= ../../devel/cfg+
.endif # LIBCFG_BUILDLINK3_MK
diff -r 543fbb0869fc -r ad99c33d31bf devel/cfg+/distinfo
--- a/devel/cfg+/distinfo Mon Sep 06 19:55:07 2004 +0000
+++ b/devel/cfg+/distinfo Mon Sep 06 20:38:36 2004 +0000
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/08/27 13:05:58 drochner Exp $
+$NetBSD: distinfo,v 1.2 2004/09/06 20:38:36 danw Exp $
SHA1 (libcfg+-0.6.2.tar.gz) = 856d647bb06e37d3c6e48d356a3e11796ebed35b
Size (libcfg+-0.6.2.tar.gz) = 169482 bytes
+SHA1 (patch-aa) = ba63ccc5c031a893b111caac1ba9ddf13c18b4fc
+SHA1 (patch-ab) = 5498fc24215d058feaed62be8a16d25be8a9961f
diff -r 543fbb0869fc -r ad99c33d31bf devel/cfg+/patches/patch-aa
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/cfg+/patches/patch-aa Mon Sep 06 20:38:36 2004 +0000
@@ -0,0 +1,38 @@
+$NetBSD: patch-aa,v 1.1 2004/09/06 20:38:36 danw Exp $
+
+--- Rules.make.in.orig Tue Feb 17 11:37:47 2004
++++ Rules.make.in
+@@ -24,8 +24,7 @@ OBJECTS +=
+ DISTFILES +=
+
+ LIBSTATIC = $(PACKAGE).a
+-LIBDYNAMIC = $(PACKAGE).so
+-LIBDYNAMICV = $(PACKAGE).so.$(VERSION)
++LIBDYNAMICV = $(PACKAGE).la
+
+ install_LIB = $(LIBSTATIC) $(LIBDYNAMICV)
+ SCRIPTS =
+@@ -157,19 +156,14 @@ static: $(LIBSTATIC)
+ dynamic: $(LIBDYNAMICV)
+
+ $(LIBSTATIC): $(OBJECTS)
+- $(AR) r $@ $(OBJECTS)
++ :
+
+ $(LIBDYNAMICV): $(OBJECTS)
+- $(LD) $(LDFLAGS) -shared -o $@ $(OBJECTS)
++ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJECTS) -rpath $(libdir) -version-info `echo $(VERSION) | sed -e 's/0\.\([^.]*\)\.\([^.]*\)/\1\2/'`
+
+-%.o: %.c $(CONFIG_HEADER)
++%.lo: %.c $(CONFIG_HEADER)
+ @echo '$(COMPILE) -c $<'; \
+- $(COMPILE) -Wp,-MD,.deps/$(*F).pp -o $@ -c $<
+- @-cp .deps/$(*F).pp .deps/$(*F).P; \
+- tr ' ' '\012' < .deps/$(*F).pp \
+- | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+- >> .deps/$(*F).P; \
+- rm .deps/$(*F).pp
++ $(LIBTOOL) --mode=compile $(COMPILE) -o $@ -c $<
+
+ %.o: %.cpp $(CONFIG_HEADER)
+ @echo '$(COMPILE_CXX) -c $<'; \
diff -r 543fbb0869fc -r ad99c33d31bf devel/cfg+/patches/patch-ab
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/cfg+/patches/patch-ab Mon Sep 06 20:38:36 2004 +0000
@@ -0,0 +1,50 @@
+$NetBSD: patch-ab,v 1.1 2004/09/06 20:38:36 danw Exp $
+
+--- src/Makefile.in.orig Tue Feb 17 11:37:47 2004
++++ src/Makefile.in
+@@ -60,16 +60,16 @@ SOURCES = $(srcdir)/cfg+.c \
+ $(srcdir)/platon/str/strdyn.c \
+ $(srcdir)/platon/str/dynfgets.c
+
+-OBJECTS = $(top_builddir)/src/cfg+.o \
+- $(top_builddir)/src/parse.o \
+- $(top_builddir)/src/props.o \
+- $(top_builddir)/src/cmdline.o \
+- $(top_builddir)/src/cfgfile.o \
+- $(top_builddir)/src/shared.o \
+- $(top_builddir)/src/platon/str/strplus.o \
+- $(top_builddir)/src/platon/str/strctype.o \
+- $(top_builddir)/src/platon/str/strdyn.o \
+- $(top_builddir)/src/platon/str/dynfgets.o
++OBJECTS = $(top_builddir)/src/cfg+.lo \
++ $(top_builddir)/src/parse.lo \
++ $(top_builddir)/src/props.lo \
++ $(top_builddir)/src/cmdline.lo \
++ $(top_builddir)/src/cfgfile.lo \
++ $(top_builddir)/src/shared.lo \
++ $(top_builddir)/src/platon/str/strplus.lo \
++ $(top_builddir)/src/platon/str/strctype.lo \
++ $(top_builddir)/src/platon/str/strdyn.lo \
++ $(top_builddir)/src/platon/str/dynfgets.lo
+
+ # SunOS 4 make does not allow multiple makefiles to be specified in one include directive.
+ DEP_FILES = $(top_builddir)/src/.deps/cfg+.P \
+@@ -97,8 +97,7 @@ noinst_HEADERS = cfgfile.h \
+ platon/str/strplus.h
+
+ LIBSTATIC = $(PACKAGE).a
+-LIBDYNAMIC = $(PACKAGE).so
+-LIBDYNAMICV = $(PACKAGE).so.$(VERSION)
++LIBDYNAMICV = $(PACKAGE).la
+
+ install_LIB = $(LIBSTATIC) $(LIBDYNAMICV)
+
+@@ -166,7 +165,7 @@ install-lib: $(install_LIB)
+ @list='$(install_LIB)'; for p in $$list; do \
+ if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
+ echo " Installing file $(DESTDIR)$(libdir)/$$p"; \
+- $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libdir)/$$p; \
++ $(LIBTOOL) --mode=install $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libdir)/$$p; \
+ done
+ uninstall-lib:
+ @$(NORMAL_UNINSTALL)
Home |
Main Index |
Thread Index |
Old Index