Changeset 79879

Timestamp:

06/28/11 18:51:38 (4 years ago)

Author:

ryandesign@…

Message:

libnewt: update to 0.52.13

Location:

trunk/dports/devel/libnewt

Files:

• Portfile (modified) (3 diffs)
• files/patch-Makefile.in.diff (modified) (1 diff)
• files/patch-configure.ac.diff (modified) (1 diff)
• files/patch-whiptail.c.diff (deleted)

trunk/dports/devel/libnewt/Portfile

@@ -5 +5 @@
 
 name                libnewt
-version             0.52.12
-revision            1
+version             0.52.13
 categories          devel
 platforms           darwin
@@ -26 +25 @@
 distname            newt-${version}
 
-checksums           sha1    6952115806c7b1dbc36858eb4ca0596b235cf6f4 \
-                    rmd160  0d34b278e72c1b1305fc110e491e3bc96b42a374
+checksums           sha1    0891ad749560ea6071edd734a080c9d172d0da0e \
+                    rmd160  c43d9b3acd800ba3590c85e9854ad7b7c8e9b34b
 
 depends_lib         port:gettext \
@@ -35 +34 @@
 
 patchfiles          patch-Makefile.in.diff \
-                    patch-configure.ac.diff \
-                    patch-whiptail.c.diff
+                    patch-configure.ac.diff
 
 use_autoreconf      yes
+
+# It can't find tclConfig.sh unless libdir is expanded
+configure.args      --without-python \
+                    --libdir=${prefix}/lib
 
 destroot.destdir    instroot=${destroot}

trunk/dports/devel/libnewt/files/patch-Makefile.in.diff

@@ -1 @@
---- Makefile.in.orig    2011-03-11 00:53:35.000000000 +0100
-+++ Makefile.in 2011-03-11 00:57:11.000000000 +0100
-@@ -1,12 +1,13 @@
- LIBS = -lslang
--LIBTCL = -ltcl8.4
-+LIBTCL = -ltcl8.5
- 
- CC = @CC@
+--- Makefile.in.orig    2011-06-27 07:24:04.000000000 -0500
++++ Makefile.in 2011-06-28 18:58:35.000000000 -0500
+@@ -5,7 +5,7 @@
  CPP = @CPP@
  CFLAGS = @CFLAGS@
+ LDFLAGS = @LDFLAGS@
 -CPPFLAGS = -D_GNU_SOURCE -I/usr/include/slang @CPPFLAGS@ 
-+LDFLAGS = @LDFLAGS@
 +CPPFLAGS = -D_GNU_SOURCE @CPPFLAGS@ 
-+GNU_LD = @GNU_LD@
+ GNU_LD = @GNU_LD@
  
--SHLIBFLAGS= -Wl,--version-script,newt.0.52.ver
  VERSION = @VERSION@
- TAG = r$(subst .,-,$(VERSION))
- SONAME = @SONAME@
-@@ -25,6 +26,8 @@
-           scrollbar.o textbox.o scale.o grid.o windows.o buttonbar.o \
-          checkboxtree.o
+@@ -29,7 +29,7 @@
+ ifneq ($(GNU_LD),)
+ SHLIBFLAGS= -Wl,--version-script,newt.0.52.ver -Wl,-soname,$(LIBNEWTSONAME)
+ else
+-SHLIBFLAGS=
++SHLIBFLAGS= -install_name $(libdir)/$(LIBNEWTSH)
+ endif
  
-+SHLIBFLAGS= -install_name $(libdir)/$(LIBNEWTSH)
-+
  SHCFLAGS = -fPIC
- 
- prefix = @prefix@
-@@ -33,6 +36,7 @@
- libdir = @libdir@
- bindir = @bindir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- mandir = @mandir@
- man1dir = $(mandir)/man1
- pkgconfigdir = $(libdir)/pkgconfig
-@@ -53,33 +57,37 @@
- all:   $(TARGET) _snackmodule.so
- 
- test:  test.o $(LIBNEWT)
--       $(CC) -g -o test test.o $(LIBNEWT) $(LIBS)
-+       $(CC) -g -o test test.o $(LIBNEWT) $(LDFLAGS) $(LIBS)
- 
- testgrid:      testgrid.o $(LIBNEWT)
--       $(CC) -g -o testgrid testgrid.o $(LIBNEWT) $(LIBS)
-+       $(CC) -g -o testgrid testgrid.o $(LIBNEWT) $(LDFLAGS) $(LIBS)
- 
- testtree:      testtree.o $(LIBNEWT)
--       $(CC) -g -o testtree testtree.o $(LIBNEWT) $(LIBS)
-+       $(CC) -g -o testtree testtree.o $(LIBNEWT) $(LDFLAGS) $(LIBS)
- 
- showchars:     showchars.o $(LIBNEWT)
--       $(CC) -g -o showchars showchars.o $(LIBNEWT) $(LIBS)
-+       $(CC) -g -o showchars showchars.o $(LIBNEWT) $(LDFLAGS) $(LIBS)
- 
- showkey:       showkey.o $(LIBNEWT)
--       $(CC) -g -o showkey showkey.o $(LIBNEWT) $(LIBS)
-+       $(CC) -g -o showkey showkey.o $(LIBNEWT) $(LDFLAGS) $(LIBS)
- 
- _snackmodule.so:   snackmodule.c $(LIBNEWTSH)
-        for ver in $(PYTHONVERS) ; do \
-                mkdir -p $$ver ;\
--               $(CC) $(CFLAGS) -I/usr/include/$$ver $(SHCFLAGS) -c -o $$ver/snackmodule.o snackmodule.c ;\
--               $(CC) --shared $(SHCFLAGS) -o $$ver/_snackmodule.so $$ver/snackmodule.o -L .  -lnewt ;\
-+                       PCFLAGS=`$$ver-config --cflags`; \
-+                       PIFLAGS=`$$ver-config --includes`; \
-+                       PLDFLAGS=`$$ver-config --ldflags`; \
-+                       PLFLAGS=`$$ver-config --libs`; \
-+               $(CC) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snackmodule.o snackmodule.c ;\
-+               $(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snackmodule.so $$ver/snackmodule.o -L.  -lnewt -lintl ;\
-        done
-        touch $@
- 
- whiptail: $(NDIALOGOBJS) $(LIBNEWTSH)
--       $(CC) -g -o whiptail $(NDIALOGOBJS) -L . -lnewt $(LIBS) -lpopt
-+       $(CC) -g -o whiptail $(NDIALOGOBJS) -L. $(LDFLAGS) -lnewt $(LIBS) -lpopt -lintl
- 
- whiptcl.so: $(WHIPTCLOBJS) $(LIBNEWTSH)
--       $(CC) -shared $(SHCFLAGS) -o whiptcl.so $(WHIPTCLOBJS) -L . -lnewt  $(LIBTCL) -lpopt
-+       $(CC) -shared $(SHCFLAGS) $(LDFLAGS) -o whiptcl.so $(WHIPTCLOBJS) -L. -lnewt $(LIBS) $(LIBTCL) -lpopt -lintl
- 
- $(LIBNEWT): $(LIBOBJS)
-        ar rv $@ $^
-@@ -102,7 +110,7 @@
- sharedlib: $(LIBNEWTSH)
- 
- $(LIBNEWTSH): $(SHAREDDIR) $(SHAREDOBJS)
--       $(CC) -shared -o $(LIBNEWTSH) $(SHLIBFLAGS) -Wl,-soname,$(LIBNEWTSONAME) $(SHAREDOBJS) $(LIBS)
-+       $(CC) -shared -o $(LIBNEWTSH) $(SHLIBFLAGS) $(SHAREDOBJS) $(LDFLAGS) $(LIBS)
-        ln -fs $(LIBNEWTSONAME) libnewt.so
-        ln -fs $(LIBNEWTSH) $(LIBNEWTSONAME)
- 
-@@ -119,7 +127,7 @@
-        install -m 755 whiptail $(instroot)/$(bindir)
-        install -m 644 whiptail.1 $(instroot)/$(man1dir)
-        make -C po datadir=$(instroot)/$(datadir) install
--       install -m 644 -D libnewt.pc $(instroot)/$(pkgconfigdir)/libnewt.pc
-+       install -m 644 libnewt.pc $(instroot)/$(pkgconfigdir)/libnewt.pc
- 
- install-sh: sharedlib $(WHIPTCLSO) _snackmodule.so
-        [ -d $(instroot)/$(libdir) ] || install -m 755 -d $(instroot)/$(libdir)

trunk/dports/devel/libnewt/files/patch-configure.ac.diff

@@ -1 @@
---- configure.ac.orig   2010-08-06 06:45:34.000000000 -0500
-+++ configure.ac        2010-11-14 19:11:45.000000000 -0600
-@@ -13,8 +13,24 @@
- AC_PROG_CC
- AC_PROG_INSTALL
- AC_PROG_LN_S
-+AC_PROG_GREP
-+
-+# Are we using GNU ld?
-+AC_MSG_CHECKING([for GNU ld])
-+LD=`$CC -print-prog-name=ld 2>&5`
-+
-+if test `$LD -v 2>&1 | $ac_cv_path_GREP -c "GNU ld"` = 0; then
-+       # Not
-+       GNU_LD=""
-+       AC_MSG_RESULT([no])
-+else
-+       GNU_LD="$LD"
-+       AC_MSG_RESULT([yes])
-+       AC_SUBST([GNU_LD])
-+fi
+--- configure.ac.orig   2011-06-27 07:24:04.000000000 -0500
++++ configure.ac        2011-06-28 20:49:18.000000000 -0500
+@@ -30,27 +30,7 @@
+ fi
  
  AC_CHECK_HEADERS([sys/select.h alloca.h])
-+AC_CHECK_HEADERS([popt.h libintl.h])
+-AC_CHECK_HEADER([slang.h], [], [
+-  old_CPPFLAGS=${CPPFLAGS}
+-  CPPFLAGS="${CPPFLAGS} -I/opt/local/include"
+-  unset ac_cv_header_slang_h
+-  AC_CHECK_HEADER([slang.h])
+-  if test x$ac_cv_header_slang_h = x; then
+-   CPPFLAGS="${old_CPPFLAGS}"
+-  else
+-   LDFLAGS="${LDFLAGS} -L/opt/local/lib"
+-  fi
+-])
+-if test x$ac_cv_header_slang_h = x; then
+-  old_CPPFLAGS=${CPPFLAGS}
+-  CPPFLAGS="${CPPFLAGS} -I/sw/include"
+-  AC_CHECK_HEADER([slang.h])
+-  if test x$ac_cv_header_slang_h = x; then
+-    CPPFLAGS=${old_CPPFLAGS}
+-  else
+-    LDFLAGS="${LDFLAGS} -L/sw/lib"
+-  fi
+-fi
++AC_CHECK_HEADER([slang.h])
+ AC_CHECK_HEADERS([popt.h libintl.h])
  
  AC_MSG_CHECKING([for python versions])
- PYTHONVERS=$(echo /usr/include/python*/Python.h | sed "s|/usr/include/||g"| sed "s|/Python.h||g" 2> /dev/null)
+@@ -73,16 +53,6 @@
+   # check in a few common install locations
+   if test x"${ac_cv_c_tclconfig}" = x ; then
+     for i in `ls -d ${libdir} 2>/dev/null` \
+-      `ls -d /usr/lib 2>/dev/null` \
+-      `ls -d /usr/lib64 2>/dev/null` \
+-      `ls -d /usr/local/lib 2>/dev/null` \
+-      `ls -d /usr/contrib/lib 2>/dev/null` \
+-      `ls -d /usr/pkg/lib 2>/dev/null` \
+-      `ls -d /usr/local/lib/tcl8.5 2>/dev/null` \
+-      `ls -d /usr/local/lib/tcl8.4 2>/dev/null` \
+-      `ls -d /usr/lib/tcl8.5 2>/dev/null` \
+-      `ls -d /usr/lib/tcl8.4 2>/dev/null` \
+-      `ls -d /opt/local/lib 2>/dev/null` \
+       ; do
+       if test -f "$i/tclConfig.sh" ; then
+         ac_cv_c_tclconfig=`(cd $i; pwd)`