[29037] trunk/dports/devel/openslp

source_changes at macosforge.org source_changes at macosforge.org
Thu Sep 13 08:50:13 PDT 2007


Revision: 29037
          http://trac.macosforge.org/projects/macports/changeset/29037
Author:   nox at macports.org
Date:     2007-09-13 08:50:12 -0700 (Thu, 13 Sep 2007)

Log Message:
-----------
openslp:
 * Updated to 1.2.1 (patches are not needed anymore).
 * Added test support.
 * Added livecheck.
 * Added standard doc install.

Modified Paths:
--------------
    trunk/dports/devel/openslp/Portfile

Removed Paths:
-------------
    trunk/dports/devel/openslp/files/patch-test_Makefile.in_darwin
    trunk/dports/devel/openslp/files/patch-test_SLPDereg.dir_test.script
    trunk/dports/devel/openslp/files/patch-test_SLPDereg.dir_test.script_darwin
    trunk/dports/devel/openslp/files/patch-test_SLPEscape.dir_test.script_darwin
    trunk/dports/devel/openslp/files/patch-test_SLPFindAttrs.dir_test.script
    trunk/dports/devel/openslp/files/patch-test_SLPFindAttrs.dir_test.script_darwin
    trunk/dports/devel/openslp/files/patch-test_SLPFindSrvTypes.dir_test.script
    trunk/dports/devel/openslp/files/patch-test_SLPFindSrvTypes.dir_test.script_darwin
    trunk/dports/devel/openslp/files/patch-test_SLPFindSrvs.dir_test.script
    trunk/dports/devel/openslp/files/patch-test_SLPFindSrvs.dir_test.script_darwin
    trunk/dports/devel/openslp/files/patch-test_SLPOpen.dir_test.script
    trunk/dports/devel/openslp/files/patch-test_SLPOpen.dir_test.script_darwin
    trunk/dports/devel/openslp/files/patch-test_SLPParseSrvURL.dir_test.script_darwin
    trunk/dports/devel/openslp/files/patch-test_SLPReg.dir_test.script
    trunk/dports/devel/openslp/files/patch-test_SLPReg.dir_test.script_darwin
    trunk/dports/devel/openslp/files/patch-test_SLPUnescape.dir_test.script_darwin

Modified: trunk/dports/devel/openslp/Portfile
===================================================================
--- trunk/dports/devel/openslp/Portfile	2007-09-13 14:30:44 UTC (rev 29036)
+++ trunk/dports/devel/openslp/Portfile	2007-09-13 15:50:12 UTC (rev 29037)
@@ -3,7 +3,7 @@
 PortSystem      1.0
 
 name            openslp
-version         1.0.11
+version         1.2.1
 categories      devel net
 platforms       darwin
 maintainers     nomaintainer
@@ -19,78 +19,29 @@
     enterprise networks.
 
 homepage        http://www.openslp.org/
-master_sites    sourceforge \
-                macports:lt:lt
+master_sites    sourceforge
 
-distfiles-append \
-                ltconfig13:lt \
-                ltmain13:lt
+checksums       md5 ff9999d1b44017281dd00ed2c4d32330 \
+                sha1 47ab19154084d2b467f09525f5351e9ab7193cf9 \
+                rmd160 a31d516ba784ad893a740946082fe5e0f15a37ea
 
-checksums       ${name}-${version}${extract.suffix} \
-                    md5 0ec965956ad1f66850f050b19c828b55 \
-                ltconfig13 \
-                    md5 ea53f42a550c9f9e653758a8ed91574e \
-                ltmain13 \
-                    md5 e094ae92724c4015dbab97de151c2525
+depends_lib     port:openssl
 
-extract.only    ${name}-${version}${extract.suffix}
+configure.ldflags-append    -flat_namespace
 
-post-extract {
-    file copy -force ${distpath}/ltconfig13 ${worksrcpath}/ltconfig
-    file copy -force ${distpath}/ltmain13 ${worksrcpath}/ltmain.sh
-    cd ${worksrcpath}/doc
-    file delete -force CVS html/CVS html/IntroductionToSLP/CVS \
-        html/ProgrammersGuide/CVS html/UsersGuide/CVS rfc/CVS
-    system "chmod +x html rfc html/IntroductionToSLP html/ProgrammersGuide \
-        html/UsersGuide"
-}
+test.run        yes
+test.target     check
 
-set oslpTestDirs    [list SLPD_predicate_test SLPDereg SLPEscape \
-                    SLPFindAttrs SLPFindSrvTypes SLPFindSrvs SLPOpen \
-                    SLPParseSrvURL SLPReg SLPUnescape SLP_attr_test]
+set docdir      ${prefix}/share/doc/${name}-${version}
 
-patchfiles          patch-Makefile.in patch-test_SLPDereg.dir_test.script \
-                    patch-test_SLPFindAttrs.dir_test.script \
-                    patch-test_SLPFindSrvTypes.dir_test.script \
-                    patch-test_SLPFindSrvs.dir_test.script \
-                    patch-test_SLPOpen.dir_test.script \
-                    patch-test_SLPReg.dir_test.script
+destroot.args   DOC_DIR=${docdir}
 
-post-patch {
-    cd ${worksrcpath}/test
-    foreach oslpATestDir ${oslpTestDirs} {
-        # Since this is prior to the darwin-specific post-patch, the dirs
-        # haven't been renamed to *.dir yet
-        set oslpTestScript	${oslpATestDir}/test.script
-        if {[file exists ${oslpTestScript}]} {
-            reinplace "s|@@PREFIX@@|${prefix}|g" ${oslpTestScript}
-        }
-    }
+post-destroot {
+    xinstall -m 0644 -W ${worksrcpath} AUTHORS COPYING ChangeLog FAQ NEWS README THANKS \
+        ${destroot}${docdir}
 }
 
-platform darwin {
-    # Need to rename some directories when on case-insensitive FS, as
-    # make will create, eg, slpdereg where the directory SLPDereg
-    # exists, which dies horribly on HFS+ (actual rename done in the
-    # post-patch section below)
-    patchfiles-append   patch-test_Makefile.in_darwin \
-                        patch-test_SLPEscape.dir_test.script_darwin \
-                        patch-test_SLPParseSrvURL.dir_test.script_darwin \
-                        patch-test_SLPUnescape.dir_test.script_darwin \
-                        patch-test_SLPDereg.dir_test.script_darwin \
-                        patch-test_SLPFindAttrs.dir_test.script_darwin \
-                        patch-test_SLPFindSrvTypes.dir_test.script_darwin \
-                        patch-test_SLPFindSrvs.dir_test.script_darwin \
-                        patch-test_SLPOpen.dir_test.script_darwin \
-                        patch-test_SLPReg.dir_test.script_darwin
+livecheck.check regex
+livecheck.url   ${homepage}
+livecheck.regex "OpenSLP (\\d+(?:\\.\\d+)*)"
 
-    post-patch {
-        file copy -force /usr/share/libtool/config.guess \
-            /usr/share/libtool/config.sub ${worksrcpath}
-        cd ${worksrcpath}/test
-        foreach oslpATestDir ${oslpTestDirs} {
-            file rename ${oslpATestDir} ${oslpATestDir}.dir
-        }
-    }
-}
-

Deleted: trunk/dports/devel/openslp/files/patch-test_Makefile.in_darwin
===================================================================
--- trunk/dports/devel/openslp/files/patch-test_Makefile.in_darwin	2007-09-13 14:30:44 UTC (rev 29036)
+++ trunk/dports/devel/openslp/files/patch-test_Makefile.in_darwin	2007-09-13 15:50:12 UTC (rev 29037)
@@ -1,86 +0,0 @@
---- test/Makefile.in.orig	Mon Mar 10 21:24:30 2003
-+++ test/Makefile.in	Thu May  6 16:39:50 2004
-@@ -73,10 +73,10 @@
- 
- EXTRA_DIST = slp_debug.h 
- 
--TESTS = SLPOpen/test.script SLPFindSrvTypes/test.script          SLPFindSrvs/test.script SLPReg/test.script               SLPDereg/test.script SLPFindAttrs/test.script            SLPParseSrvURL/test.script SLPEscape/test.script         SLPUnescape/test.script 
-+TESTS = SLPOpen.dir/test.script SLPFindSrvTypes.dir/test.script          SLPFindSrvs.dir/test.script SLPReg.dir/test.script               SLPDereg.dir/test.script SLPFindAttrs.dir/test.script            SLPParseSrvURL.dir/test.script SLPEscape.dir/test.script         SLPUnescape.dir/test.script 
- 
- 
--XFAIL_TESTS = SLPFindAttrs/test.script
-+XFAIL_TESTS = SLPFindAttrs.dir/test.script
- 
- INCLUDES = -I$(top_srcdir)/libslp -I$(top_srcdir)/libslpattr            -I$(top_srcdir)/common -I$(top_srcdir)/slpd
- 
-@@ -95,7 +95,7 @@
- # Automake 1.4 doesn't allow subdirectory dependencies :-(, VPATH is a 
- # kludge to get around that. It's either this or a makefile for each test.
- 
--VPATH = $(srcdir):$(srcdir)/SLPDereg:$(srcdir)/SLPEscape:$(srcdir)/SLPFindAttrs:$(srcdir)/SLPFindSrvTypes:$(srcdir)/SLPFindSrvs:$(srcdir)/SLPOpen:$(srcdir)/SLPParseSrvURL:$(srcdir)/SLPReg:$(srcdir)/SLPUnescape:$(srcdir)/SLP_attr_test:$(srcdir)/SLPD_predicate_test
-+VPATH = $(srcdir):$(srcdir)/SLPDereg.dir:$(srcdir)/SLPEscape.dir:$(srcdir)/SLPFindAttrs.dir:$(srcdir)/SLPFindSrvTypes.dir:$(srcdir)/SLPFindSrvs.dir:$(srcdir)/SLPOpen.dir:$(srcdir)/SLPParseSrvURL.dir:$(srcdir)/SLPReg.dir:$(srcdir)/SLPUnescape.dir:$(srcdir)/SLP_attr_test.dir:$(srcdir)/SLPD_predicate_test.dir
- 
- # Program names are in lower case because they conflict with directory names
- slpdereg_SOURCES = SLPDereg.c
-@@ -333,23 +333,23 @@
- 	  fi; \
- 	done
- 	$(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
--SLPDereg.o: ./SLPDereg/SLPDereg.c ../libslp/slp.h slp_debug.h
--SLPEscape.o: ./SLPEscape/SLPEscape.c ../libslp/slp.h slp_debug.h
--SLPFindAttrs.o: ./SLPFindAttrs/SLPFindAttrs.c ../libslp/slp.h \
-+SLPDereg.o: ./SLPDereg.dir/SLPDereg.c ../libslp/slp.h slp_debug.h
-+SLPEscape.o: ./SLPEscape.dir/SLPEscape.c ../libslp/slp.h slp_debug.h
-+SLPFindAttrs.o: ./SLPFindAttrs.dir/SLPFindAttrs.c ../libslp/slp.h \
- 	slp_debug.h
--SLPFindSrvTypes.o: ./SLPFindSrvTypes/SLPFindSrvTypes.c ../libslp/slp.h \
-+SLPFindSrvTypes.o: ./SLPFindSrvTypes.dir/SLPFindSrvTypes.c ../libslp/slp.h \
- 	slp_debug.h
--SLPFindSrvs.o: ./SLPFindSrvs/SLPFindSrvs.c ../libslp/slp.h slp_debug.h
--SLPOpen.o: ./SLPOpen/SLPOpen.c ../libslp/slp.h slp_debug.h
--SLPParseSrvURL.o: ./SLPParseSrvURL/SLPParseSrvURL.c ../libslp/slp.h \
-+SLPFindSrvs.o: ./SLPFindSrvs.dir/SLPFindSrvs.c ../libslp/slp.h slp_debug.h
-+SLPOpen.o: ./SLPOpen.dir/SLPOpen.c ../libslp/slp.h slp_debug.h
-+SLPParseSrvURL.o: ./SLPParseSrvURL.dir/SLPParseSrvURL.c ../libslp/slp.h \
- 	slp_debug.h
--SLPReg.o: ./SLPReg/SLPReg.c ../libslp/slp.h slp_debug.h
--SLPUnescape.o: ./SLPUnescape/SLPUnescape.c ../libslp/slp.h slp_debug.h
--slp_attr_test.o: ./SLP_attr_test/slp_attr_test.c ../libslp/slp.h \
-+SLPReg.o: ./SLPReg.dir/SLPReg.c ../libslp/slp.h slp_debug.h
-+SLPUnescape.o: ./SLPUnescape.dir/SLPUnescape.c ../libslp/slp.h slp_debug.h
-+slp_attr_test.o: ./SLP_attr_test.dir/slp_attr_test.c ../libslp/slp.h \
- 	../libslpattr/libslpattr.h \
- 	../libslpattr/../common/slp_compare.h \
- 	../libslpattr/../libslp/slp.h
--slpd_predicate_test.o: ./SLPD_predicate_test/slpd_predicate_test.c \
-+slpd_predicate_test.o: ./SLPD_predicate_test.dir/slpd_predicate_test.c \
- 	../libslpattr/libslpattr.h \
- 	../libslpattr/../common/slp_compare.h \
- 	../libslpattr/../libslp/slp.h
-@@ -458,16 +458,16 @@
- # Remove all lines from VPATH (inclusive) to this line and uncomment
- # the following lines when Automake 1.5 is released
- #
--# slpdereg_SOURCES = SLPDereg/SLPDereg.c
--# slpescape_SOURCES = SLPEscape/SLPEscape.c
--# slpfindattrs_SOURCES = SLPFindAttrs/SLPFindAttrs.c
--# slpfindsrvs_SOURCES = SLPFindSrvs/SLPFindSrvs.c
--# slpfindsrvtypes_SOURCES = SLPFindSrvTypes/SLPFindSrvTypes.c
--# slpopen_SOURCES = SLPOpen/SLPOpen.c
--# slpparsesrvurl_SOURCES = SLPParseSrvURL/SLPParseSrvURL.c
--# slpreg_SOURCES = SLPReg/SLPReg.c
--# slpunescape_SOURCES = SLPUnescape/SLPUnescape.c
--# slp_attr_test_SOURCES = SLP_attr_test/slp_attr_test.c
-+# slpdereg_SOURCES = SLPDereg.dir/SLPDereg.c
-+# slpescape_SOURCES = SLPEscape.dir/SLPEscape.c
-+# slpfindattrs_SOURCES = SLPFindAttrs.dir/SLPFindAttrs.c
-+# slpfindsrvs_SOURCES = SLPFindSrvs.dir/SLPFindSrvs.c
-+# slpfindsrvtypes_SOURCES = SLPFindSrvTypes.dir/SLPFindSrvTypes.c
-+# slpopen_SOURCES = SLPOpen.dir/SLPOpen.c
-+# slpparsesrvurl_SOURCES = SLPParseSrvURL.dir/SLPParseSrvURL.c
-+# slpreg_SOURCES = SLPReg.dir/SLPReg.c
-+# slpunescape_SOURCES = SLPUnescape.dir/SLPUnescape.c
-+# slp_attr_test_SOURCES = SLP_attr_test.dir/slp_attr_test.c
- 
- clean-local:
- 	-rm -f *.output

Deleted: trunk/dports/devel/openslp/files/patch-test_SLPDereg.dir_test.script
===================================================================
--- trunk/dports/devel/openslp/files/patch-test_SLPDereg.dir_test.script	2007-09-13 14:30:44 UTC (rev 29036)
+++ trunk/dports/devel/openslp/files/patch-test_SLPDereg.dir_test.script	2007-09-13 15:50:12 UTC (rev 29037)
@@ -1,16 +0,0 @@
---- test/SLPDereg/test.script.orig	Sun Dec  3 23:58:17 2000
-+++ test/SLPDereg/test.script	Thu May  6 20:42:56 2004
-@@ -1,5 +1,6 @@
- #!/bin/sh
- 
-+PIDDIR=@@PREFIX@@/var/run
- echo "SLPDereg"
- rm -f SLPDereg.actual.output
- scriptdir=${srcdir}/SLPDereg
-@@ -10,5 +11,5 @@
- ./slpdereg service:registered 10.0.0.1 service:unregistered 10.0.0.1 >> SLPDereg.actual.output
- echo >> SLPDereg.actual.output
- ./slpdereg service:test 10.0.0.1 >> SLPDereg.actual.output
--if test -f /var/run/slpd.pid; then kill `cat /var/run/slpd.pid`; fi
-+if test -f ${PIDDIR}/slpd.pid; then kill `cat ${PIDDIR}/slpd.pid`; fi
- diff -c ${scriptdir}/SLPDereg.expected.output SLPDereg.actual.output

Deleted: trunk/dports/devel/openslp/files/patch-test_SLPDereg.dir_test.script_darwin
===================================================================
--- trunk/dports/devel/openslp/files/patch-test_SLPDereg.dir_test.script_darwin	2007-09-13 14:30:44 UTC (rev 29036)
+++ trunk/dports/devel/openslp/files/patch-test_SLPDereg.dir_test.script_darwin	2007-09-13 15:50:12 UTC (rev 29037)
@@ -1,11 +0,0 @@
---- test/SLPDereg/test.script.orig	Thu May  6 20:42:56 2004
-+++ test/SLPDereg/test.script	Thu May  6 20:43:55 2004
-@@ -3,7 +3,7 @@
- PIDDIR=@@PREFIX@@/var/run
- echo "SLPDereg"
- rm -f SLPDereg.actual.output
--scriptdir=${srcdir}/SLPDereg
-+scriptdir=${srcdir}/SLPDereg.dir
- 
- ../slpd/slpd -r ${scriptdir}/slp.test.reg 
- ./slpdereg service:registered 10.0.0.1 service:registered 10.0.0.1 >>  SLPDereg.actual.output

Deleted: trunk/dports/devel/openslp/files/patch-test_SLPEscape.dir_test.script_darwin
===================================================================
--- trunk/dports/devel/openslp/files/patch-test_SLPEscape.dir_test.script_darwin	2007-09-13 14:30:44 UTC (rev 29036)
+++ trunk/dports/devel/openslp/files/patch-test_SLPEscape.dir_test.script_darwin	2007-09-13 15:50:12 UTC (rev 29037)
@@ -1,11 +0,0 @@
---- test/SLPEscape/test.script.orig	Fri Aug  4 09:37:53 2000
-+++ test/SLPEscape/test.script	Thu May  6 16:52:16 2004
-@@ -2,7 +2,7 @@
- 
- echo "SLPEscape"
- rm -f SLPEscape.actual.output
--scriptdir=${srcdir}/SLPEscape
-+scriptdir=${srcdir}/SLPEscape.dir
- 
- ./slpescape asdf\(asdf > SLPEscape.actual.output
- echo >> SLPEscape.actual.output

Deleted: trunk/dports/devel/openslp/files/patch-test_SLPFindAttrs.dir_test.script
===================================================================
--- trunk/dports/devel/openslp/files/patch-test_SLPFindAttrs.dir_test.script	2007-09-13 14:30:44 UTC (rev 29036)
+++ trunk/dports/devel/openslp/files/patch-test_SLPFindAttrs.dir_test.script	2007-09-13 15:50:12 UTC (rev 29037)
@@ -1,16 +0,0 @@
---- test/SLPFindAttrs/test.script.orig	Sun Dec  3 23:58:17 2000
-+++ test/SLPFindAttrs/test.script	Thu May  6 20:45:47 2004
-@@ -1,5 +1,6 @@
- #!/bin/sh
- 
-+PIDDIR=@@PREFIX@@/var/run
- echo "SLPFindAttrs"
- rm -f SLPFindAttrs.actual.output 
- scriptdir=${srcdir}/SLPFindAttrs
-@@ -15,5 +16,5 @@
- echo >> SLPFindAttrs.actual.output
- ./slpfindattrs service:test 10.0.0.1 "(foo=value1,value2)" goo >> SLPFindAttrs.actual.output
- echo >> SLPFindAttrs.actual.output
--if test -f /var/run/slpd.pid; then kill `cat /var/run/slpd.pid`; fi
-+if test -f ${PIDDIR}/slpd.pid; then kill `cat ${PIDDIR}/slpd.pid`; fi
- diff -c ${scriptdir}/SLPFindAttrs.expected.output SLPFindAttrs.actual.output

Deleted: trunk/dports/devel/openslp/files/patch-test_SLPFindAttrs.dir_test.script_darwin
===================================================================
--- trunk/dports/devel/openslp/files/patch-test_SLPFindAttrs.dir_test.script_darwin	2007-09-13 14:30:44 UTC (rev 29036)
+++ trunk/dports/devel/openslp/files/patch-test_SLPFindAttrs.dir_test.script_darwin	2007-09-13 15:50:12 UTC (rev 29037)
@@ -1,11 +0,0 @@
---- test/SLPFindAttrs/test.script.orig	Thu May  6 20:45:47 2004
-+++ test/SLPFindAttrs/test.script	Thu May  6 20:46:19 2004
-@@ -3,7 +3,7 @@
- PIDDIR=@@PREFIX@@/var/run
- echo "SLPFindAttrs"
- rm -f SLPFindAttrs.actual.output 
--scriptdir=${srcdir}/SLPFindAttrs
-+scriptdir=${srcdir}/SLPFindAttrs.dir
- 
- ../slpd/slpd -r ${scriptdir}/slp.test.reg 
- ./slpfindattrs service:test 10.0.0.1 foo >> SLPFindAttrs.actual.output

Deleted: trunk/dports/devel/openslp/files/patch-test_SLPFindSrvTypes.dir_test.script
===================================================================
--- trunk/dports/devel/openslp/files/patch-test_SLPFindSrvTypes.dir_test.script	2007-09-13 14:30:44 UTC (rev 29036)
+++ trunk/dports/devel/openslp/files/patch-test_SLPFindSrvTypes.dir_test.script	2007-09-13 15:50:12 UTC (rev 29037)
@@ -1,16 +0,0 @@
---- test/SLPFindSrvTypes/test.script.orig	Sun Dec  3 23:58:17 2000
-+++ test/SLPFindSrvTypes/test.script	Thu May  6 20:47:18 2004
-@@ -1,5 +1,6 @@
- #!/bin/sh
- 
-+PIDDIR=@@PREFIX@@/var/run
- echo "SLPFindSrvTypes"
- rm -f SLPFindSrvTypes.actual.output
- scriptdir=${srcdir}/SLPFindSrvTypes
-@@ -13,5 +14,5 @@
- echo >> SLPFindSrvTypes.actual.output
- ./slpfindsrvtypes "OPENSLP" >> SLPFindSrvTypes.actual.output
- 
--if test -f /var/run/slpd.pid; then kill `cat /var/run/slpd.pid`; fi
-+if test -f ${PIDDIR}/slpd.pid; then kill `cat ${PIDDIR}/slpd.pid`; fi
- diff -c ${scriptdir}/SLPFindSrvTypes.expected.output SLPFindSrvTypes.actual.output

Deleted: trunk/dports/devel/openslp/files/patch-test_SLPFindSrvTypes.dir_test.script_darwin
===================================================================
--- trunk/dports/devel/openslp/files/patch-test_SLPFindSrvTypes.dir_test.script_darwin	2007-09-13 14:30:44 UTC (rev 29036)
+++ trunk/dports/devel/openslp/files/patch-test_SLPFindSrvTypes.dir_test.script_darwin	2007-09-13 15:50:12 UTC (rev 29037)
@@ -1,11 +0,0 @@
---- test/SLPFindSrvTypes/test.script.orig	Thu May  6 20:47:18 2004
-+++ test/SLPFindSrvTypes/test.script	Thu May  6 20:47:50 2004
-@@ -3,7 +3,7 @@
- PIDDIR=@@PREFIX@@/var/run
- echo "SLPFindSrvTypes"
- rm -f SLPFindSrvTypes.actual.output
--scriptdir=${srcdir}/SLPFindSrvTypes
-+scriptdir=${srcdir}/SLPFindSrvTypes.dir
- 
- ../slpd/slpd -r ${scriptdir}/slp.test.reg 
- ./slpfindsrvtypes "*" >> SLPFindSrvTypes.actual.output

Deleted: trunk/dports/devel/openslp/files/patch-test_SLPFindSrvs.dir_test.script
===================================================================
--- trunk/dports/devel/openslp/files/patch-test_SLPFindSrvs.dir_test.script	2007-09-13 14:30:44 UTC (rev 29036)
+++ trunk/dports/devel/openslp/files/patch-test_SLPFindSrvs.dir_test.script	2007-09-13 15:50:12 UTC (rev 29037)
@@ -1,15 +0,0 @@
---- test/SLPFindSrvs/test.script.orig	Sun Dec  3 23:59:02 2000
-+++ test/SLPFindSrvs/test.script	Thu May  6 20:48:40 2004
-@@ -1,10 +1,11 @@
- #!/bin/sh
- 
-+PIDDIR=@@PREFIX@@/var/run
- echo "SLPFindSrvs"
- rm -f SLPFindSrvs.actual.output
- scriptdir=${srcdir}/SLPFindSrvs
- 
- ../slpd/slpd -r ${scriptdir}/slp.test.reg 
- ./slpfindsrvs service:test >> SLPFindSrvs.actual.output
--if test -f /var/run/slpd.pid; then kill `cat /var/run/slpd.pid`; fi
-+if test -f ${PIDDIR}/slpd.pid; then kill `cat ${PIDDIR}/slpd.pid`; fi
- diff -c ${scriptdir}/SLPFindSrvs.expected.output SLPFindSrvs.actual.output

Deleted: trunk/dports/devel/openslp/files/patch-test_SLPFindSrvs.dir_test.script_darwin
===================================================================
--- trunk/dports/devel/openslp/files/patch-test_SLPFindSrvs.dir_test.script_darwin	2007-09-13 14:30:44 UTC (rev 29036)
+++ trunk/dports/devel/openslp/files/patch-test_SLPFindSrvs.dir_test.script_darwin	2007-09-13 15:50:12 UTC (rev 29037)
@@ -1,11 +0,0 @@
---- test/SLPFindSrvs/test.script.orig	Thu May  6 20:48:40 2004
-+++ test/SLPFindSrvs/test.script	Thu May  6 20:49:01 2004
-@@ -3,7 +3,7 @@
- PIDDIR=@@PREFIX@@/var/run
- echo "SLPFindSrvs"
- rm -f SLPFindSrvs.actual.output
--scriptdir=${srcdir}/SLPFindSrvs
-+scriptdir=${srcdir}/SLPFindSrvs.dir
- 
- ../slpd/slpd -r ${scriptdir}/slp.test.reg 
- ./slpfindsrvs service:test >> SLPFindSrvs.actual.output

Deleted: trunk/dports/devel/openslp/files/patch-test_SLPOpen.dir_test.script
===================================================================
--- trunk/dports/devel/openslp/files/patch-test_SLPOpen.dir_test.script	2007-09-13 14:30:44 UTC (rev 29036)
+++ trunk/dports/devel/openslp/files/patch-test_SLPOpen.dir_test.script	2007-09-13 15:50:12 UTC (rev 29037)
@@ -1,15 +0,0 @@
---- test/SLPOpen/test.script.orig	Sun Dec  3 23:59:02 2000
-+++ test/SLPOpen/test.script	Thu May  6 20:49:54 2004
-@@ -1,10 +1,11 @@
- #!/bin/sh 
- 
-+PIDDIR=@@PREFIX@@/var/run
- echo "SLPOpen"
- rm -f SLPOpen.actual.output
- scriptdir=${srcdir}/SLPOpen
- 
- ../slpd/slpd -r ${scriptdir}/slp.test.reg 
- ./slpopen > SLPOpen.actual.output
--if test -f /var/run/slpd.pid; then kill `cat /var/run/slpd.pid`; fi
-+if test -f ${PIDDIR}/slpd.pid; then kill `cat ${PIDDIR}/slpd.pid`; fi
- diff -c ${scriptdir}/SLPOpen.expected.output SLPOpen.actual.output

Deleted: trunk/dports/devel/openslp/files/patch-test_SLPOpen.dir_test.script_darwin
===================================================================
--- trunk/dports/devel/openslp/files/patch-test_SLPOpen.dir_test.script_darwin	2007-09-13 14:30:44 UTC (rev 29036)
+++ trunk/dports/devel/openslp/files/patch-test_SLPOpen.dir_test.script_darwin	2007-09-13 15:50:12 UTC (rev 29037)
@@ -1,11 +0,0 @@
---- test/SLPOpen/test.script.orig	Thu May  6 20:49:54 2004
-+++ test/SLPOpen/test.script	Thu May  6 20:50:16 2004
-@@ -3,7 +3,7 @@
- PIDDIR=@@PREFIX@@/var/run
- echo "SLPOpen"
- rm -f SLPOpen.actual.output
--scriptdir=${srcdir}/SLPOpen
-+scriptdir=${srcdir}/SLPOpen.dir
- 
- ../slpd/slpd -r ${scriptdir}/slp.test.reg 
- ./slpopen > SLPOpen.actual.output

Deleted: trunk/dports/devel/openslp/files/patch-test_SLPParseSrvURL.dir_test.script_darwin
===================================================================
--- trunk/dports/devel/openslp/files/patch-test_SLPParseSrvURL.dir_test.script_darwin	2007-09-13 14:30:44 UTC (rev 29036)
+++ trunk/dports/devel/openslp/files/patch-test_SLPParseSrvURL.dir_test.script_darwin	2007-09-13 15:50:12 UTC (rev 29037)
@@ -1,11 +0,0 @@
---- test/SLPParseSrvURL/test.script.orig	Fri Aug  4 09:37:53 2000
-+++ test/SLPParseSrvURL/test.script	Thu May  6 16:56:32 2004
-@@ -2,7 +2,7 @@
- 
- echo "SLPParseSrvURL"
- rm -f SLPParseSrvURL.actual.output
--scriptdir=${srcdir}/SLPParseSrvURL
-+scriptdir=${srcdir}/SLPParseSrvURL.dir
- 
- ./slpparsesrvurl service:test://10.0.0.1 > SLPParseSrvURL.actual.output
- echo >> SLPParseSrvURL.actual.output

Deleted: trunk/dports/devel/openslp/files/patch-test_SLPReg.dir_test.script
===================================================================
--- trunk/dports/devel/openslp/files/patch-test_SLPReg.dir_test.script	2007-09-13 14:30:44 UTC (rev 29036)
+++ trunk/dports/devel/openslp/files/patch-test_SLPReg.dir_test.script	2007-09-13 15:50:12 UTC (rev 29037)
@@ -1,16 +0,0 @@
---- test/SLPReg/test.script.orig	Sun Dec  3 23:59:02 2000
-+++ test/SLPReg/test.script	Thu May  6 20:51:07 2004
-@@ -1,5 +1,6 @@
- #!/bin/sh
- 
-+PIDDIR=@@PREFIX@@/var/run
- echo "SLPReg"
- rm -f SLPReg.actual.output
- scriptdir=${srcdir}/SLPReg
-@@ -8,5 +9,5 @@
- ./slpreg service:valid 10.0.0.1 service:valid >>  SLPReg.actual.output
- echo >> SLPReg.actual.output
- ./slpreg service:valid 10.0.0.1 service:invalid >> SLPReg.actual.output
--if test -f /var/run/slpd.pid; then kill `cat /var/run/slpd.pid`; fi
-+if test -f ${PIDDIR}/slpd.pid; then kill `cat ${PIDDIR}/slpd.pid`; fi
- diff -c ${scriptdir}/SLPReg.expected.output SLPReg.actual.output

Deleted: trunk/dports/devel/openslp/files/patch-test_SLPReg.dir_test.script_darwin
===================================================================
--- trunk/dports/devel/openslp/files/patch-test_SLPReg.dir_test.script_darwin	2007-09-13 14:30:44 UTC (rev 29036)
+++ trunk/dports/devel/openslp/files/patch-test_SLPReg.dir_test.script_darwin	2007-09-13 15:50:12 UTC (rev 29037)
@@ -1,11 +0,0 @@
---- test/SLPReg/test.script.orig	Thu May  6 20:51:07 2004
-+++ test/SLPReg/test.script	Thu May  6 20:51:30 2004
-@@ -3,7 +3,7 @@
- PIDDIR=@@PREFIX@@/var/run
- echo "SLPReg"
- rm -f SLPReg.actual.output
--scriptdir=${srcdir}/SLPReg
-+scriptdir=${srcdir}/SLPReg.dir
- 
- ../slpd/slpd 
- ./slpreg service:valid 10.0.0.1 service:valid >>  SLPReg.actual.output

Deleted: trunk/dports/devel/openslp/files/patch-test_SLPUnescape.dir_test.script_darwin
===================================================================
--- trunk/dports/devel/openslp/files/patch-test_SLPUnescape.dir_test.script_darwin	2007-09-13 14:30:44 UTC (rev 29036)
+++ trunk/dports/devel/openslp/files/patch-test_SLPUnescape.dir_test.script_darwin	2007-09-13 15:50:12 UTC (rev 29037)
@@ -1,11 +0,0 @@
---- test/SLPUnescape/test.script.orig	Fri Aug  4 09:37:54 2000
-+++ test/SLPUnescape/test.script	Thu May  6 16:58:04 2004
-@@ -2,7 +2,7 @@
- 
- echo "SLPUnescape"
- rm -f SLPUnescape.actual.output
--scriptdir=${srcdir}/SLPUnescape
-+scriptdir=${srcdir}/SLPUnescape.dir
- 
- ./slpunescape asdfasdf > SLPUnescape.actual.output
- echo >> SLPUnescape.actual.output

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070913/a5980b94/attachment.html


More information about the macports-changes mailing list