Move building of packaging files into configure.

diff --git a/Makefile.am b/Makefile.am
index 69dd195..96b8823 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,24 +12,17 @@ SUBDIRS = $(WANT_SUBDIRS)
 
 DIST_SUBDIRS = doc schemas configs shibsp shibd adfs util apache nsapi_shib fastcgi odbc-store memcache-store selinux
 
-GENFILES = shibboleth.spec pkginfo Portfile
-
 if DX_COND_doc
-all-local: doxygen-doc $(GENFILES)
+all-local: doxygen-doc
 else
-all-local: $(GENFILES)
+all-local:
 endif
 
 dist-hook:
        rm -rf `find $(distdir)/isapi_shib -name .svn`
        rm -rf `find $(distdir)/doc/api -name .svn`
 
-$(GENFILES): %: %.in Makefile
-       rm -f $@.tmp
-       sed < $@.in > $@.tmp \
-           -e 's:@-VERSION-@:${VERSION}:'
-       mv $@.tmp $@
-
+GENFILES = shibboleth.spec pkginfo Portfile
 
 EXTRA_DIST = $(DX_CONFIG) \
     isapi_shib \
@@ -43,5 +36,3 @@ EXTRA_DIST = $(DX_CONFIG) \
     $(GENFILES:%=%.in) \
     depend \
     postinstall
-
-DISTCLEANFILES = $(GENFILES)

diff --git a/Portfile.in b/Portfile.in
index 865eb5a..2408f92 100644 (file)
--- a/Portfile.in
+++ b/Portfile.in
@@ -1,13 +1,13 @@
 PortSystem 1.0
 
-name               shibboleth
-version            @-VERSION-@
+name               @PACKAGE@
+version            @PACKAGE_VERSION@
 categories         security www shibboleth
 maintainers        scantor snc
 description        Shibboleth Native Service Provider
 long_description   Standards-based attribute-based Web SSO system
 homepage           http://shibboleth.internet2.edu/
-master_sites       http://shibboleth.internet2.edu/downloads/shibboleth/cppsp/${version}/
+master_sites       http://shibboleth.internet2.edu/downloads/${name}/cppsp/${version}/
 distname           ${name}-sp-${version}
 worksrcdir         ${name}-${version}
 checksums          sha1 @CHECKSUM@
@@ -48,23 +48,21 @@ variant odbc {
     configure.args-append --enable-odbc
 }
 
-destroot.keepdirs ${destroot}${prefix}/var/log/shibboleth ${destroot}${prefix}/var/log/httpd ${destroot}${prefix}/var/run/shibboleth
+destroot.keepdirs ${destroot}${prefix}/var/log/${name} ${destroot}${prefix}/var/log/httpd ${destroot}${prefix}/var/run/${name}
 
 destroot.args  NOKEYGEN=1
 
 post-destroot {
-       eval file delete [glob ${destroot}${prefix}/etc/shibboleth/*.logger]
-       eval file delete [glob ${destroot}${prefix}/etc/shibboleth/*.html]
-       eval file delete [glob ${destroot}${prefix}/etc/shibboleth/*.xml]
-       file delete ${destroot}${prefix}/etc/shibboleth/shibd-debian
-       file delete ${destroot}${prefix}/etc/shibboleth/shibd-redhat
-       file delete ${destroot}${prefix}/etc/shibboleth/shibd-osx.plist
-       eval file delete [glob ${destroot}${prefix}/lib/shibboleth/*.la]
+       eval file delete [glob ${destroot}${prefix}/etc/${name}/*.logger]
+       eval file delete [glob ${destroot}${prefix}/etc/${name}/*.html]
+       eval file delete [glob ${destroot}${prefix}/etc/${name}/*.xml]
+    eval file delete [glob ${destroot}${prefix}/etc/${name}/shibd-*]
+       eval file delete [glob ${destroot}${prefix}/lib/${name}/*.la]
 }
 
 startupitem.create      yes
 startupitem.name        shibd
-startupitem.executable  ${prefix}/sbin/shibd -F -f -p ${prefix}/var/run/shibboleth/shibd.pid
+startupitem.executable  ${prefix}/sbin/shibd -F -f -p ${prefix}/var/run/${name}/shibd.pid
 
 livecheck.check         regex
 livecheck.url           http://shibboleth.internet2.edu/downloads/shibboleth/cppsp/latest/mac/ports/shibboleth/shibboleth/Portfile

diff --git a/configure.ac b/configure.ac
index b033a36..fd07125 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -363,6 +363,8 @@ AC_SUBST(OPENSAMLXMLDIR)
 AC_SUBST(LITE_LIBS)
 AC_SUBST(XMLSEC_LIBS)
 
+AC_CONFIG_FILES([shibboleth.spec pkginfo Portfile])
+
 # output the underlying makefiles
 WANT_SUBDIRS="doc schemas configs shibsp shibd util"
 AC_CONFIG_FILES([Makefile doc/Makefile schemas/Makefile \
@@ -945,4 +947,3 @@ fi
 LIBTOOL="$LIBTOOL --silent"
 
 AC_OUTPUT
-

diff --git a/pkginfo.in b/pkginfo.in
index 53f2469..9df027f 100644 (file)
--- a/pkginfo.in
+++ b/pkginfo.in
@@ -1,5 +1,5 @@
 PKG=SHIBsp
-VERSION=@-VERSION-@
+VERSION=@PACKAGE_VERSION@
 BASEDIR=/
 NAME=shibboleth-sp
 CATEGORY=application,security

diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index d32461c..e0fd291 100644 (file)
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -1,5 +1,5 @@
-Name:          shibboleth
-Version:       @-VERSION-@
+Name:          @PACKAGE@
+Version:       @PACKAGE_VERSION@
 Release:       1
 Summary:    Open source system for attribute-based Web SSO
 Group:         System Environment/Libraries
@@ -205,9 +205,7 @@ sh ./keygen.sh -b
 %endif
 %{_sysconfdir}/%{name}/*.dist
 %{_sysconfdir}/%{name}/apache*.config
-%{_sysconfdir}/%{name}/shibd-redhat
-%{_sysconfdir}/%{name}/shibd-debian
-%{_sysconfdir}/%{name}/shibd-osx.plist
+%{_sysconfdir}/%{name}/shibd-*
 %attr(755, root, root) %{_sysconfdir}/%{name}/keygen.sh
 %attr(755, root, root) %{_sysconfdir}/%{name}/metagen.sh
 %{_sysconfdir}/%{name}/*.xsl