[134458] trunk/dports/net/nxcomp
ionic at macports.org
ionic at macports.org
Wed Mar 25 18:04:24 PDT 2015
Revision: 134458
https://trac.macports.org/changeset/134458
Author: ionic at macports.org
Date: 2015-03-25 18:04:24 -0700 (Wed, 25 Mar 2015)
Log Message:
-----------
nxcomp: update to 3.5.0.31. Lose makedepend build dependency. Update patches. Delete one merged upstream.
Modified Paths:
--------------
trunk/dports/net/nxcomp/Portfile
trunk/dports/net/nxcomp/files/patch-nxcomp__Makefile.in.diff
trunk/dports/net/nxcomp/files/patch-nxproxy__configure.in.diff
Removed Paths:
-------------
trunk/dports/net/nxcomp/files/patch-nxcomp__configure.in.diff
Modified: trunk/dports/net/nxcomp/Portfile
===================================================================
--- trunk/dports/net/nxcomp/Portfile 2015-03-26 01:04:18 UTC (rev 134457)
+++ trunk/dports/net/nxcomp/Portfile 2015-03-26 01:04:24 UTC (rev 134458)
@@ -4,9 +4,9 @@
PortSystem 1.0
name nxcomp
-version 3.5.0.29
-checksums rmd160 c1d21150debe988377b7fa4bf0d9b84f06434c7f \
- sha256 573bc9622251333d0cf7411ee9a8457275fa04fade5c5562e4ed52398a77e51b
+version 3.5.0.31
+checksums rmd160 d5bf4b4ca76fbc54bf0d041ad7ee48e012e31df7 \
+ sha256 6dbaa60d9505454011d53e06ee60d44bd86ae43b7370d9c4d1ff8cfc65ee23c2
categories net
platforms darwin
@@ -25,8 +25,6 @@
universal_variant yes
supported_archs ppc i386 x86_64
-depends_build port:makedepend
-
use_autoreconf yes
configure.cxxflags-append \
@@ -40,8 +38,8 @@
worksrcdir nx-libs-${version}/nxcomp
- patchfiles patch-nxcomp__configure.in.diff \
- patch-nxcomp__Makefile.in.diff
+ # Included in the upcoming 3.5.0.32 released. Can be removed then.
+ patchfiles patch-nxcomp__Makefile.in.diff
livecheck.url [lindex ${master_sites} 0]
livecheck.regex nx-libs-(\[0-9\]+(\\.\[0-9\]+)+(-\[0-9\]+)?)-lite
Modified: trunk/dports/net/nxcomp/files/patch-nxcomp__Makefile.in.diff
===================================================================
--- trunk/dports/net/nxcomp/files/patch-nxcomp__Makefile.in.diff 2015-03-26 01:04:18 UTC (rev 134457)
+++ trunk/dports/net/nxcomp/files/patch-nxcomp__Makefile.in.diff 2015-03-26 01:04:24 UTC (rev 134458)
@@ -1,55 +1,12 @@
---- Makefile.in.orig 2015-03-13 19:50:21.000000000 +0100
-+++ Makefile.in 2015-03-13 19:51:27.000000000 +0100
-@@ -91,9 +91,17 @@
- LIBRARY = Xcomp
-
- LIBNAME = lib$(LIBRARY)
-+ifeq ($(shell uname),Darwin)
-+LIBFULL = lib$(LIBRARY).$(VERSION).dylib
-+LIBLOAD = lib$(LIBRARY).$(LIBVERSION).dylib
-+LIBSHARED = lib$(LIBRARY).dylib
-+LIBFLAGS = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(VERSION)
-+else
+--- Makefile.in.old 2015-03-26 01:23:41.000000000 +0100
++++ Makefile.in 2015-03-26 01:28:03.000000000 +0100
+@@ -95,7 +95,8 @@
+ LIBFULL = lib$(LIBRARY).$(VERSION).dylib
+ LIBLOAD = lib$(LIBRARY).$(LIBVERSION).dylib
+ LIBSHARED = lib$(LIBRARY).dylib
+-LIBFLAGS = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(VERSION)
++COMP_VER = $(shell echo '$(VERSION)' | cut -d '.' -f 1-3)
++LIBFLAGS = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(COMP_VER)
+ else
LIBFULL = lib$(LIBRARY).so.$(VERSION)
LIBLOAD = lib$(LIBRARY).so.$(LIBVERSION)
- LIBSHARED = lib$(LIBRARY).so
-+LIBFLAGS =
-+endif
- LIBARCHIVE = lib$(LIBRARY).a
-
- LIBCYGSHARED = cyg$(LIBRARY).dll
-@@ -232,7 +240,7 @@
- CXXOBJ = $(CXXSRC:.cpp=.o)
-
- $(LIBFULL): $(CXXOBJ) $(COBJ)
-- $(CXX) -o $@ $(LDFLAGS) $(CXXOBJ) $(COBJ) $(LIBS)
-+ $(CXX) -o $@ $(LDFLAGS) $(LIBFLAGS) $(CXXOBJ) $(COBJ) $(LIBS)
-
- $(LIBLOAD): $(LIBFULL)
- rm -f $(LIBLOAD)
-@@ -278,9 +286,9 @@
- ./mkinstalldirs $(DESTDIR)${libdir}
- ./mkinstalldirs $(DESTDIR)${includedir}/nx
- $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}
-- $(INSTALL_LINK) libXcomp.so.3 $(DESTDIR)${libdir}
-- $(INSTALL_LINK) libXcomp.so $(DESTDIR)${libdir}
-- $(INSTALL_DATA) libXcomp.a $(DESTDIR)${libdir}
-+ $(INSTALL_LINK) $(LIBLOAD) $(DESTDIR)${libdir}
-+ $(INSTALL_LINK) $(LIBSHARED) $(DESTDIR)${libdir}
-+ $(INSTALL_DATA) $(LIBARCHIVE) $(DESTDIR)${libdir}
- $(INSTALL_DATA) NX*.h $(DESTDIR)${includedir}/nx
- $(INSTALL_DATA) MD5.h $(DESTDIR)${includedir}/nx
- echo "Running ldconfig tool, this may take a while..." && ldconfig || true
-@@ -293,9 +301,9 @@
-
- uninstall.lib:
- $(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL)
-- $(RM_FILE) $(DESTDIR)${libdir}/libXcomp.so.3
-- $(RM_FILE) $(DESTDIR)${libdir}/libXcomp.so
-- $(RM_FILE) $(DESTDIR)${libdir}/libXcomp.a
-+ $(RM_FILE) $(DESTDIR)${libdir}/$(LIBLOAD)
-+ $(RM_FILE) $(DESTDIR)${libdir}/$(LIBSHARED)
-+ $(RM_FILE) $(DESTDIR)${libdir}/$(LIBARCHIVE)
- $(RM_FILE) $(DESTDIR)${includedir}/nx/NXalert.h
- $(RM_FILE) $(DESTDIR)${includedir}/nx/NX.h
- $(RM_FILE) $(DESTDIR)${includedir}/nx/NXmitshm.h
Deleted: trunk/dports/net/nxcomp/files/patch-nxcomp__configure.in.diff
===================================================================
--- trunk/dports/net/nxcomp/files/patch-nxcomp__configure.in.diff 2015-03-26 01:04:18 UTC (rev 134457)
+++ trunk/dports/net/nxcomp/files/patch-nxcomp__configure.in.diff 2015-03-26 01:04:24 UTC (rev 134458)
@@ -1,33 +0,0 @@
---- configure.in.orig 2013-11-05 01:12:25.000000000 +0100
-+++ configure.in 2013-11-05 01:12:56.000000000 +0100
-@@ -187,7 +187,7 @@
- dnl the options -G -h.
-
- if test "$DARWIN" = yes; then
-- LDFLAGS="$LDFLAGS -bundle"
-+ LDFLAGS="$LDFLAGS -dynamiclib"
- elif test "$SUN" = yes; then
- LDFLAGS="$LDFLAGS -G -h \$(LIBLOAD)"
- else
-@@ -362,20 +362,7 @@
- dnl Find makedepend somewhere.
-
- AC_SUBST(MAKEDEPEND)
--
--if test -x "../nx-X11/config/makedepend/makedepend" ; then
-- MAKEDEPEND=../nx-X11/config/makedepend/makedepend
--else
-- if test -x "/usr/X11R6/bin/makedepend" ; then
-- MAKEDEPEND=/usr/X11R6/bin/makedepend
-- else
-- if test -x "/usr/openwin/bin/makedepend" ; then
-- MAKEDEPEND=/usr/openwin/bin/makedepend
-- else
-- MAKEDEPEND=/usr/bin/makedepend
-- fi
-- fi
--fi
-+MAKEDEPEND=`which makedepend`
-
- dnl Determine what to build based on the platform.
- dnl Override the LIBS settings on Cygwin32 so that
Modified: trunk/dports/net/nxcomp/files/patch-nxproxy__configure.in.diff
===================================================================
--- trunk/dports/net/nxcomp/files/patch-nxproxy__configure.in.diff 2015-03-26 01:04:18 UTC (rev 134457)
+++ trunk/dports/net/nxcomp/files/patch-nxproxy__configure.in.diff 2015-03-26 01:04:24 UTC (rev 134458)
@@ -1,6 +1,6 @@
---- configure.in.orig 2013-11-05 01:45:25.000000000 +0100
-+++ configure.in 2013-11-05 01:46:40.000000000 +0100
-@@ -161,25 +161,12 @@
+--- configure.in.old 2015-03-26 01:16:58.000000000 +0100
++++ configure.in 2015-03-26 01:19:16.000000000 +0100
+@@ -161,7 +161,7 @@
if test "$CYGWIN32" = yes; then
LIBS="$LIBS -L../nxcomp -lXcomp -lstdc++ -Wl,-e,_mainCRTStartup -ljpeg -lpng -lz"
else
@@ -9,22 +9,3 @@
fi
dnl Find makedepend somewhere.
-
- AC_SUBST(MAKEDEPEND)
--
--if test -x "../nx-X11/config/makedepend/makedepend" ; then
-- MAKEDEPEND=../nx-X11/config/makedepend/makedepend
--else
-- if test -x "/usr/X11R6/bin/makedepend" ; then
-- MAKEDEPEND=/usr/X11R6/bin/makedepend
-- else
-- if test -x "/usr/openwin/bin/makedepend" ; then
-- MAKEDEPEND=/usr/openwin/bin/makedepend
-- else
-- MAKEDEPEND=makedepend
-- fi
-- fi
--fi
-+MAKEDEPEND=`which makedepend`
-
- AC_OUTPUT(Makefile)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150325/5b3e3ab1/attachment.html>
More information about the macports-changes
mailing list