From fc6969e10a17b709ccde3bd65511de74d9251125 Mon Sep 17 00:00:00 2001 From: Felippe de Meirelles Motta Date: Thu, 3 Apr 2008 02:11:57 +0000 Subject: [PATCH] - Update to 1.1.20080316. [1] - Libtoolized shared libraries and allows the objects to be linked into PIC code. [2] PR: ports/121769 Submitted by: David Barksdale [1], Martin Tournoij (maintainer) [2] Approved by: araujo (mentor), Martin Tournoij (maintainer) --- devel/cdialog/Makefile | 6 +++-- devel/cdialog/distinfo | 6 ++--- devel/cdialog/files/patch-makefile.in | 35 ++++++++++++++++++--------- devel/cdialog/pkg-descr | 3 --- devel/cdialog/pkg-plist | 3 +++ 5 files changed, 34 insertions(+), 19 deletions(-) diff --git a/devel/cdialog/Makefile b/devel/cdialog/Makefile index 52e78dde647b..489462ed5442 100644 --- a/devel/cdialog/Makefile +++ b/devel/cdialog/Makefile @@ -7,7 +7,7 @@ # PORTNAME= cdialog -PORTVERSION= 1.1.20071028 +PORTVERSION= 1.1.20080316 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= ftp://invisible-island.net/dialog/ \ @@ -19,8 +19,10 @@ EXTRACT_SUFX= .tgz MAINTAINER= carpetsmoker@xs4all.nl COMMENT= An enhanced version of 'dialog' to work with ncurses +USE_AUTOTOOLS= libtool:15 GNU_CONFIGURE= yes -CONFIGURE_ARGS= --includedir=${PREFIX}/include/${PORTNAME} +USE_LDCONFIG= yes +CONFIGURE_ARGS= --includedir=${PREFIX}/include/${PORTNAME} --with-libtool CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} MAKEFILE= makefile diff --git a/devel/cdialog/distinfo b/devel/cdialog/distinfo index 5d0313d33e4e..455df7d711c5 100644 --- a/devel/cdialog/distinfo +++ b/devel/cdialog/distinfo @@ -1,3 +1,3 @@ -MD5 (dialog-1.1-20071028.tgz) = 73604d3b3a43b5a122709a7a8e4edee2 -SHA256 (dialog-1.1-20071028.tgz) = 1841fdd89c1d680c11ea854bc2ea93a08c80ba066d74a5faeb3ff76409e6e751 -SIZE (dialog-1.1-20071028.tgz) = 369837 +MD5 (dialog-1.1-20080316.tgz) = 3d262cbc41e4db23251e7be924c4a28b +SHA256 (dialog-1.1-20080316.tgz) = bd11acbc57442930160dbbcea2d5024a27c71774c24412c44b9cdece9894e707 +SIZE (dialog-1.1-20080316.tgz) = 373022 diff --git a/devel/cdialog/files/patch-makefile.in b/devel/cdialog/files/patch-makefile.in index 5b348d032718..26b9882cd77e 100644 --- a/devel/cdialog/files/patch-makefile.in +++ b/devel/cdialog/files/patch-makefile.in @@ -1,6 +1,24 @@ ---- makefile.in.orig Sun Mar 25 22:23:30 2007 -+++ makefile.in Sun Apr 8 18:46:09 2007 -@@ -153,7 +153,7 @@ +--- makefile.in 2008-03-15 19:55:17.680943499 -0500 ++++ makefile.in 2008-03-15 19:55:36.656135598 -0500 +@@ -102,7 +102,7 @@ + dlg_config.h \ + dlg_keys.h + +-LIB = @LIB_PREFIX@dialog$a ++LIB = @LIB_PREFIX@cdialog$a + PROG = dialog$x + ALL = $(LIB) $(PROG) + +@@ -126,7 +126,7 @@ + $(RANLIB) $@ + + dialog$x : $(LIB) dialog$o @INTLDIR_MAKE@ @INTLLIBS@ +- $(LINK) -o $@ dialog$o -L. -ldialog $(LDFLAGS) $(LIBS) ++ $(LINK) -o $@ dialog$o -L. -lcdialog $(LDFLAGS) $(LIBS) + + clean \ + distclean \ +@@ -159,7 +159,7 @@ @echo "made $@" install-strip :: $(PROG) $(BINDIR) @@ -9,7 +27,7 @@ uninstall :: uninstall-bin uninstall-man @echo "made $@" -@@ -168,7 +168,7 @@ +@@ -174,7 +174,7 @@ $(RM) $(BINDIR)/$(PACKAGE)$x install-man :: $(MAN1DIR) @@ -18,7 +36,7 @@ uninstall-man :: $(RM) $(MAN1DIR)/$(PACKAGE).1 -@@ -176,11 +176,11 @@ +@@ -182,7 +182,7 @@ # most users do not want/need the library, so the install rules are distinct. install-lib :: $(BINDIR) dialog-config @ echo "** installing config script in $(BINDIR)" @@ -27,12 +45,7 @@ install-lib :: $(LIB_DIRS) $(LIB) headers.sed @ echo "** installing library in $(LIBDIR)" -- @ $(LIBTOOL_INSTALL) $(INSTALL_DATA) $(LIB) $(LIBDIR) -+ @ $(LIBTOOL_INSTALL) $(INSTALL_DATA) $(LIB) $(LIBDIR)/@LIB_PREFIX@cdialog$a - @ echo "** installing headers in $(INCLUDEDIR)" - @ $(SHELL) $(srcdir)/headers.sh $(INSTALL_DATA) $(INCLUDEDIR) $(srcdir) dialog.h - @ $(SHELL) $(srcdir)/headers.sh $(INSTALL_DATA) $(INCLUDEDIR) $(srcdir) dlg_colors.h -@@ -198,7 +198,7 @@ +@@ -204,7 +204,7 @@ $(RM) $(INCLUDEDIR)/dlg_config.h install-lib :: $(MAN3DIR) diff --git a/devel/cdialog/pkg-descr b/devel/cdialog/pkg-descr index be9641b48b08..a23bfbafa772 100644 --- a/devel/cdialog/pkg-descr +++ b/devel/cdialog/pkg-descr @@ -7,6 +7,3 @@ reported were not related to ncurses. After that, I resumed development, adding new widget types. See the changelog for details." WWW: http://invisible-island.net/dialog/ - --- -AlanE diff --git a/devel/cdialog/pkg-plist b/devel/cdialog/pkg-plist index 4462e7992af1..60e30c5962f3 100644 --- a/devel/cdialog/pkg-plist +++ b/devel/cdialog/pkg-plist @@ -5,6 +5,9 @@ include/cdialog/dlg_colors.h include/cdialog/dlg_config.h include/cdialog/dlg_keys.h lib/libcdialog.a +lib/libcdialog.la +lib/libcdialog.so +lib/libcdialog.so.6 %%EXAMPLESDIR%%/README %%EXAMPLESDIR%%/calendar %%EXAMPLESDIR%%/calendar-stdout