[147227] trunk/dports/devel/libnewt

31 Mar 2016

Revision: 147227
          https://trac.macports.org/changeset/147227
Author:   ryandesign@macports.org
Date:     2016-03-31 10:27:16 -0700 (Thu, 31 Mar 2016)
Log Message:
-----------
libnewt: update to 0.52.19 and fix library install_name

Modified Paths:
--------------
    trunk/dports/devel/libnewt/Portfile
    trunk/dports/devel/libnewt/files/patch-Makefile.in.diff

Modified: trunk/dports/devel/libnewt/Portfile
===================================================================

--- trunk/dports/devel/libnewt/Portfile	2016-03-31 16:59:52 UTC (rev 147226)
+++ trunk/dports/devel/libnewt/Portfile	2016-03-31 17:27:16 UTC (rev 147227)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                libnewt
-version             0.52.18
+version             0.52.19
 categories          devel
 platforms           darwin
 maintainers         ryandesign openmaintainer
@@ -24,8 +24,8 @@
 
 distname            newt-${version}
 
-checksums           rmd160  8b1fd7e7201ca337dd7df99a39947f14a97b3d6f \
-                    sha256  771b0e634ede56ae6a6acd910728bb5832ac13ddb0d1d27919d2498dab70c91e
+checksums           rmd160  aa914fde11f62086d3ed9f468ab3a5bc7623f6d4 \
+                    sha256  08c0db56c21996af6a7cbab99491b774c6c09cef91cd9b03903c84634bff2e80
 
 depends_lib         port:gettext \
                     port:popt \
@@ -41,11 +41,6 @@
 configure.args      --without-python \
                     --libdir=${prefix}/lib
 
-# Fix build with Tcl 8.6+
-configure.cppflags-append   -DUSE_INTERP_RESULT
-
-destroot.destdir    instroot=${destroot}
-
 # configure: WARNING: unrecognized options: --disable-dependency-tracking
 # gcc-4.2: -E, -S, -save-temps and -M options are not allowed with multiple -arch flags
 universal_variant   no

Modified: trunk/dports/devel/libnewt/files/patch-Makefile.in.diff
===================================================================
--- trunk/dports/devel/libnewt/files/patch-Makefile.in.diff	2016-03-31 16:59:52 UTC (rev 147226)
+++ trunk/dports/devel/libnewt/files/patch-Makefile.in.diff	2016-03-31 17:27:16 UTC (rev 147227)
@@ -1,40 +1,77 @@
---- Makefile.in.orig	2013-08-06 10:46:42.000000000 -0500
-+++ Makefile.in	2013-08-06 20:10:49.000000000 -0500
-@@ -5,8 +5,9 @@
- CPP = @CPP@
- CFLAGS = @CFLAGS@
+--- Makefile.in.orig	2016-03-23 10:46:24.000000000 -0500
++++ Makefile.in	2016-03-31 12:21:15.000000000 -0500
+@@ -7,11 +7,16 @@
  LDFLAGS = @LDFLAGS@
--CPPFLAGS = -D_GNU_SOURCE -I/usr/include/slang @CPPFLAGS@ 
-+CPPFLAGS = -D_GNU_SOURCE @CPPFLAGS@ 
+ CPPFLAGS = -D_GNU_SOURCE @CPPFLAGS@
  GNU_LD = @GNU_LD@
-+UNAME = $(shell uname -s)
++UNAME_S := $(shell uname -s)
  
  VERSION = @VERSION@
  TAG = r$(subst .,-,$(VERSION))
-@@ -35,7 +36,7 @@
+ SONAME = @SONAME@
++ifeq ($(UNAME_S),Darwin)
++SOEXT = dylib
++else
+ SOEXT = so
++endif
+ 
+ PYTHONVERS = @PYTHONVERS@
+ WHIPTCLLIB = @WHIPTCLLIB@
+@@ -26,17 +31,28 @@
+ NDIALOGOBJS = whiptail.o dialogboxes.o
+ WHIPTCLOBJS = shared/whiptcl.o shared/dialogboxes.o
+ LIBNEWT = libnewt.a
++ifeq ($(SOEXT),dylib)
++SHARED = -dynamiclib
++LIBNEWTSH = libnewt.$(VERSION).$(SOEXT)
++LIBNEWTSONAME = libnewt.$(SONAME).$(SOEXT)
++else
++SHARED = -shared
+ LIBNEWTSH = libnewt.$(SOEXT).$(VERSION)
+ LIBNEWTSONAME = libnewt.$(SOEXT).$(SONAME)
++endif
+ LIBOBJS = newt.o button.o form.o checkbox.o entry.o label.o listbox.o \
+           scrollbar.o textbox.o scale.o grid.o windows.o buttonbar.o \
+ 	  checkboxtree.o
+ 
++ifeq ($(SOEXT),dylib)
++SHLIBFLAGS= -install_name $(libdir)/$(LIBNEWTSONAME) -current_version $(VERSION) -compatibility_version $(SONAME)
++else
  ifneq ($(GNU_LD),)
  SHLIBFLAGS= -Wl,--version-script,newt.0.52.ver -Wl,-soname,$(LIBNEWTSONAME)
  else
--SHLIBFLAGS=
-+SHLIBFLAGS= -install_name $(libdir)/$(LIBNEWTSH) -current_version $(VERSION) -compatibility_version $(SONAME)
+ SHLIBFLAGS=
  endif
++endif
  
  SHCFLAGS = -fPIC
-@@ -106,7 +107,7 @@
+ 
+@@ -105,8 +121,8 @@
+ whiptail: $(NDIALOGOBJS) $(LIBNEWTSH)
  	$(CC) -g -o whiptail $(NDIALOGOBJS) -L. $(LDFLAGS) -lnewt $(LIBS) -lpopt
  
- whiptcl.$(SOEXT): $(WHIPTCLOBJS) $(LIBNEWTSH)
+-whiptcl.$(SOEXT): $(WHIPTCLOBJS) $(LIBNEWTSH)
 -	$(CC) -shared $(SHCFLAGS) $(LDFLAGS) -o whiptcl.$(SOEXT) $(WHIPTCLOBJS) -L. -lnewt  $(LIBTCL) -lpopt $(LIBS)
-+	$(CC) -dynamiclib $(SHCFLAGS) $(LDFLAGS) -o whiptcl.$(SOEXT) $(WHIPTCLOBJS) -L. -lnewt  $(LIBTCL) -lpopt $(LIBS)
++$(WHIPTCLSO): $(WHIPTCLOBJS) $(LIBNEWTSH)
++	$(CC) $(SHARED) $(SHCFLAGS) $(LDFLAGS) -o $(WHIPTCLSO) $(WHIPTCLOBJS) -L. -lnewt  $(LIBTCL) -lpopt $(LIBS)
  
  $(LIBNEWT): $(LIBOBJS)
  	ar rv $@ $^
-@@ -129,7 +130,7 @@
+@@ -129,7 +145,7 @@
  sharedlib: $(LIBNEWTSH)
  
  $(LIBNEWTSH): $(SHAREDDIR) $(SHAREDOBJS)
 -	$(CC) -shared -o $(LIBNEWTSH) $(SHLIBFLAGS) $(SHAREDOBJS) $(LDFLAGS) $(LIBS)
-+	$(CC) -dynamiclib -o $(LIBNEWTSH) $(SHLIBFLAGS) $(SHAREDOBJS) $(LDFLAGS) $(LIBS)
++	$(CC) $(SHARED) -o $(LIBNEWTSH) $(SHLIBFLAGS) $(SHAREDOBJS) $(LDFLAGS) $(LIBS)
  	ln -fs $(LIBNEWTSONAME) libnewt.$(SOEXT)
  	ln -fs $(LIBNEWTSH) $(LIBNEWTSONAME)
  
+@@ -154,7 +170,7 @@
+ 	install -m 755 $(LIBNEWTSH) $(instroot)/$(libdir)
+ 	ln -sf $(LIBNEWTSONAME) $(instroot)/$(libdir)/libnewt.$(SOEXT)
+ 	ln -sf $(LIBNEWTSH) $(instroot)/$(libdir)/$(LIBNEWTSONAME)
+-	[ -n "$(WHIPTCLSO)" ] && install -m 755 whiptcl.$(SOEXT) $(instroot)/$(libdir) || :
++	[ -n "$(WHIPTCLSO)" ] && install -m 755 $(WHIPTCLSO) $(instroot)/$(libdir) || :
+ 	[ -n "$(PYTHONVERS)" ] && for ver in $(PYTHONVERS) ; do \
+ 	   [ -d $(instroot)/$(libdir)/$$ver/site-packages ] || install -m 755 -d $(instroot)/$(libdir)/$$ver/site-packages ;\
+ 	   install -m 755 $$ver/_snack.$(SOEXT) $(instroot)/$(libdir)/$$ver/site-packages ;\

    

ryandesign＠macports.org

tags

participants (1)