From 4b8ca2562d02194ad94883fe26fec7b041e8b8e9 Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Sat, 4 Jan 2014 23:45:06 +0000 Subject: Support stage --- archivers/unrar-iconv/Makefile | 1 - archivers/unrar/Makefile | 23 +++++++---------------- 2 files changed, 7 insertions(+), 17 deletions(-) (limited to 'archivers') diff --git a/archivers/unrar-iconv/Makefile b/archivers/unrar-iconv/Makefile index db3dacb359ba..2a1e0896312d 100644 --- a/archivers/unrar-iconv/Makefile +++ b/archivers/unrar-iconv/Makefile @@ -9,7 +9,6 @@ MASTERDIR= ${.CURDIR}/../unrar EXTRA_PATCHES= ${.CURDIR}/files/patch-iconv -NO_STAGE= yes CPPFLAGS+= -DWITH_ICONV -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} USES+= iconv diff --git a/archivers/unrar/Makefile b/archivers/unrar/Makefile index 0dea8858fbcc..07e7526d1db9 100644 --- a/archivers/unrar/Makefile +++ b/archivers/unrar/Makefile @@ -19,8 +19,7 @@ OPENSSL_AES_DESC= Use OpenSSL implementation of AES CONFLICTS?= zh-unrar-[0-9].* unrar-iconv-[0-9].* -NO_STAGE= yes -MAKE_ARGS= STRIP=${STRIP_CMD} +MAKE_ARGS= STRIP=${STRIP_CMD} CXX="${CXX}" MAKEFILE= makefile.unix USES+= gmake WRKSRC= ${WRKDIR}/${PORTNAME} @@ -30,22 +29,14 @@ PORTDOCS= license.txt readme.txt SLAVEDIRS= archivers/unrar-iconv chinese/unrar -.include +OPENSSL_AES_CPPFLAGS= -DOPENSSL_AES -I${OPENSSLINC} +OPENSSL_AES_USE= OPENSSL=yes +OPENSSL_AES_LDFLAGS= -L${OPENSSLLIB} -lcrypto -.if ${PORT_OPTIONS:MOPENSSL_AES} -CPPFLAGS+= -DOPENSSL_AES -I${OPENSSLINC} -LDFLAGS+= -L${OPENSSLLIB} -lcrypto -USE_OPENSSL= yes -.endif - -post-patch: - @${REINPLACE_CMD} -e '/^CXX/ s|^|#|' ${WRKSRC}/${MAKEFILE} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/unrar ${PREFIX}/bin/ -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR}/ - cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/ -.endif + ${INSTALL_PROGRAM} ${WRKSRC}/unrar ${STAGEDIR}${PREFIX}/bin/ + ${MKDIR} ${STAGEDIR}${DOCSDIR}/ + cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ .include -- cgit v1.2.3