Changeset 147227


Ignore:
Timestamp:
Mar 31, 2016, 5:27:16 PM (20 months ago)
Author:
ryandesign@…
Message:

libnewt: update to 0.52.19 and fix library install_name

Location:
trunk/dports/devel/libnewt
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/devel/libnewt/Portfile

    r127255 r147227  
    55
    66name                libnewt
    7 version             0.52.18
     7version             0.52.19
    88categories          devel
    99platforms           darwin
     
    2525distname            newt-${version}
    2626
    27 checksums           rmd160  8b1fd7e7201ca337dd7df99a39947f14a97b3d6f \
    28                     sha256  771b0e634ede56ae6a6acd910728bb5832ac13ddb0d1d27919d2498dab70c91e
     27checksums           rmd160  aa914fde11f62086d3ed9f468ab3a5bc7623f6d4 \
     28                    sha256  08c0db56c21996af6a7cbab99491b774c6c09cef91cd9b03903c84634bff2e80
    2929
    3030depends_lib         port:gettext \
     
    4242                    --libdir=${prefix}/lib
    4343
    44 # Fix build with Tcl 8.6+
    45 configure.cppflags-append   -DUSE_INTERP_RESULT
    46 
    47 destroot.destdir    instroot=${destroot}
    48 
    4944# configure: WARNING: unrecognized options: --disable-dependency-tracking
    5045# gcc-4.2: -E, -S, -save-temps and -M options are not allowed with multiple -arch flags
  • trunk/dports/devel/libnewt/files/patch-Makefile.in.diff

    r109035 r147227  
    1 --- Makefile.in.orig    2013-08-06 10:46:42.000000000 -0500
    2 +++ Makefile.in 2013-08-06 20:10:49.000000000 -0500
    3 @@ -5,8 +5,9 @@
    4  CPP = @CPP@
    5  CFLAGS = @CFLAGS@
     1--- Makefile.in.orig    2016-03-23 10:46:24.000000000 -0500
     2+++ Makefile.in 2016-03-31 12:21:15.000000000 -0500
     3@@ -7,11 +7,16 @@
    64 LDFLAGS = @LDFLAGS@
    7 -CPPFLAGS = -D_GNU_SOURCE -I/usr/include/slang @CPPFLAGS@
    8 +CPPFLAGS = -D_GNU_SOURCE @CPPFLAGS@
     5 CPPFLAGS = -D_GNU_SOURCE @CPPFLAGS@
    96 GNU_LD = @GNU_LD@
    10 +UNAME = $(shell uname -s)
     7+UNAME_S := $(shell uname -s)
    118 
    129 VERSION = @VERSION@
    1310 TAG = r$(subst .,-,$(VERSION))
    14 @@ -35,7 +36,7 @@
     11 SONAME = @SONAME@
     12+ifeq ($(UNAME_S),Darwin)
     13+SOEXT = dylib
     14+else
     15 SOEXT = so
     16+endif
     17 
     18 PYTHONVERS = @PYTHONVERS@
     19 WHIPTCLLIB = @WHIPTCLLIB@
     20@@ -26,17 +31,28 @@
     21 NDIALOGOBJS = whiptail.o dialogboxes.o
     22 WHIPTCLOBJS = shared/whiptcl.o shared/dialogboxes.o
     23 LIBNEWT = libnewt.a
     24+ifeq ($(SOEXT),dylib)
     25+SHARED = -dynamiclib
     26+LIBNEWTSH = libnewt.$(VERSION).$(SOEXT)
     27+LIBNEWTSONAME = libnewt.$(SONAME).$(SOEXT)
     28+else
     29+SHARED = -shared
     30 LIBNEWTSH = libnewt.$(SOEXT).$(VERSION)
     31 LIBNEWTSONAME = libnewt.$(SOEXT).$(SONAME)
     32+endif
     33 LIBOBJS = newt.o button.o form.o checkbox.o entry.o label.o listbox.o \
     34           scrollbar.o textbox.o scale.o grid.o windows.o buttonbar.o \
     35          checkboxtree.o
     36 
     37+ifeq ($(SOEXT),dylib)
     38+SHLIBFLAGS= -install_name $(libdir)/$(LIBNEWTSONAME) -current_version $(VERSION) -compatibility_version $(SONAME)
     39+else
    1540 ifneq ($(GNU_LD),)
    1641 SHLIBFLAGS= -Wl,--version-script,newt.0.52.ver -Wl,-soname,$(LIBNEWTSONAME)
    1742 else
    18 -SHLIBFLAGS=
    19 +SHLIBFLAGS= -install_name $(libdir)/$(LIBNEWTSH) -current_version $(VERSION) -compatibility_version $(SONAME)
     43 SHLIBFLAGS=
    2044 endif
     45+endif
    2146 
    2247 SHCFLAGS = -fPIC
    23 @@ -106,7 +107,7 @@
     48 
     49@@ -105,8 +121,8 @@
     50 whiptail: $(NDIALOGOBJS) $(LIBNEWTSH)
    2451        $(CC) -g -o whiptail $(NDIALOGOBJS) -L. $(LDFLAGS) -lnewt $(LIBS) -lpopt
    2552 
    26  whiptcl.$(SOEXT): $(WHIPTCLOBJS) $(LIBNEWTSH)
     53-whiptcl.$(SOEXT): $(WHIPTCLOBJS) $(LIBNEWTSH)
    2754-       $(CC) -shared $(SHCFLAGS) $(LDFLAGS) -o whiptcl.$(SOEXT) $(WHIPTCLOBJS) -L. -lnewt  $(LIBTCL) -lpopt $(LIBS)
    28 +       $(CC) -dynamiclib $(SHCFLAGS) $(LDFLAGS) -o whiptcl.$(SOEXT) $(WHIPTCLOBJS) -L. -lnewt  $(LIBTCL) -lpopt $(LIBS)
     55+$(WHIPTCLSO): $(WHIPTCLOBJS) $(LIBNEWTSH)
     56+       $(CC) $(SHARED) $(SHCFLAGS) $(LDFLAGS) -o $(WHIPTCLSO) $(WHIPTCLOBJS) -L. -lnewt  $(LIBTCL) -lpopt $(LIBS)
    2957 
    3058 $(LIBNEWT): $(LIBOBJS)
    3159        ar rv $@ $^
    32 @@ -129,7 +130,7 @@
     60@@ -129,7 +145,7 @@
    3361 sharedlib: $(LIBNEWTSH)
    3462 
    3563 $(LIBNEWTSH): $(SHAREDDIR) $(SHAREDOBJS)
    3664-       $(CC) -shared -o $(LIBNEWTSH) $(SHLIBFLAGS) $(SHAREDOBJS) $(LDFLAGS) $(LIBS)
    37 +       $(CC) -dynamiclib -o $(LIBNEWTSH) $(SHLIBFLAGS) $(SHAREDOBJS) $(LDFLAGS) $(LIBS)
     65+       $(CC) $(SHARED) -o $(LIBNEWTSH) $(SHLIBFLAGS) $(SHAREDOBJS) $(LDFLAGS) $(LIBS)
    3866        ln -fs $(LIBNEWTSONAME) libnewt.$(SOEXT)
    3967        ln -fs $(LIBNEWTSH) $(LIBNEWTSONAME)
    4068 
     69@@ -154,7 +170,7 @@
     70        install -m 755 $(LIBNEWTSH) $(instroot)/$(libdir)
     71        ln -sf $(LIBNEWTSONAME) $(instroot)/$(libdir)/libnewt.$(SOEXT)
     72        ln -sf $(LIBNEWTSH) $(instroot)/$(libdir)/$(LIBNEWTSONAME)
     73-       [ -n "$(WHIPTCLSO)" ] && install -m 755 whiptcl.$(SOEXT) $(instroot)/$(libdir) || :
     74+       [ -n "$(WHIPTCLSO)" ] && install -m 755 $(WHIPTCLSO) $(instroot)/$(libdir) || :
     75        [ -n "$(PYTHONVERS)" ] && for ver in $(PYTHONVERS) ; do \
     76           [ -d $(instroot)/$(libdir)/$$ver/site-packages ] || install -m 755 -d $(instroot)/$(libdir)/$$ver/site-packages ;\
     77           install -m 755 $$ver/_snack.$(SOEXT) $(instroot)/$(libdir)/$$ver/site-packages ;\
Note: See TracChangeset for help on using the changeset viewer.