diff -urN /usr/ports/devel/privman/Makefile devel/privman/Makefile
--- /usr/ports/devel/privman/Makefile	2010-12-04 16:31:25.000000000 +0900
+++ devel/privman/Makefile	2012-05-30 23:38:42.000000000 +0900
@@ -7,35 +7,54 @@
 
 PORTNAME=	privman
 PORTVERSION=	0.9.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel security
-MASTER_SITES=	http://www.isso.sparta.com/opensource/privman/downloads/
+MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library that makes it easy for programs to use privilege separation
 
+LICENSE=	BSD
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
 USE_AUTOTOOLS=	libtool
-GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
+MAKE_JOBS_SAFE=	yes
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|$$(PACKAGE).d|$$(PACKAGE)|g' \
-		${WRKSRC}/etc/Makefile.in
-	@${REINPLACE_CMD} -e 's|@PACKAGE@.d|@PACKAGE@|g' \
-		${WRKSRC}/src/Makefile.in
-
-MAN3=	priv_bind.3 priv_custom.3 priv_daemon.3 priv_execve.3 \
-	priv_fopen.3 priv_fork.3 priv_init.3 priv_invoke_cap_fn.3 \
-	priv_invoke_info_fn.3 priv_open.3 priv_pam.3 \
-	priv_pam_acct_mgmt.3 priv_pam_authenticate.3  priv_pam_chauthtok.3 \
-	priv_pam_close_session.3 priv_pam_end.3 priv_pam_fail_delay.3 \
-	priv_pam_get_item.3 priv_pam_getenv.3 priv_pam_open_session.3 \
-	priv_pam_putenv.3 priv_pam_set_item.3 priv_pam_setcred.3 \
-	priv_pam_start.3 priv_pclose.3 priv_popen.3 priv_register_cap_fn.3 \
-	priv_register_info_fn.3 priv_rerunas.3 priv_respawn_as.3 \
-	priv_wait4.3
+MLINKS=		priv_pam.3 priv_pam_acct_mgmt.3 \
+		priv_pam.3 priv_pam_authenticate.3 \
+		priv_pam.3 priv_pam_chauthtok.3 \
+		priv_pam.3 priv_pam_close_session.3 \
+		priv_pam.3 priv_pam_end.3 \
+		priv_pam.3 priv_pam_fail_delay.3 \
+		priv_pam.3 priv_pam_getenv.3 \
+		priv_pam.3 priv_pam_get_item.3 \
+		priv_pam.3 priv_pam_open_session.3 \
+		priv_pam.3 priv_pam_putenv.3 \
+		priv_pam.3 priv_pam_setcred.3 \
+		priv_pam.3 priv_pam_set_item.3 \
+		priv_pam.3 priv_pam_start.3 \
+		priv_popen.3 priv_pclose.3 \
+		priv_custom.3 priv_register_info_fn.3 \
+		priv_custom.3 priv_register_cap_fn.3 \
+		priv_custom.3 priv_invoke_info_fn.3 \
+		priv_custom.3 priv_invoke_cap_fn.3
+MAN3=		priv_bind.3 priv_custom.3 priv_daemon.3 priv_execve.3 \
+		priv_fopen.3 priv_fork.3 priv_init.3 priv_open.3 \
+		priv_pam.3 priv_popen.3 priv_rerunas.3 priv_respawn_as.3 \
+		priv_wait4.3
+MAN5=		privman_conf.5
+MAN7=		privman.7
 
-MAN5=	privman_conf.5
-MAN7=	privman.7
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|$$(PACKAGE).d|$$(PACKAGE)|g' ${WRKSRC}/etc/Makefile.in
+	@${REINPLACE_CMD} -e \
+		'/^CFLAGS/s|-O2 -g|@CFLAGS@| ; \
+		 /^CXXFLAGS/s|-O2 -g|@CXXFLAGS@| ; \
+		 s|@PACKAGE@.d|@PACKAGE@| ; \
+		 s|-lstdc++||' ${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e \
+		'/^CFLAGS/s|-O2 -g|@CFLAGS@|' ${WRKSRC}/tests/Makefile.in
 
 .include <bsd.port.mk>
diff -urN /usr/ports/devel/privman/pkg-descr devel/privman/pkg-descr
--- /usr/ports/devel/privman/pkg-descr	2005-04-10 21:29:16.000000000 +0900
+++ devel/privman/pkg-descr	2012-05-29 20:20:01.000000000 +0900
@@ -1,17 +1,17 @@
-Privman is a library that makes it easy for programs to use
-privilege separation, a technique that prevents the leak or
-misuse of privilege from applications that must run with some
-elevated permissions. Applications that use the Privman library
-split into two halves, the half that performs valid privileged
-operations, and the half that contains the application's logic.
-The Privman library simplifies the otherwise complex task of
-separating the application, protecting the system from
-compromise if an error in the application logic is found. The
-library uses configuration files to provide fine-grained access
-control for the privileged operations, limiting exposure in
-even of an attack against the application. When the application
-is compromised, the attacker gains only the privileges of an
-unprivileged user and the specific privileges granted to the
+Privman is a library that makes it easy for programs to use privilege
+separation, a technique that prevents the leak or misuse of privilege
+from applications that must run with some elevated permissions. The
+Privman library simplifies the otherwise complex task of separating
+the application, protecting the system from compromise if an error in
+the application logic is found.
+
+Applications that use the Privman library split into two halves, the
+half that performs valid privileged operations, and the half that
+contains the application's logic. The library uses configuration files
+to provide fine-grained access control for the privileged operations,
+limiting exposure in even of an attack against the application. When 
+the application is compromised, the attacker gains only the privileges
+of an unprivileged user and the specific privileges granted to the
 application by the application's Privman configuration file.
 
-WWW: http://www.isso.sparta.com/opensource/privman/
+WWW: http://code.google.com/p/privman/