Move building of packaging files into configure.

diff --git a/Makefile.am b/Makefile.am
index 6b98367..84148a0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,19 +13,13 @@ dist-hook:
 
 SUBDIRS = doc schemas saml samltest samlsign
 
-GENFILES = opensaml.spec pkginfo Portfile
-
 if DX_COND_doc
-all-local: doxygen-doc $(GENFILES)
+all-local: doxygen-doc
 else
-all-local: $(GENFILES)
+all-local:
 endif
 
-$(GENFILES): %: %.in Makefile
-       rm -f $@.tmp
-       sed < $@.in > $@.tmp \
-           -e 's:@-VERSION-@:${VERSION}:'
-       mv $@.tmp $@
+GENFILES = opensaml.spec pkginfo Portfile
 
 EXTRA_DIST = $(DX_CONFIG) \
        cpp-opensaml2.sln \
@@ -38,5 +32,3 @@ EXTRA_DIST = $(DX_CONFIG) \
        $(GENFILES:%=%.in) \
        depend \
        postinstall
-
-DISTCLEANFILES = $(GENFILES)

diff --git a/Portfile.in b/Portfile.in
index ae3aa87..c6ecd2a 100644 (file)
--- a/Portfile.in
+++ b/Portfile.in
@@ -1,22 +1,29 @@
 PortSystem 1.0
 
-name               opensaml
-version            @-VERSION-@
-categories         shibboleth
-maintainers        cantor.2@osu.edu
-description        OpenSAML 2 library for C++
-long_description   SAML 2.0/1.x toolkit
-homepage           http://www.opensaml.org/
-master_sites       http://shibboleth.internet2.edu/downloads/opensaml/cpp/${version}/
-checksums          sha1 @CHECKSUM@
+name                @PACKAGE@
+version             @PACKAGE_VERSION@
+categories          lang shibboleth security xml
+maintainers         scantor snc
+description         OpenSAML 2 library for C++
+long_description    SAML 2.0/1.x toolkit
+homepage            http://www.opensaml.org/
+master_sites        http://shibboleth.internet2.edu/downloads/opensaml/cpp/${version}/
 
-depends_lib        port:xmltooling \
-                   port:xml-security-c \
-                   port:xercesc \
-                   port:log4shib
+platforms           darwin
 
-configure.args     --disable-static \
-                   --with-log4shib=${prefix} \
-                   --with-xmltooling=${prefix} \
-                   --with-xerces=${prefix} \
-                   --with-xmlsec=${prefix}
+depends_lib         port:xmltooling \
+                    port:xml-security-c \
+                    port:xercesc3 \
+                    port:log4shib
+
+checksums           sha1 @CHECKSUM@
+
+configure.args      --disable-static \
+                    --with-xmltooling=${prefix} \
+                    --with-xerces=${prefix} \
+                    --with-xmlsec=${prefix}
+
+
+livecheck.check     regex
+livecheck.url       http://shibboleth.internet2.edu/downloads/shibboleth/cppsp/latest/mac/ports/shibboleth/opensaml/Portfile
+livecheck.regex     "version *(\\d+\\.\\d+(\\.\\d+)?)"

diff --git a/configure.ac b/configure.ac
index a5185f6..58a57b1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -273,5 +273,7 @@ AM_CONDITIONAL(BUILD_UNITTEST,test -f ${CXXTEST})
 AC_SUBST(DX_INCLUDE)
 LIBTOOL="$LIBTOOL --silent"
 
-# output makefiles
-AC_OUTPUT(Makefile saml/Makefile samltest/Makefile samlsign/Makefile schemas/Makefile doc/Makefile)
+# output packaging and makefiles
+AC_CONFIG_FILES([opensaml.spec pkginfo Portfile])
+AC_CONFIG_FILES([Makefile saml/Makefile samltest/Makefile samlsign/Makefile schemas/Makefile doc/Makefile])
+AC_OUTPUT

diff --git a/opensaml.spec.in b/opensaml.spec.in
index 725b37d..507fbce 100644 (file)
--- a/opensaml.spec.in
+++ b/opensaml.spec.in
@@ -1,5 +1,5 @@
-Name:          opensaml
-Version:       @-VERSION-@
+Name:          @PACKAGE@
+Version:       @PACKAGE_VERSION@
 Release:       1
 Summary:    OpenSAML SAML library
 Group:         System Environment/Libraries
@@ -81,7 +81,7 @@ OpenSAML is an open source implementation of the OASIS Security Assertion
 Markup Language Specification. It contains a set of open source C++ classes
 that support the SAML 1.0, 1.1, and 2.0 specifications.
 
-This package includes files needed for development with opensaml.
+This package includes files needed for development with OpenSAML.
 
 
 %prep
@@ -126,8 +126,8 @@ This package includes files needed for development with opensaml.
 %defattr(-,root,root,-)
 %endif
 %{_libdir}/libsaml.so.*
-%dir %{_datadir}/xml/%{name}
-%{_datadir}/xml/%{name}/*
+%dir %{_datadir}/xml/@PACKAGE@
+%{_datadir}/xml/@PACKAGE@/*
 
 %if 0%{?suse_version} > 1030
 %files -n libsaml-devel

diff --git a/pkginfo.in b/pkginfo.in
index 3eea786..fd454cc 100644 (file)
--- a/pkginfo.in
+++ b/pkginfo.in
@@ -1,5 +1,5 @@
 PKG=SHIBosaml
-VERSION=@-VERSION-@
+VERSION=@PACKAGE_VERSION@
 NAME=opensaml-c
 CATEGORY=application,security
 DESC=OpenSAML library for C++