[csw-devel] SF.net SVN: gar:[7020] csw/mgar/pkg/apr/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Thu Oct 29 16:47:27 CET 2009
Revision: 7020
http://gar.svn.sourceforge.net/gar/?rev=7020&view=rev
Author: dmichelsen
Date: 2009-10-29 15:47:27 +0000 (Thu, 29 Oct 2009)
Log Message:
-----------
apr: Adjust install destinations for 64 bit
Modified Paths:
--------------
csw/mgar/pkg/apr/trunk/Makefile
Removed Paths:
-------------
csw/mgar/pkg/apr/trunk/files/CSWapr-devel.depend
csw/mgar/pkg/apr/trunk/files/CSWapr-devel.gspec
csw/mgar/pkg/apr/trunk/files/CSWapr-devel.prototype
csw/mgar/pkg/apr/trunk/files/CSWapr.depend
csw/mgar/pkg/apr/trunk/files/CSWapr.gspec
csw/mgar/pkg/apr/trunk/files/CSWapr.prototype
Modified: csw/mgar/pkg/apr/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apr/trunk/Makefile 2009-10-29 15:07:06 UTC (rev 7019)
+++ csw/mgar/pkg/apr/trunk/Makefile 2009-10-29 15:47:27 UTC (rev 7020)
@@ -11,9 +11,6 @@
MASTER_SITES = http://apache.crihan.fr/dist/apr/
DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
-#DISTFILES += $(call admfiles,CSWapr,depend prototype)
-#DISTFILES += $(call admfiles,CSWapr-devel,depend prototype)
-DISTFILES += config.layout
# We define upstream file regex so we can be notifed of new upstream software release
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
@@ -25,26 +22,30 @@
CONFIGURE_ARGS += --enable-threads
CONFIGURE_ARGS += --enable-other-child
-# Tests verified: 1.3.8
-TEST_SCRIPTS =
+TEST_TARGET = check
include gar/category.mk
-pre-configure-modulated: install-layout
-
-install-layout:
- @sed -e s,INSTALL_PREFIX,$(prefix),g \
- $(WORKDIR)/config.layout > $(WORKDIR)/$(GARNAME)-$(GARVERSION)/config.layout
+post-extract-modulated:
+ ginstall -d $(WORKSRC)
+ (echo "# csw layout";\
+ echo "<Layout csw>";\
+ echo " prefix: $(prefix)";\
+ echo " exec_prefix: $(exec_prefix)";\
+ echo " bindir: $(bindir)";\
+ echo " sbindir: $(sbindir)";\
+ echo " libdir: $(libdir)";\
+ echo " libexecdir: $(libdir)/apr/modules";\
+ echo " mandir: $(mandir)";\
+ echo " datadir: $(datadir)/apr";\
+ echo " includedir: $(includedir)/apr-$${APR_MAJOR_VERSION}";\
+ echo " localstatedir: /var/run";\
+ echo " runtimedir: /var/run";\
+ echo " infodir: $(infodir)";\
+ echo " libsuffix: -$${APR_MAJOR_VERSION}";\
+ echo "</Layout>") >$(WORKSRC)/config.layout
@$(MAKECOOKIE)
-post-install: create-link fix-libtool
-
-create-link:
- @( cd $(DESTDIR)$(bindir) ; ln -s apr-1-config apr-config )
+post-install-modulated:
+ gln -s apr-1-config $(DESTDIR)$(bindir)/apr-config
@$(MAKECOOKIE)
-
-fix-libtool:
- @sed -i -e s,/export/home/comand/bin/sed,$(bindir)/gsed,g \
- $(DESTDIR)$(datadir)/apr/build-1/libtool
- @$(MAKECOOKIE)
-
Deleted: csw/mgar/pkg/apr/trunk/files/CSWapr-devel.depend
===================================================================
--- csw/mgar/pkg/apr/trunk/files/CSWapr-devel.depend 2009-10-29 15:07:06 UTC (rev 7019)
+++ csw/mgar/pkg/apr/trunk/files/CSWapr-devel.depend 2009-10-29 15:47:27 UTC (rev 7020)
@@ -1 +0,0 @@
-P CSWapr apr - Apache Portable Runtime
Deleted: csw/mgar/pkg/apr/trunk/files/CSWapr-devel.gspec
===================================================================
--- csw/mgar/pkg/apr/trunk/files/CSWapr-devel.gspec 2009-10-29 15:07:06 UTC (rev 7019)
+++ csw/mgar/pkg/apr/trunk/files/CSWapr-devel.gspec 2009-10-29 15:47:27 UTC (rev 7020)
@@ -1,5 +0,0 @@
-%var bitname apr_devel
-%var pkgname CSWapr-devel
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%var desc Apache Portable Runtime
-%copyright url file://%{WORKSRC}/LICENSE
Deleted: csw/mgar/pkg/apr/trunk/files/CSWapr-devel.prototype
===================================================================
--- csw/mgar/pkg/apr/trunk/files/CSWapr-devel.prototype 2009-10-29 15:07:06 UTC (rev 7019)
+++ csw/mgar/pkg/apr/trunk/files/CSWapr-devel.prototype 2009-10-29 15:47:27 UTC (rev 7020)
@@ -1,52 +0,0 @@
-d none /opt/csw/include 0755 root bin
-d none /opt/csw/include/apr-1 0755 root bin
-f none /opt/csw/include/apr-1/apr.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_allocator.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_atomic.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_dso.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_env.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_errno.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_file_info.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_file_io.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_fnmatch.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_general.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_getopt.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_global_mutex.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_hash.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_inherit.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_lib.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_mmap.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_network_io.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_poll.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_pools.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_portable.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_proc_mutex.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_random.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_ring.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_shm.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_signal.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_strings.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_support.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_tables.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_thread_cond.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_thread_mutex.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_thread_proc.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_thread_rwlock.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_time.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_user.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_version.h 0644 root bin
-f none /opt/csw/include/apr-1/apr_want.h 0644 root bin
-d none /opt/csw/lib 0755 root bin
-f none /opt/csw/lib/apr.exp 0644 root bin
-f none /opt/csw/lib/libapr-1.a 0644 root bin
-f none /opt/csw/lib/libapr-1.la 0755 root bin
-d none /opt/csw/lib/pkgconfig 0755 root bin
-f none /opt/csw/lib/pkgconfig/apr-1.pc 0644 root bin
-d none /opt/csw/share 0755 root bin
-d none /opt/csw/share/apr 0755 root bin
-d none /opt/csw/share/apr/build-1 0755 root bin
-f none /opt/csw/share/apr/build-1/apr_rules.mk 0644 root bin
-f none /opt/csw/share/apr/build-1/libtool 0755 root bin
-f none /opt/csw/share/apr/build-1/make_exports.awk 0644 root bin
-f none /opt/csw/share/apr/build-1/make_var_export.awk 0644 root bin
-f none /opt/csw/share/apr/build-1/mkdir.sh 0755 root bin
Deleted: csw/mgar/pkg/apr/trunk/files/CSWapr.depend
===================================================================
--- csw/mgar/pkg/apr/trunk/files/CSWapr.depend 2009-10-29 15:07:06 UTC (rev 7019)
+++ csw/mgar/pkg/apr/trunk/files/CSWapr.depend 2009-10-29 15:47:27 UTC (rev 7020)
@@ -1 +0,0 @@
-I CSWapache2rt
Deleted: csw/mgar/pkg/apr/trunk/files/CSWapr.gspec
===================================================================
--- csw/mgar/pkg/apr/trunk/files/CSWapr.gspec 2009-10-29 15:07:06 UTC (rev 7019)
+++ csw/mgar/pkg/apr/trunk/files/CSWapr.gspec 2009-10-29 15:47:27 UTC (rev 7020)
@@ -1,4 +0,0 @@
-%var bitname apr
-%var pkgname CSWapr
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright url file://%{WORKSRC}/LICENSE
Deleted: csw/mgar/pkg/apr/trunk/files/CSWapr.prototype
===================================================================
--- csw/mgar/pkg/apr/trunk/files/CSWapr.prototype 2009-10-29 15:07:06 UTC (rev 7019)
+++ csw/mgar/pkg/apr/trunk/files/CSWapr.prototype 2009-10-29 15:47:27 UTC (rev 7020)
@@ -1,7 +0,0 @@
-d none /opt/csw/bin 0755 root bin
-f none /opt/csw/bin/apr-1-config 0755 root bin
-s none /opt/csw/bin/apr-config=apr-1-config root bin
-d none /opt/csw/lib 0755 root bin
-f none /opt/csw/lib/libapr-1.so.0.2.2 0755 root bin
-s none /opt/csw/lib/libapr-1.so.0=libapr-1.so.0.2.2 root bin
-s none /opt/csw/lib/libapr-1.so=libapr-1.so.0.2.2 root bin
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list