diff -Nur ports.orig/Makefile ports.fx/Makefile
--- ports.orig/Makefile	Sun Jan  6 23:56:25 2002
+++ ports.fx/Makefile	Tue Jan  8 11:35:13 2002
@@ -3,7 +3,8 @@
 ## INCLUDES								##
 ##########################################################################
 
-include Mk/nl-ports.mk
+include Mk/nl-bin.mk
+include Mk/nl-subdir.mk
 
 
 ##########################################################################
@@ -37,4 +38,5 @@
 SUBDIR+=	textproc
 SUBDIR+=	www
 SUBDIR+=	x11
+
 
diff -Nur ports.orig/Mk/nl-bin.mk ports.fx/Mk/nl-bin.mk
--- ports.orig/Mk/nl-bin.mk	Tue Jan  8 02:16:33 2002
+++ ports.fx/Mk/nl-bin.mk	Tue Jan  8 11:53:42 2002
@@ -3,35 +3,35 @@
 ## BINARIES								##
 ##########################################################################
 
-CP?=			/bin/cp
-DIALOG?= 		/bin/dialog
-MV?=			/bin/mv
-RM?=			/bin/rm
-TAR?=			/bin/tar
-GZIP?=			/bin/gzip
-BZIP2?=			/bin/bzip2
-FTP?=			/bin/ftp
-MKDIR?=			/bin/mkdir
-ECHO?=			/usr/bin/echo
-CAT?=			/usr/bin/cat
-MAKE?=			/usr/bin/make
-GCC?=			/usr/bin/gcc
-INSTALL?=		/usr/bin/install
-SED?=			/usr/bin/sed
-AWK?=			/usr/bin/awk
-DATE?=			/usr/bin/date
-FALSE?=			/usr/bin/false
-TRUE?=			/usr/bin/true
-TR?=			/usr/bin/tr
-UNAME?=			/usr/bin/uname
-TEST?=			/usr/bin/test
-EXPR?=			/usr/bin/expr
-WGET?=			/usr/bin/wget
-LYNX?=			/usr/bin/lynx
-MD5SUM?=		/usr/bin/md5sum
-PWD?=			/usr/bin/pwd
-BASENAME?=		/usr/bin/basename
-CUT?=			/usr/bin/cut
-STRIP?=			/usr/bin/strip
-FIND?=			/usr/bin/find
+CP=			/bin/cp
+DIALOG= 		/bin/dialog
+MV=			/bin/mv
+RM=			/bin/rm
+TAR=			/bin/tar
+GZIP=			/bin/gzip
+BZIP2=			/bin/bzip2
+FTP=			/bin/ftp
+MKDIR=			/bin/mkdir
+ECHO=			/usr/bin/echo
+CAT=			/usr/bin/cat
+MAKE=			/usr/bin/make
+GCC=			/usr/bin/gcc
+INSTALL=		/usr/bin/install
+SED=			/usr/bin/sed
+AWK=			/usr/bin/awk
+DATE=			/usr/bin/date
+FALSE=			/usr/bin/false
+TRUE=			/usr/bin/true
+TR=			/usr/bin/tr
+UNAME=			/usr/bin/uname
+TEST=			/usr/bin/test
+EXPR=			/usr/bin/expr
+WGET=			/usr/bin/wget
+LYNX=			/usr/bin/lynx
+MD5SUM=			/usr/bin/md5sum
+PWD=			/usr/bin/pwd
+BASENAME=		/usr/bin/basename
+CUT=			/usr/bin/cut
+STRIP=			/usr/bin/strip
+FIND=			/usr/bin/find
 
diff -Nur ports.orig/Mk/nl-ports.mk ports.fx/Mk/nl-ports.mk
--- ports.orig/Mk/nl-ports.mk	Mon Jan  7 21:41:22 2002
+++ ports.fx/Mk/nl-ports.mk	Tue Jan  8 11:53:35 2002
@@ -1,12 +1,5 @@
 
 ##########################################################################
-## INCLUDES								##
-##########################################################################
-
-include nl-bin.mk
-
-
-##########################################################################
 ## VARIABLES								##
 ##########################################################################
 
@@ -116,18 +109,6 @@
 	fi; \
 
 
-search:
-
-	@if [ ! $$key ]; then \
-		$(ECHO) "Error: key variable not defined!"; \
-		$(FALSE); \
-	 fi; \
-
-	@for dir in $(SUBDIR); do \
-		$(FIND) $$dir -name "*$$key*" -print; \
-	 done; \
-
-	
 template-fetch: 
 
 	@$(ECHO) "======================================================="
@@ -159,7 +140,7 @@
 	@$(ECHO) ">>> Cleaning...					 "
 	@$(ECHO) "======================================================="
 
-	@$(RM_CMD) $(SOURCE_DIR)
+	@$(RM_CMD) $(SOURCE_DIR) $(PKG_DIR)
 
 
 template-makesum:
@@ -180,7 +161,7 @@
 	 fi; \
 
 
-template-package:
+template-package: build
 
 	@$(ECHO) "======================================================="
 	@$(ECHO) ">>> Creating Package...				 "
@@ -190,7 +171,8 @@
 	@$(MAKE) DESTDIR=$(PKG_PREFIX) -C $(SOURCE_DIR) install
 	@(cd $(PKG_DIR); $(COMPACT_CMD) $(PKG_NAME) *)
 
-# a melhorar: tirar o PKG_DIR
+# TODO:
+# tirar o PKG_DIR
 # criar o pkg-list
 # gerar os md5sum do pacote + source
 # arrrumar o search
diff -Nur ports.orig/Mk/nl-subdir.mk ports.fx/Mk/nl-subdir.mk
--- ports.orig/Mk/nl-subdir.mk	Mon Jan  7 21:42:31 2002
+++ ports.fx/Mk/nl-subdir.mk	Tue Jan  8 11:53:52 2002
@@ -1,12 +1,5 @@
 
 ##########################################################################
-## INCLUDES								##
-##########################################################################
-
-include nl-bin.mk
-
-
-##########################################################################
 ## TARGETS								##
 ##########################################################################
 
diff -Nur ports.orig/system/fs/e2fsprogs/Makefile ports.fx/system/fs/e2fsprogs/Makefile
--- ports.orig/system/fs/e2fsprogs/Makefile	Tue Jan  8 02:36:44 2002
+++ ports.fx/system/fs/e2fsprogs/Makefile	Tue Jan  8 11:48:50 2002
@@ -3,6 +3,7 @@
 ## INCLUDES								##
 ##########################################################################
 
+include ../../../Mk/nl-bin.mk
 include ../../../Mk/nl-ports.mk