--- a/components/pwgen/Makefile Wed Mar 30 10:16:56 2016 -0700
+++ b/components/pwgen/Makefile Wed Mar 30 13:33:31 2016 -0700
@@ -20,28 +20,25 @@
#
#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
#
-
+BUILD_BITS= 64
include ../../make-rules/shared-macros.mk
COMPONENT_NAME= pwgen
COMPONENT_VERSION= 2.06
COMPONENT_PROJECT_URL= http://sourceforge.net/projects/pwgen/
-COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
sha256:61598c9e3a0f7eb2e7367d4ecc71522c4f16a7d41ed31db29e3afee8d9843454
COMPONENT_ARCHIVE_URL= $(COMPONENT_PROJECT_URL)files/pwgen/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
-COMPONENT_BUGDB= utility/pwgen
TPNO= 9020
-CONFIGURE_OPTIONS += LDFLAGS="$(CC_BITS)"
+TEST_TARGET= $(NO_TESTS)
+include $(WS_MAKE_RULES)/common.mk
-include $(WS_MAKE_RULES)/prep.mk
-include $(WS_MAKE_RULES)/configure.mk
-include $(WS_MAKE_RULES)/ips.mk
+# Fix 64-bit linking via compiler.
+LDFLAGS += $(CC_BITS)
# IPS Package versions contain sequences of non-negative (for now) integers,
# separated by dots. Leading zeroes are not allowed, due to ordering
@@ -51,6 +48,7 @@
# to "2.6" to comply with the convention described above.
#
IPS_COMPONENT_VERSION= 2.6
+HUMAN_VERSION= $(COMPONENT_VERSION)
# configure in pwgen is generated by autoconf 2.13, which does not accept the
# variables like CC, CXX, etc. The solution is to generate a new configure
@@ -59,25 +57,8 @@
#
COMPONENT_PREP_ACTION= (cd $(@D) ; autoconf)
-CONFIGURE_OPTIONS+= CFLAGS="$(CFLAGS)"
-
# This is to get rid of gcc specific -Wxxx options in pwgen makefile
#
COMPONENT_BUILD_ARGS = WALL_OPTS=
-ASLR_MODE = $(ASLR_ENABLE)
-
-# common targets
-configure: $(CONFIGURE_64)
-
-build: $(BUILD_64)
-
-install: $(INSTALL_64)
-
-test: $(NO_TESTS)
-
-system-test: $(NO_TESTS)
-
-
-REQUIRED_PACKAGES += system/library
REQUIRED_PACKAGES += system/library/security/crypto