[85050] trunk/dports/devel/libnewt

ryandesign at macports.org ryandesign at macports.org
Sat Oct 8 03:33:11 PDT 2011


Revision: 85050
          http://trac.macports.org/changeset/85050
Author:   ryandesign at macports.org
Date:     2011-10-08 03:33:06 -0700 (Sat, 08 Oct 2011)
Log Message:
-----------
libnewt: use .dylib extension for libnewt on darwin (#27253) and also add current version and compatibily version information

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	2011-10-08 09:53:47 UTC (rev 85049)
+++ trunk/dports/devel/libnewt/Portfile	2011-10-08 10:33:06 UTC (rev 85050)
@@ -5,6 +5,7 @@
 
 name                libnewt
 version             0.52.13
+revision            1
 categories          devel
 platforms           darwin
 maintainers         ryandesign openmaintainer

Modified: trunk/dports/devel/libnewt/files/patch-Makefile.in.diff
===================================================================
--- trunk/dports/devel/libnewt/files/patch-Makefile.in.diff	2011-10-08 09:53:47 UTC (rev 85049)
+++ trunk/dports/devel/libnewt/files/patch-Makefile.in.diff	2011-10-08 10:33:06 UTC (rev 85050)
@@ -1,20 +1,67 @@
 --- 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 @@
++++ Makefile.in	2011-10-08 05:13:14.000000000 -0500
+@@ -5,8 +5,9 @@
  CPP = @CPP@
  CFLAGS = @CFLAGS@
  LDFLAGS = @LDFLAGS@
 -CPPFLAGS = -D_GNU_SOURCE -I/usr/include/slang @CPPFLAGS@ 
 +CPPFLAGS = -D_GNU_SOURCE @CPPFLAGS@ 
  GNU_LD = @GNU_LD@
++UNAME = $(shell uname -s)
  
  VERSION = @VERSION@
-@@ -29,7 +29,7 @@
+ TAG = r$(subst .,-,$(VERSION))
+@@ -20,8 +21,15 @@
+ NDIALOGOBJS = whiptail.o dialogboxes.o
+ WHIPTCLOBJS = shared/whiptcl.o shared/dialogboxes.o
+ LIBNEWT = libnewt.a
+-LIBNEWTSH = libnewt.so.$(VERSION)
+-LIBNEWTSONAME = libnewt.so.$(SONAME)
++ifeq ($(UNAME),Darwin)
++SOEXT=dylib
++LIBNEWTSH = libnewt.$(VERSION).$(SOEXT)
++LIBNEWTSONAME = libnewt.$(SONAME).$(SOEXT)
++else
++SOEXT=so
++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
+@@ -29,7 +37,7 @@
  ifneq ($(GNU_LD),)
  SHLIBFLAGS= -Wl,--version-script,newt.0.52.ver -Wl,-soname,$(LIBNEWTSONAME)
  else
 -SHLIBFLAGS=
-+SHLIBFLAGS= -install_name $(libdir)/$(LIBNEWTSH)
++SHLIBFLAGS= -install_name $(libdir)/$(LIBNEWTSH) -current_version $(VERSION) -compatibility_version $(SONAME)
  endif
  
  SHCFLAGS = -fPIC
+@@ -104,7 +112,7 @@
+ 
+ clean:
+ 	rm -f $(PROGS) *.o $(LIBNEWT) core $(LIBNEWTSH)  \
+-		$(SHAREDDIR)/*.o *.so*
++		$(SHAREDDIR)/*.o *.so* *.$(SOEXT)*
+ 
+ depend:
+ 	$(CPP) $(CFLAGS) $(CPPFLAGS) -M $(SOURCES) > .depend
+@@ -116,7 +124,7 @@
+ 
+ $(LIBNEWTSH): $(SHAREDDIR) $(SHAREDOBJS)
+ 	$(CC) -shared -o $(LIBNEWTSH) $(SHLIBFLAGS) $(SHAREDOBJS) $(LDFLAGS) $(LIBS)
+-	ln -fs $(LIBNEWTSONAME) libnewt.so
++	ln -fs $(LIBNEWTSONAME) libnewt.$(SOEXT)
+ 	ln -fs $(LIBNEWTSH) $(LIBNEWTSONAME)
+ 
+ $(SHAREDDIR)/%.o : %.c
+@@ -138,7 +146,7 @@
+ install-sh: sharedlib $(WHIPTCLSO) _snackmodule.so
+ 	[ -d $(instroot)/$(libdir) ] || install -m 755 -d $(instroot)/$(libdir)
+ 	install -m 755 $(LIBNEWTSH) $(instroot)/$(libdir)
+-	ln -sf $(LIBNEWTSONAME) $(instroot)/$(libdir)/libnewt.so
++	ln -sf $(LIBNEWTSONAME) $(instroot)/$(libdir)/libnewt.$(SOEXT)
+ 	ln -sf $(LIBNEWTSH) $(instroot)/$(libdir)/$(LIBNEWTSONAME)
+ 	[ -n "$(WHIPTCLSO)" ] && install -m 755 whiptcl.so $(instroot)/$(libdir) || :
+ 	[ -n "$(PYTHONVERS)" ] && for ver in $(PYTHONVERS) ; do \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111008/c889ed94/attachment-0001.html>


More information about the macports-changes mailing list