FreeBSD ports directory 對應表不能用 cpp 處理，因為有 - 號

3 files changed, 3 insertions, 13 deletions

diff --git a/Makefile b/Makefile
index fa27701..a6af80c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-#.POSIX:
+.POSIX:
 .PHONY: all clean debian freebsd
 .SUFFIXES: .pkg .list
 
@@ -19,3 +19,4 @@ freebsd.ports: freebsd.list
 
 clean:
 	rm -f *.control *.makefile *.ports *.list
+	rm -rf *.out
diff --git a/freebsd.pkg b/freebsd.pkg
index ff31599..c5ff1eb 100644
--- a/freebsd.pkg
+++ b/freebsd.pkg
@@ -1,9 +1,5 @@
 // vim: ft=c: et
 
-#ifdef WSPKG_FREEBSD_PORTS
-# include "freebsd.ports"
-#endif
-
 // ===========================================================================
 // Packages mapping started from here
 // ===========================================================================
diff --git a/freebsd.ports.sh b/freebsd.ports.sh
index fb81d0f..ed7b89d 100755
--- a/freebsd.ports.sh
+++ b/freebsd.ports.sh
@@ -29,13 +29,6 @@ msg "==> FreeBSD ports index file is ${index}"
 
 exec 3< "$1"       # list file
 
-echo "// vim: ft=c: et"
-echo ""
-echo "// ====================================================================="
-echo "// This file maps FreeBSD packages to their ports directories"
-echo "// ====================================================================="
-echo ""
-
 while read pkgname 0<&3; do
 	msg "=> Processing package ${pkgname}"
 	origin="`get_origin ${pkgname}`"
@@ -43,7 +36,7 @@ while read pkgname 0<&3; do
 		msg "==> Cannot find origin for ${pkgname} in your index file" && \
 		msg "==> Exit now!" && exit 1
 	msg "=> Processing package ${pkgname} - ${origin}"
-	printf "#define %-32s %s\n" "${pkgname}" "${origin}"
+	printf "%-32s %s\n" "${pkgname}" "${origin}"
 done
 
 exec 3<&-