head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.14
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.12
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.10
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.8
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.6
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.4
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.2
	pkgsrc-2008Q3-base:1.2
	pkgsrc-base:1.1.1.1
	TNF:1.1.1;
locks; strict;
comment	@# @;


1.2
date	2008.09.22.19.54.27;	author joerg;	state dead;
branches;
next	1.1;

1.1
date	2008.09.22.19.43.11;	author joerg;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2008.09.22.19.43.11;	author joerg;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Revert old state after mistyped cvs import.
@
text
@diff -uNr ../bakefile-0.2.0.orig/rules/autoconf.bkl rules/autoconf.bkl
--- ../bakefile-0.2.0.orig/rules/autoconf.bkl	2006-01-22 23:31:00.000000000 +0000
+++ rules/autoconf.bkl	2006-07-03 20:34:27.000000000 +0000
@@@@ -160,61 +160,18 @@@@
 
         <set var="__linkname1">$(__linkname)</set>
         
-        <set var="__targetsuf2">
-            <if cond="USE_SOVERSION=='1' and PLATFORM_MACOSX=='0'">
-                $(DLLEXT).$(__soversion1)
-            </if>
-            <if cond="USE_SOVERSION=='1' and PLATFORM_MACOSX=='1'">
-                .$(__soversion1)$(DLLEXT)
-            </if>
-            <if cond="USE_SOVERSION=='0'">$(DLLEXT)</if>
-        </set>
+        <set var="__targetsuf2">$(DLLEXT)</set>
         <set var="__linkname2" eval="0">
             $(DLLPREFIX)$(__dllname)$(__targetsuf2)
         </set>
         
-        <set var="__targetsuf3">
-            <if cond="USE_SOVERSION=='1' and PLATFORM_MACOSX=='0' and USE_SOVERCYGWIN=='0'">
-                $(DLLEXT).$(__soversion1).$(__soversion2).$(__soversion3)
-            </if>
-            <if cond="USE_SOVERSION=='1' and PLATFORM_MACOSX=='1'">
-                .$(__soversion1).$(__soversion2).$(__soversion3)$(DLLEXT)
-            </if>
-            <if cond="USE_SOVERSION=='1' and USE_SOVERCYGWIN=='1'">
-                -$(__soversion1)$(DLLEXT)
-            </if>
-            <if cond="USE_SOVERSION=='0'">$(DLLEXT)</if>
-        </set>
+        <set var="__targetsuf3">$(DLLEXT)</set>
         <set var="__targetname" eval="0">
             $(DLLPREFIX)$(__dllname)$(__targetsuf3)
         </set>
         
-        <set var="__soname_flags">
-            <if cond="USE_SOVERLINUX=='1'"> <!-- Linux -->
-                $(SONAME_FLAG)$(__linkname2)
-            </if>
-            <if cond="USE_SOVERSOLARIS=='1'"> <!-- Solaris -->
-                $(SONAME_FLAG)$(__targetname)
-            </if>
-        </set>
+        <set var="__soname_flags">-version-number $(__soversion1):$(__soversion2):$(__soversion3)</set>
         <ldflags>$(__soname_flags)</ldflags>
-
-        <set var="__so_symlinks_cmd">
-            <if cond="USE_SOSYMLINKS=='1'">
-                (cd $(pathPrefixToPath(__targetdir));
-                $(RM) $(__linkname1) $(__linkname2);
-                $(LN_S) $(__targetname) $(__linkname2);
-                $(LN_S) $(__linkname2) $(__linkname1))
-            </if>
-        </set>
-        <set var="__so_symlinks_inst_cmd">
-            <if cond="USE_SOSYMLINKS=='1'">
-                $(RM) $(__linkname1) $(__linkname2);
-                $(LN_S) $(__targetname) $(__linkname2);
-                $(LN_S) $(__linkname2) $(__linkname1)
-            </if>
-        </set>
-        <__command>$(LF)$(__so_symlinks_cmd)</__command>
     
         <set var="__mac_instname">$(__linkname2)</set>
    
@@@@ -238,12 +195,6 @@@@
         <set var="__macinstname" eval="0">
             $(ifthenelse(__mac_instname=='',ref('__targetname',id),ref('__mac_instname',id)))
         </set>
-        <set var="__macinstnamecmd">
-            <if cond="PLATFORM_MACOSX=='1'">
-                -install_name $(value)/$(__macinstname)
-            </if>
-        </set>
-        <ldflags>$(__macinstnamecmd)</ldflags>
 
         <modify-target target="install_$(id)">
             <command>(cd $(DESTDIR)$(value) ; $(ref('__so_symlinks_inst_cmd',id)))</command>
diff -uNr ../bakefile-0.2.0.orig/rules/makefile.bkl rules/makefile.bkl
--- ../bakefile-0.2.0.orig/rules/makefile.bkl	2005-12-08 10:19:46.000000000 +0000
+++ rules/makefile.bkl	2006-03-20 22:04:43.000000000 +0000
@@@@ -604,7 +604,7 @@@@
         <define-tag name="install-to" rules="exe">
             <modify-target target="install_$(id)">
                 <command>
-                    $(INSTALL_PROGRAM) $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(value)
+                    ${LIBTOOL} --mode=install $(INSTALL_PROGRAM) $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(value)
                 </command>
             </modify-target>
         </define-tag>
@@@@ -612,8 +612,7 @@@@
         <define-tag name="install-to" rules="dll">
             <modify-target target="install_$(id)">
                 <command>
-                    $(INSTALL_DATA) $(ref('__targetdir',id))$(ref('__linkname',id)) $(DESTDIR)$(value)
-                    $(INSTALL_PROGRAM) $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(value)
+                    ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(value)
                 </command>
             </modify-target>
         </define-tag>
@@@@ -621,7 +620,7 @@@@
         <define-tag name="install-to" rules="module">
             <modify-target target="install_$(id)">
                 <command>
-                    $(INSTALL_PROGRAM) $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(value)
+                    ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(value)
                 </command>
             </modify-target>
         </define-tag>
@@@@ -629,7 +628,7 @@@@
         <define-tag name="install-to" rules="lib">
             <modify-target target="install_$(id)">
                 <command>
-                    $(INSTALL_DATA) $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(value)
+                    ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(value)
                 </command>
             </modify-target>
         </define-tag>
diff -uNr ../bakefile-0.2.0.orig/rules/makefile_defs_gnu.bkl rules/makefile_defs_gnu.bkl
--- ../bakefile-0.2.0.orig/rules/makefile_defs_gnu.bkl	2005-06-16 17:48:03.000000000 +0000
+++ rules/makefile_defs_gnu.bkl	2006-02-28 22:43:14.000000000 +0000
@@@@ -37,12 +37,12 @@@@
 
             <template id="__commands_templ_C">
                 <set var="__COMPILE_C_CMD" eval="0">
-                    $(CCC) -c -o $@@ $(__cflags) $(CPPDEPS) $&lt;
+                    ${LIBTOOL} --mode=compile --tag=CC $(CCC) -c -o $@@ $(__cflags) $(CPPDEPS) $&lt;
                 </set>
             </template>
             <template id="__commands_templ_CXX">
                 <set var="__COMPILE_CXX_CMD" eval="0">
-                    $(CXXC) -c -o $@@ $(__cxxflags) $(CPPDEPS) $&lt;
+                    ${LIBTOOL} --mode=compile --tag=CXX $(CXXC) -c -o $@@ $(__cxxflags) $(CPPDEPS) $&lt;
                 </set>
             </template>
 
diff -uNr ../bakefile-0.2.0.orig/rules/makefile_defs_unix.bkl rules/makefile_defs_unix.bkl
--- ../bakefile-0.2.0.orig/rules/makefile_defs_unix.bkl	2005-03-13 22:50:03.000000000 +0000
+++ rules/makefile_defs_unix.bkl	2006-03-20 21:30:47.000000000 +0000
@@@@ -15,20 +15,21 @@@@
 
     <set var="DIRSEP">/</set>
 
-    <set var="OBJEXT">.o</set>
+    <set var="LIBTOOL">${LIBTOOL}</set>
+    <set var="OBJEXT">.lo</set>
     <set var="LIBEXT" overwrite="0">.a</set>
     <set var="LIBPREFIX" overwrite="0">lib</set>
     <set var="EXEEXT" overwrite="0"></set>
-    <set var="DLLEXT" overwrite="0">.so</set>
+    <set var="DLLEXT" overwrite="1">.la</set>
     <set var="DLLEXT_MODULE" overwrite="0">$(DLLEXT)</set>
     <set var="DLLIMPEXT" overwrite="0">$(DLLEXT)</set>
     <set var="DLLPREFIX" overwrite="0">$(LIBPREFIX)</set>
     <set var="DLLPREFIX_MODULE" overwrite="0">$(DLLPREFIX)</set>
-    <set var="PIC_CFLAGS" overwrite="0">-fPIC -DPIC</set>
+    <set var="PIC_CFLAGS" overwrite="0"></set>
 
-    <set var="INSTALL_PROGRAM" overwrite="0">install -c</set>
-    <set var="INSTALL_DATA" overwrite="0">$(INSTALL) -m 644</set>
-    <set var="INSTALL_DIR" overwrite="0">$(INSTALL) -d</set>
+    <set var="INSTALL_PROGRAM" overwrite="1">${BSD_INSTALL_PROGRAM}</set>
+    <set var="INSTALL_DATA" overwrite="1">${BSD_INSTALL_DATA}</set>
+    <set var="INSTALL_DIR" overwrite="1">${BSD_INSTALL_DATA_DIR}</set>
 
     <set var="AROPTIONS">rcu</set>
     <set var="RM">rm -f</set>
@@@@ -92,12 +93,12 @@@@
     <if cond="FORMAT!='gnu'">
         <template id="__commands_templ_C">
             <set var="__COMPILE_C_CMD" eval="0">
-                $(CCC) -c -o $@@ $(__cflags) $(src)
+                $(LIBTOOL) --mode=compile --tag=CC $(CCC) -c -o $@@ $(__cflags) $(src)
             </set>
         </template>
         <template id="__commands_templ_CXX">
             <set var="__COMPILE_CXX_CMD" eval="0">
-                $(CXXC) -c -o $@@ $(__cxxflags) $(src)
+                $(LIBTOOL) --mode=compile --tag=CXX $(CXXC) -c -o $@@ $(__cxxflags) $(src)
             </set>
         </template>
     </if>
@@@@ -105,18 +106,16 @@@@
 
     <template id="__commands_templ">
         <set var="__LINK_EXE_CMD" eval="0">
-            $(__linker) -o $@@ $(__objects_var) $(__ldflags) $(__ldlibs)
+            $(LIBTOOL) --mode=link $(__linker) -o $@@ $(__objects_var) $(__ldflags) $(__ldlibs)
         </set>        
         <set var="__LINK_LIB_CMD" eval="0">
-            $(RM) $@@
-            $(AR) $(AROPTIONS) $@@ $(__objects_var)
-            $(RANLIB) $@@
+            $(LIBTOOL) --mode=link --tag=CC $(CCC) -o $@@ $(__objects_var) $(__ldflags) $(__ldlibs)
         </set>
         <set var="__LINK_DLL_CMD" eval="0">
-            $(__dll_linker) $@@ $(__objects_var) $(__ldflags) $(__ldlibs)
+            $(LIBTOOL) --mode=link --tag=CC $(CCC) -rpath $(libdir) -o $@@ $(__objects_var) $(__ldflags) $(__ldlibs)
         </set>
         <set var="__LINK_MODULE_CMD" eval="0">
-            $(__module_linker) $@@ $(__objects_var) $(__ldflags) $(__ldlibs)
+            $(LIBTOOL) --mode=link --tag=CC $(CCC) -rpath $(libdir) -o $@@ $(__objects_var) $(__ldflags) $(__ldlibs)
         </set>
     </template>
     
@


1.1
log
@Initial revision
@
text
@@


1.1.1.1
log
@Reimport x11/wxGTK as x11/wxGTK24.
@
text
@@