6 files changed, 10 insertions, 19 deletions

diff --git a/sysutils/libretto-config/Makefile b/sysutils/libretto-config/Makefile
index df453c8d112a..5a169098b345 100644
--- a/sysutils/libretto-config/Makefile
+++ b/sysutils/libretto-config/Makefile
@@ -15,26 +15,17 @@ ONLY_FOR_ARCHS=	i386
 
 WRKSRC=		${WRKDIR}/libapm
 
-PLIST_FILES=	sbin/libretto-config
-MAN8=		${PORTNAME}.8
-MANLANG=	. ja
-
+USE_GCC=	any
 OPTIONS_DEFINE=	DOCS
 PORTDOCS=	*
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
 post-install:
-# install japanese manpage also :-)
-	${INSTALL_MAN} ${WRKSRC}/libapm-j.man ${PREFIX}/man/ja/man8/${PORTNAME}.8
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README-e.1st ${DOCSDIR}/README.1st
-	${INSTALL_DATA} ${WRKSRC}/APM-EXBIOS-e.txt ${DOCSDIR}/APM-EXBIOS.txt
-	@${MKDIR} ${DOCSDIR}/ja
-	${INSTALL_DATA} ${WRKSRC}/README-j.1st ${DOCSDIR}/ja/README.1st
-	${INSTALL_DATA} ${WRKSRC}/APM-EXBIOS-j.txt ${DOCSDIR}/ja/APM-EXBIOS.txt
-.endif
+	${INSTALL_MAN} ${WRKSRC}/libapm-j.man ${STAGEDIR}${PREFIX}/man/ja/man8/${PORTNAME}.8
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README-e.1st ${STAGEDIR}${DOCSDIR}/README.1st
+	${INSTALL_DATA} ${WRKSRC}/APM-EXBIOS-e.txt ${STAGEDIR}${DOCSDIR}/APM-EXBIOS.txt
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/ja
+	${INSTALL_DATA} ${WRKSRC}/README-j.1st ${STAGEDIR}${DOCSDIR}/ja/README.1st
+	${INSTALL_DATA} ${WRKSRC}/APM-EXBIOS-j.txt ${STAGEDIR}${DOCSDIR}/ja/APM-EXBIOS.txt
 
 .include <bsd.port.mk>
diff --git a/sysutils/libretto-config/files/patch-aa b/sysutils/libretto-config/files/patch-Makefile
index fed5a2151566..d62a59149fb5 100644
--- a/sysutils/libretto-config/files/patch-aa
+++ b/sysutils/libretto-config/files/patch-Makefile
@@ -39,12 +39,12 @@
  
  install.bin:
 -	install -c -s $(OWNER) $(GROUP) $(MODE) $(PROGRAM) $(BINDIR)
-+	install -c -s $(OWNER) $(GROUP) $(MODE) $(PROGRAM) $(BINDIR)/$(PROGRAM_NAME)
++	install -c -s $(OWNER) $(GROUP) $(MODE) $(PROGRAM) $(DESTDIR)$(BINDIR)/$(PROGRAM_NAME)
  
  install.man:
 -	- mkdir $(MANDIR)/man$(MANSECT)
 -	install -c -m 644 libapm-${MANLANG}.man $(MANDIR)/man$(MANSECT)/libapm.$(MANSECT)
 -	
-+	${BSD_INSTALL_MAN} libapm-${MANLANG}.man $(MANDIR)/man$(MANSECT)/$(PROGRAM_NAME).$(MANSECT)
++	${BSD_INSTALL_MAN} libapm-${MANLANG}.man $(DESTDIR)$(MANDIR)/man$(MANSECT)/$(PROGRAM_NAME).$(MANSECT)
 +
 +libapm.o: libapm.h libapm.c
diff --git a/sysutils/libretto-config/files/patch-ad b/sysutils/libretto-config/files/patch-libapm-e.man
index 1970beb4513a..1970beb4513a 100644
--- a/sysutils/libretto-config/files/patch-ad
+++ b/sysutils/libretto-config/files/patch-libapm-e.man
diff --git a/sysutils/libretto-config/files/patch-ae b/sysutils/libretto-config/files/patch-libapm-j.man
index 1fb53e47bf42..1fb53e47bf42 100644
--- a/sysutils/libretto-config/files/patch-ae
+++ b/sysutils/libretto-config/files/patch-libapm-j.man
diff --git a/sysutils/libretto-config/files/patch-ab b/sysutils/libretto-config/files/patch-libapm.c
index 69d218e0b4ac..69d218e0b4ac 100644
--- a/sysutils/libretto-config/files/patch-ab
+++ b/sysutils/libretto-config/files/patch-libapm.c
diff --git a/sysutils/libretto-config/files/patch-ac b/sysutils/libretto-config/files/patch-libapm.h
index d94a072d4b24..d94a072d4b24 100644
--- a/sysutils/libretto-config/files/patch-ac
+++ b/sysutils/libretto-config/files/patch-libapm.h