Commits

Ryan Schmidt authored c1c22fe87b5
libnewt: update to 0.52.19 and fix library install_name

git-svn-id: https://svn.macports.org/repository/macports/trunk/dports@147227 d073be05-634f-4543-b044-5fe20cf6d1d6
No tags

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

Modified
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 @@
6 4 LDFLAGS = @LDFLAGS@
7 --CPPFLAGS = -D_GNU_SOURCE -I/usr/include/slang @CPPFLAGS@
8 -+CPPFLAGS = -D_GNU_SOURCE @CPPFLAGS@
5 + CPPFLAGS = -D_GNU_SOURCE @CPPFLAGS@
9 6 GNU_LD = @GNU_LD@
10 -+UNAME = $(shell uname -s)
7 ++UNAME_S := $(shell uname -s)
11 8
12 9 VERSION = @VERSION@
13 10 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
15 40 ifneq ($(GNU_LD),)
16 41 SHLIBFLAGS= -Wl,--version-script,newt.0.52.ver -Wl,-soname,$(LIBNEWTSONAME)
17 42 else
18 --SHLIBFLAGS=
19 -+SHLIBFLAGS= -install_name $(libdir)/$(LIBNEWTSH) -current_version $(VERSION) -compatibility_version $(SONAME)
43 + SHLIBFLAGS=
20 44 endif
45 ++endif
21 46
22 47 SHCFLAGS = -fPIC
23 -@@ -106,7 +107,7 @@
48 +
49 +@@ -105,8 +121,8 @@
50 + whiptail: $(NDIALOGOBJS) $(LIBNEWTSH)
24 51 $(CC) -g -o whiptail $(NDIALOGOBJS) -L. $(LDFLAGS) -lnewt $(LIBS) -lpopt
25 52
26 - whiptcl.$(SOEXT): $(WHIPTCLOBJS) $(LIBNEWTSH)
53 +-whiptcl.$(SOEXT): $(WHIPTCLOBJS) $(LIBNEWTSH)
27 54 - $(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)
29 57
30 58 $(LIBNEWT): $(LIBOBJS)
31 59 ar rv $@ $^
32 -@@ -129,7 +130,7 @@
60 +@@ -129,7 +145,7 @@
33 61 sharedlib: $(LIBNEWTSH)
34 62
35 63 $(LIBNEWTSH): $(SHAREDDIR) $(SHAREDOBJS)
36 64 - $(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)
38 66 ln -fs $(LIBNEWTSONAME) libnewt.$(SOEXT)
39 67 ln -fs $(LIBNEWTSH) $(LIBNEWTSONAME)
40 68
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 ;\

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut