see CHANGELOG for details

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@543 04377dda-e619-0410-9926-eae83683ac58

diff --git a/trunk/doc/CHANGELOG b/trunk/doc/CHANGELOG
index 8a457d5764334e419c07f2dfa15728776b57ed9b..08bae3f5ffca42a78c76fc68d6d6b6654e8ea8bd 100644 (file)
--- a/trunk/doc/CHANGELOG
+++ b/trunk/doc/CHANGELOG
@@ -21,9 +21,13 @@ simplepkg changelog
       - default configuration making createpkg repository integrated with simplaret
       - new repositories
     - mkbuild: some svn check routines extended for git
+    - perl.mkSlackBuild
+       - added sections copy_init_scripts and copy_config_files
+    - generic.mkSlackBuild and per.mkSlackBuild
+      - clean_builds now compliant with standard --cleanup behaviour
+      - new section slack-required
     - generic.mkSlackBuild:
       - config() on postinstall_script now accepting .dist and .sample config file extensions
-      - clean_builds now compliant with standard --cleanup behaviour
       - added git_source section
     - createpkg:
       - new options --status, --update and --commit to manage subversion repository

diff --git a/trunk/mkbuild/generic.mkSlackBuild b/trunk/mkbuild/generic.mkSlackBuild
index 2f1bf99727b8eb1c0e018e9657e620e4d4c2facb..c889fde6846d0adc179d34a46136d07c5e9f6568 100644 (file)
--- a/trunk/mkbuild/generic.mkSlackBuild
+++ b/trunk/mkbuild/generic.mkSlackBuild
@@ -383,6 +383,7 @@ done
 
 <postinstall_script> off
 # Add a post-installation script (doinst.sh)
+mkdir -p "$PKG/install" || exit $ERROR_MKDIR
 cat << EOSCRIPT > "$PKG/install/doinst.sh"
 config() {
   NEW="\$1"
@@ -425,6 +426,14 @@ mkuser() {
 EOSCRIPT
 </postinstall_script>
 
+<slack_required> off
+# Copy slack-required
+mkdir -p "$PKG/install" || exit $ERROR_MKDIR
+if [ -f "$CWD/slack-required" ]; then
+  cp $CWD/slack-required $PKG/install
+fi
+</slack_required>
+
 <build_package> off
 # Build the package
 cd "$PKG"
@@ -433,7 +442,7 @@ makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERRO
 
 <clean_builds> off
 # Delete source and build directories if requested
-if [ "$CLEANUP" == "yes" ]; then
+if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
   rm -rf "$PKG_WORK" "$PKG"
 fi
 </clean_builds>

diff --git a/trunk/mkbuild/model.mkbuild b/trunk/mkbuild/model.mkbuild
index 86f0c2dada142b4cd8d44929370681ddd25485ef..a6ad02222e1355f5cd2b985e3cb469dfea2f7853 100644 (file)
--- a/trunk/mkbuild/model.mkbuild
+++ b/trunk/mkbuild/model.mkbuild
@@ -148,6 +148,7 @@ off: copy_config_files
  on: slackdesc
 off: move_config_files
 off: postinstall_script
+off: slack_required
  on: build_package
  on: clean_builds
 #<< End SlackBuild Sections

diff --git a/trunk/mkbuild/perl.mkSlackBuild b/trunk/mkbuild/perl.mkSlackBuild
index 130e2cdaeedbb8593e27e9b46cf1dc417fa20e3f..165dd40552d5a224378a935c8015b06e00fd26a2 100644 (file)
--- a/trunk/mkbuild/perl.mkSlackBuild
+++ b/trunk/mkbuild/perl.mkSlackBuild
@@ -256,6 +256,27 @@ if [ -d "$PKG/$PREFIX/info" ]; then
 fi
 </compress_info_files>
 
+<copy_init_scripts> off
+# Copy init scripts
+mkdir -p $PKG/etc/rc.d
+cp $CWD/rc.* $PKG/etc/rc.d/
+</copy_init_scripts>
+
+<copy_config_files> off
+# Copy config files
+mkdir -p $PKG/etc
+for conf in [[CONFIG FILES]]; do
+  mkdir -p $PKG/etc/`dirname $conf`
+  if [ -e "$CWD/conf/$conf" ]; then
+    cp -a $CWD/conf/$conf $PKG/etc/$conf
+  elif [ -e "$CWD/$conf" ]; then
+    cp -a $CWD/$conf $PKG/etc/$conf
+  elif [ -e "$conf" ]; then
+    cp -a $conf $PKG/etc/$conf
+  fi
+done
+</copy_config_files>
+
 <install_documentation> off
 # Install documentation
 DOCS="[[DOCUMENTATION FILES]]"
@@ -304,6 +325,14 @@ config path/to/config_file.new
 EOSCRIPT
 </postinstall_script>
 
+<slack_required> off
+# Copy slack-required
+mkdir -p "$PKG/install" || exit $ERROR_MKDIR
+if [ -f "$CWD/slack-required" ]; then
+  cp $CWD/slack-required $PKG/install
+fi
+</slack_required>
+
 <build_package> off
 # Build the package
 cd "$PKG"
@@ -312,7 +341,7 @@ makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERRO
 
 <clean_builds> off
 # Delete source and build directories if requested
-if [ "$CLEANUP" == "yes" ]; then
+if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
   rm -rf "$PKG_WORK" "$PKG"
 fi
 </clean_builds>