ports/146848: multiple ports: SUBDIR/Makefiles corrected

Anatoly Borodin anatoly.borodin at gmail.com
Sat May 22 22:40:02 UTC 2010


>Number:         146848
>Category:       ports
>Synopsis:       multiple ports: SUBDIR/Makefiles corrected
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat May 22 22:40:02 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Anatoly Borodin
>Release:        
>Organization:
>Environment:
>Description:
Some SUBDIR/Makefile files are inconsistent. Some new ports are missing, some old ports are present, the lists are unsorted etc.
>How-To-Repeat:

>Fix:
Apply the patch. It changes:

* databases/Makefile
* devel/Makefile
* japanese/Makefile
* lang/Makefile
* ports-mgmt/Makefile (only white-spacing altered)
* security/Makefile
* www/Makefile (only white-spacing altered)
* x11-drivers/Makefile


Patch attached with submission follows:

>From 8cad9d61a868e48a075aa8f94a751f8e064b978c Mon Sep 17 00:00:00 2001
From: Anatoly Borodin <anatoly.borodin at gmail.com>
Date: Sat, 22 May 2010 22:55:46 +0200
Subject: [PATCH 2/5] Fix SUBDIR/Makefile


diff --git databases/Makefile databases/Makefile
index 2b0cf62..60bb208 100644
--- databases/Makefile
+++ databases/Makefile
@@ -545,7 +545,6 @@
     SUBDIR += phppgadmin
     SUBDIR += postgis
     SUBDIR += postgis-jdbc
-    SUBDIR += postgresql-contrib
     SUBDIR += postgresql-docs
     SUBDIR += postgresql-jdbc
     SUBDIR += postgresql-libpgeasy
@@ -580,6 +579,7 @@
     SUBDIR += postgresql84-client
     SUBDIR += postgresql84-server
     SUBDIR += postgresql84-contrib
+    SUBDIR += postgresql90-server
     SUBDIR += postgresql_autodoc
     SUBDIR += powerarchitect
     SUBDIR += ptop
diff --git devel/Makefile devel/Makefile
index 2a4938d..b8afb6c 100644
--- devel/Makefile
+++ devel/Makefile
@@ -441,6 +441,7 @@
     SUBDIR += gcvs
     SUBDIR += gdb53-act
     SUBDIR += gdb6
+    SUBDIR += gdb66
     SUBDIR += gdbmods
     SUBDIR += gdcm
     SUBDIR += geany
@@ -596,7 +597,7 @@
     SUBDIR += hs-split
     SUBDIR += hs-terminfo
     SUBDIR += hs-test-framework
-    SUBDIR += hs-test-framework-unit
+    SUBDIR += hs-test-framework-hunit
     SUBDIR += hs-test-framework-quickcheck2
     SUBDIR += hs-testpack
     SUBDIR += hs-transformers
diff --git japanese/Makefile japanese/Makefile
index 88e4fe7..3d59418 100644
--- japanese/Makefile
+++ japanese/Makefile
@@ -330,6 +330,7 @@
     SUBDIR += srd-fpw
     SUBDIR += srd-fpw-package
     SUBDIR += stardict-dict-ja
+    SUBDIR += stardict2-dict-ja
     SUBDIR += suicavalue
     SUBDIR += suikyo
     SUBDIR += t2ps
diff --git lang/Makefile lang/Makefile
index e1c07e4..b8eeeb1 100644
--- lang/Makefile
+++ lang/Makefile
@@ -335,6 +335,7 @@
     SUBDIR += spidermonkey
     SUBDIR += spl
     SUBDIR += squeak
+    SUBDIR += squeak-dev
     SUBDIR += squirrel
     SUBDIR += sr
     SUBDIR += stalin
diff --git ports-mgmt/Makefile ports-mgmt/Makefile
dissimilarity index 89%
index eb6ee22..059b468 100644
--- ports-mgmt/Makefile
+++ ports-mgmt/Makefile
@@ -1,74 +1,74 @@
-# $FreeBSD: ports/ports-mgmt/Makefile,v 1.31 2010/05/10 21:18:30 kwm Exp $
-#
-
-   COMMENT = Ports for managing, installing and developing FreeBSD ports and packages
-
-   SUBDIR += barry
-   SUBDIR += bpkg
-   SUBDIR += bpm
-   SUBDIR += fastest_sites
-   SUBDIR += genplist
-   SUBDIR += gnome-packagekit
-   SUBDIR += jailaudit
-   SUBDIR += kports
-   SUBDIR += kports-qt4
-   SUBDIR += lsknobs
-   SUBDIR += managepkg
-   SUBDIR += p5-App-Pm2Port
-   SUBDIR += p5-FreeBSD-Pkgs
-   SUBDIR += p5-FreeBSD-Pkgs-FindUpdates
-   SUBDIR += p5-FreeBSD-Portindex
-   SUBDIR += p5-FreeBSD-Ports
-   SUBDIR += p5-FreeBSD-Ports-INDEXhash
-   SUBDIR += packagekit
-   SUBDIR += packagekit-qt4
-   SUBDIR += pib
-   SUBDIR += pkg-orphan
-   SUBDIR += pkg_add_it
-   SUBDIR += pkg_cleanup
-   SUBDIR += pkg_cutleaves
-   SUBDIR += pkg_install
-   SUBDIR += pkg_jail
-   SUBDIR += pkg_remove
-   SUBDIR += pkg_replace
-   SUBDIR += pkg_rmleaves
-   SUBDIR += pkg_search
-   SUBDIR += pkg_trackinst
-   SUBDIR += pkg_tree
-   SUBDIR += pkgfe
-   SUBDIR += pkgsearch
-   SUBDIR += port-authoring-tools
-   SUBDIR += port-maintenance-tools
-   SUBDIR += portaudit
-   SUBDIR += portaudit-db
-   SUBDIR += portcheck
-   SUBDIR += portcheckout
-   SUBDIR += portconf
-   SUBDIR += portdowngrade
-   SUBDIR += porte
-   SUBDIR += porteasy
-   SUBDIR += portell
-   SUBDIR += portless
-   SUBDIR += portlint
-   SUBDIR += portmanager
-   SUBDIR += portmaster
-   SUBDIR += portmk
-   SUBDIR += portrac
-   SUBDIR += portscout
-   SUBDIR += portsearch
-   SUBDIR += portsman
-   SUBDIR += portsopt
-   SUBDIR += porttools
-   SUBDIR += portupdate-scan
-   SUBDIR += portupgrade
-   SUBDIR += portupgrade-devel
-   SUBDIR += psearch
-   SUBDIR += pver
-   SUBDIR += qtpkg
-   SUBDIR += symports
-   SUBDIR += tinderbox
-   SUBDIR += tinderbox-devel
-   SUBDIR += vulnerability-test-port
-   SUBDIR += xps
-
-.include <bsd.port.subdir.mk>
+# $FreeBSD: ports/ports-mgmt/Makefile,v 1.31 2010/05/10 21:18:30 kwm Exp $
+#
+
+   COMMENT = Ports for managing, installing and developing FreeBSD ports and packages
+
+    SUBDIR += barry
+    SUBDIR += bpkg
+    SUBDIR += bpm
+    SUBDIR += fastest_sites
+    SUBDIR += genplist
+    SUBDIR += gnome-packagekit
+    SUBDIR += jailaudit
+    SUBDIR += kports
+    SUBDIR += kports-qt4
+    SUBDIR += lsknobs
+    SUBDIR += managepkg
+    SUBDIR += p5-App-Pm2Port
+    SUBDIR += p5-FreeBSD-Pkgs
+    SUBDIR += p5-FreeBSD-Pkgs-FindUpdates
+    SUBDIR += p5-FreeBSD-Portindex
+    SUBDIR += p5-FreeBSD-Ports
+    SUBDIR += p5-FreeBSD-Ports-INDEXhash
+    SUBDIR += packagekit
+    SUBDIR += packagekit-qt4
+    SUBDIR += pib
+    SUBDIR += pkg-orphan
+    SUBDIR += pkg_add_it
+    SUBDIR += pkg_cleanup
+    SUBDIR += pkg_cutleaves
+    SUBDIR += pkg_install
+    SUBDIR += pkg_jail
+    SUBDIR += pkg_remove
+    SUBDIR += pkg_replace
+    SUBDIR += pkg_rmleaves
+    SUBDIR += pkg_search
+    SUBDIR += pkg_trackinst
+    SUBDIR += pkg_tree
+    SUBDIR += pkgfe
+    SUBDIR += pkgsearch
+    SUBDIR += port-authoring-tools
+    SUBDIR += port-maintenance-tools
+    SUBDIR += portaudit
+    SUBDIR += portaudit-db
+    SUBDIR += portcheck
+    SUBDIR += portcheckout
+    SUBDIR += portconf
+    SUBDIR += portdowngrade
+    SUBDIR += porte
+    SUBDIR += porteasy
+    SUBDIR += portell
+    SUBDIR += portless
+    SUBDIR += portlint
+    SUBDIR += portmanager
+    SUBDIR += portmaster
+    SUBDIR += portmk
+    SUBDIR += portrac
+    SUBDIR += portscout
+    SUBDIR += portsearch
+    SUBDIR += portsman
+    SUBDIR += portsopt
+    SUBDIR += porttools
+    SUBDIR += portupdate-scan
+    SUBDIR += portupgrade
+    SUBDIR += portupgrade-devel
+    SUBDIR += psearch
+    SUBDIR += pver
+    SUBDIR += qtpkg
+    SUBDIR += symports
+    SUBDIR += tinderbox
+    SUBDIR += tinderbox-devel
+    SUBDIR += vulnerability-test-port
+    SUBDIR += xps
+
+.include <bsd.port.subdir.mk>
diff --git security/Makefile security/Makefile
index 415e450..481d934 100644
--- security/Makefile
+++ security/Makefile
@@ -233,6 +233,7 @@
     SUBDIR += kovpn
     SUBDIR += krb4
     SUBDIR += krb5
+    SUBDIR += krb5-16
     SUBDIR += krb5-appl
     SUBDIR += kripp
     SUBDIR += kssh
@@ -773,6 +774,7 @@
     SUBDIR += sguil-sensor
     SUBDIR += sguil-server
     SUBDIR += sha
+    SUBDIR += shibboleth2-sp
     SUBDIR += shimmer
     SUBDIR += shishi
     SUBDIR += shttpscanner
diff --git www/Makefile www/Makefile
index 5f20237..c72a9d1 100644
--- www/Makefile
+++ www/Makefile
@@ -1192,7 +1192,7 @@
     SUBDIR += p5-WWW-Babelfish
     SUBDIR += p5-WWW-Baseball-NPB
     SUBDIR += p5-WWW-Comic
-    SUBDIR += p5-WWW-Contact   
+    SUBDIR += p5-WWW-Contact
     SUBDIR += p5-WWW-Curl
     SUBDIR += p5-WWW-DHL
     SUBDIR += p5-WWW-Dilbert
diff --git x11-drivers/Makefile x11-drivers/Makefile
index 1412996..c589a2a 100644
--- x11-drivers/Makefile
+++ x11-drivers/Makefile
@@ -31,6 +31,7 @@
     SUBDIR += xf86-video-i740
     SUBDIR += xf86-video-imstt
     SUBDIR += xf86-video-intel
+    SUBDIR += xf86-video-intel29
     SUBDIR += xf86-video-mach64
     SUBDIR += xf86-video-mga
     SUBDIR += xf86-video-neomagic
-- 
1.7.1



>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list