测试pkg打包

Author: hestiacn

.github/workflows/build.yml

@@ -557,6 +557,12 @@ jobs:
             pkg install -y perl5 p5-JSON-XS p5-Try-Tiny p5-MaxMind-DB-Reader wget
           run: |
             cd /home/runner/work/vstats/vstats/make
+            echo "=== 检测 Perl 操作系统名称 ==="
+            perl -e 'print "OS: $^O\n";'
+            echo "=== 检查 /etc/freebsd-version 文件 ==="
+            ls -la /etc/freebsd-version || echo "文件不存在"
+            cat /etc/freebsd-version 2>/dev/null || echo "无法读取"
+            echo "=== 运行打包脚本 ==="
             perl makepack-awstats.pl --target=PKG
         
       - name: 上传 FreeBSD 包

make/makepack-awstats.pl

@@ -57,7 +57,10 @@
 
 # 检测操作系统
 sub detect_os {
-    if ($^O =~ /linux/i || (-d "/etc" && -d "/var" && $^O !~ /cygwin/i)) { 
+    if (-f "/etc/freebsd-version") { 
+        return 'freebsd'; 
+    }
+    elsif ($^O =~ /linux/i || (-d "/etc" && -d "/var" && $^O !~ /cygwin/i)) { 
         return 'linux'; 
     }
     elsif (-d "/etc" && -d "/Users") { 
@@ -530,7 +533,7 @@ sub build_pkg {
     print "=" x 60, "\n";
 
     # 步骤1: 检查是否在 FreeBSD 系统
-    if (! -f "/etc/freebsd-version") {
+    if ($OS ne 'freebsd') {
         print "  ⚠️ Not running on FreeBSD, skipping pkg build\n";
         print "  💡 FreeBSD packages must be built on FreeBSD system\n";
         return undef;
@@ -561,9 +564,17 @@ sub build_pkg {
     print $mf $makefile_content;
     close $mf;
 
-    # 创建 files 目录并复制源码
-    make_path("$port_dir/www/awstats/files");
-    system("cp -pr '$SOURCE'/* '$port_dir/www/awstats/files/' 2>/dev/null");
+    # 复制源码到 port 的 files 目录或 distdir
+    my $src_dir = "$BUILDROOT/$filename";
+    if (!-d $src_dir) {
+        print "  ❌ Source directory not found: $src_dir\n";
+        return undef;
+    }
+    
+    # FreeBSD ports 期望源码在 distdir 或者 files 目录
+    # 创建软链接或直接复制
+    make_path("$port_dir/www/awstats/work");
+    system("ln -sf '$src_dir' '$port_dir/www/awstats/work/$PROJECT-$version' 2>/dev/null");
 
     print "  ✅ Port directory created at: $port_dir/www/awstats\n";
 
@@ -586,14 +597,9 @@ sub build_pkg {
 
     # 步骤4: 查找生成的包
     print "\n📋 Step 4: Locating generated package...\n";
-    my $pkg_file = `find work/pkg -name "*.pkg" -type f 2>/dev/null | head -1`;
+    my $pkg_file = `find . -name "*.pkg" -type f 2>/dev/null | head -1`;
     chomp $pkg_file;
 
-    if (!$pkg_file || !-f $pkg_file) {
-        $pkg_file = `find . -name "*.pkg" -type f | head -1`;
-        chomp $pkg_file;
-    }
-    
     if ($pkg_file && -f $pkg_file) {
         my $size = -s $pkg_file;
         print "  ✅ Package created: $pkg_file (" . int($size/1024) . " KB)\n";