3 files changed, 35 insertions, 44 deletions

diff --git a/irc/ircd-ratbox-devel/Makefile b/irc/ircd-ratbox-devel/Makefile
index 92f5f0c2a071..9020e51cca48 100644
--- a/irc/ircd-ratbox-devel/Makefile
+++ b/irc/ircd-ratbox-devel/Makefile
@@ -15,8 +15,7 @@ LICENSE=	GPLv2
 
 CONFLICTS=	ircd-ratbox-[0-9]* charybdis-[0-9]*
 
-USES=		perl5
-USE_BZIP2=	yes
+USES=		libtool perl5 tar:bzip2
 #MAN8=		ircd.8
 USE_RC_SUBR=	ircd-ratbox
 USE_SQLITE=	3
@@ -42,6 +41,7 @@ CONFIGURE_ARGS=	--with-confdir=${PREFIX}/etc/${PORTNAME}		\
 		--libdir=${PREFIX}/lib/${PORTNAME}			\
 		--with-sqlite3=${LOCALBASE}				\
 		--disable-backups
+INSTALL_TARGET=	install-strip
 
 PORTDOCS=	[^i]*.txt README.* technical/[^i]*.txt Tao-of-IRC.*
 
@@ -57,7 +57,6 @@ SERVICES_DESC=		ratbox-services compatibility code
 
 #----------------------------------------------------------------------
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOPENSSL}
@@ -178,7 +177,7 @@ pre-build:
 	${PERL} ${WRKSRC}/contrib/ircd-shortcut.pl
 
 post-build:
-	@cd ${INSTALL_WRKSRC}/contrib && ${SETENV} ${MAKE_ENV} ${MAKE} \
+	@cd ${INSTALL_WRKSRC}/contrib && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
 		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS}
 
 # ----- Need to build the m_rsshortcut.so module for ircd-shortcut.pl ----
@@ -186,41 +185,27 @@ post-build:
 	@cd ${INSTALL_WRKSRC}/contrib && ${SETENV} ${MAKE_ENV} ${MAKE} \
 		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} m_rsshortcut.la
 
-pre-su-install:
-	${MKDIR} ${PREFIX}/etc/${PORTNAME}
-	${MKDIR} ${DATADIR}/help
-	${MKDIR} ${PREFIX}/lib/${PORTNAME}/modules
+pre-install:
+	${MKDIR} ${STAGEDIR}${ETCDIR}
+	${MKDIR} ${STAGEDIR}${DATADIR}/help
+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/modules
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
-.endif
-	@cd ${INSTALL_WRKSRC}/contrib && ${SETENV} ${MAKE_ENV} ${MAKE} \
-		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install
-	${INSTALL_DATA} ${WRKSRC}/doc/ircd.motd ${PREFIX}/etc/${PORTNAME}/ircd.motd.sample
-	${INSTALL_DATA} ${WRKSRC}/doc/example.conf ${PREFIX}/etc/${PORTNAME}/ircd.conf.sample
-	${INSTALL_DATA} ${WRKSRC}/doc/example.efnet.conf ${PREFIX}/etc/${PORTNAME}/ircd-efnet.conf.sample
-	${INSTALL_DATA} ${WRKSRC}/doc/genssl.sh ${PREFIX}/etc/${PORTNAME}/genssl.sh
+	${MKDIR} ${STAGEDIR}${RUNDIR}
+	${MKDIR} ${STAGEDIR}${DBDIR}
+	${MKDIR} ${STAGEDIR}${LOGDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+	@cd ${INSTALL_WRKSRC}/contrib && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
+		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}
+	${INSTALL_DATA} ${WRKSRC}/doc/ircd.motd ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/ircd.motd.sample
+	${INSTALL_DATA} ${WRKSRC}/doc/example.conf ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/ircd.conf.sample
+	${INSTALL_DATA} ${WRKSRC}/doc/example.efnet.conf ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/ircd-efnet.conf.sample
+	${INSTALL_DATA} ${WRKSRC}/doc/genssl.sh ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/genssl.sh
 
 # ----- We need to install the shortcut.pl module ----
 	@${ECHO_MSG} "Executing install-mod.sh for ircd-shortcuts module installation."
 	${SH} ${WRKSRC}/install-mod.sh ${WRKSRC}/contrib/m_rsshortcut.la \
-		${PREFIX}/lib/${PORTNAME}/modules/contrib
-
-	@if [ ! -f ${PREFIX}/etc/${PORTNAME}/ircd.conf ]; then \
-		${ECHO} "Installing default configuration file."; \
-		${CP} -p ${PREFIX}/etc/${PORTNAME}/ircd.conf.sample ${PREFIX}/etc/${PORTNAME}/ircd.conf ; \
-	fi
-
-	@if [ ! -f ${PREFIX}/etc/${PORTNAME}/ircd.motd ]; then \
-		${ECHO} "Installing default motd file."; \
-		${CP} -p ${PREFIX}/etc/${PORTNAME}/ircd.motd.sample ${PREFIX}/etc/${PORTNAME}/ircd.motd ; \
-	fi
-
-	@${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-	@${CAT} ${PKGMESSAGE}
-
-#-----------------------------------------------------------------------
+		${STAGEDIR}${PREFIX}/lib/${PORTNAME}/modules/contrib
 
 .include <bsd.port.mk>
diff --git a/irc/ircd-ratbox-devel/files/patch-contrib_Makefile.in b/irc/ircd-ratbox-devel/files/patch-contrib_Makefile.in
new file mode 100644
index 000000000000..065b00023cfb
--- /dev/null
+++ b/irc/ircd-ratbox-devel/files/patch-contrib_Makefile.in
@@ -0,0 +1,13 @@
+--- contrib/Makefile.in.orig	2012-03-11 01:12:06.000000000 +0100
++++ contrib/Makefile.in	2014-07-02 01:22:20.963771475 +0200
+@@ -429,8 +429,8 @@
+ 	$(LIBTOOL) --mode=clean $(RB_RM) -f $(S_OBJS) $(S_CORE_OBJS)  $(ST_OBJS)
+ 
+ install_modules: $(S_OBJS)
+-	-@@$(MKDIR_P) $(contribdir); \
+-	for x in $(S_OBJS); do $(SHELL) ../install-mod.sh $$x $(contribdir);done
++	-@@$(MKDIR_P) $(DESTDIR)$(contribdir); \
++	for x in $(S_OBJS); do $(SHELL) ../install-mod.sh $$x $(DESTDIR)$(contribdir);done
+ 
+ #install-mkdirs:
+ #	@echo "ircd: setting up modular directory structure"
diff --git a/irc/ircd-ratbox-devel/pkg-plist b/irc/ircd-ratbox-devel/pkg-plist
index 3d35f436c57c..f697670aefb1 100644
--- a/irc/ircd-ratbox-devel/pkg-plist
+++ b/irc/ircd-ratbox-devel/pkg-plist
@@ -138,12 +138,9 @@ libexec/ircd-ratbox/ssld
 %%DATADIR%%/help/users/who
 %%DATADIR%%/help/users/whois
 %%DATADIR%%/help/users/whowas
-lib/ircd-ratbox/libcore.la
 lib/ircd-ratbox/libcore.so
-lib/ircd-ratbox/libratbox.la
 lib/ircd-ratbox/libratbox.so
 @unexec f="%D/lib/ircd-ratbox/modules/autoload/m_services.so"; if [ -f "$f" ]; then rm -f "$f"; fi
-@unexec f="%D/lib/ircd-ratbox/modules/autoload/m_services.la"; if [ -f "$f" ]; then rm -f "$f"; fi
 lib/ircd-ratbox/modules/autoload/m_accept.so
 lib/ircd-ratbox/modules/autoload/m_admin.so
 lib/ircd-ratbox/modules/autoload/m_adminwall.so
@@ -239,13 +236,9 @@ lib/ircd-ratbox/modules/m_squit.so
 @dirrm %%DATADIR%%/help
 @dirrm %%DATADIR%%
 etc/ircd-ratbox/genssl.sh
-etc/ircd-ratbox/ircd-efnet.conf.sample
-@unexec if cmp -s "%D/etc/ircd-ratbox/ircd.conf.sample" "%D/etc/ircd-ratbox/ircd.conf"; then rm -f "%D/etc/ircd-ratbox/ircd.conf"; fi
-etc/ircd-ratbox/ircd.conf.sample
-@exec if [ ! -f "%D/etc/ircd-ratbox/ircd.conf" ] ; then cp -p "%D/%F" "%B/ircd.conf"; fi
-@unexec if cmp -s "%D/etc/ircd-ratbox/ircd.motd.sample" "%D/etc/ircd-ratbox/ircd.motd"; then rm -f "%D/etc/ircd-ratbox/ircd.motd"; fi
-etc/ircd-ratbox/ircd.motd.sample
-@exec if [ ! -f "%D/etc/ircd-ratbox/ircd.motd" ] ; then cp -p "%D/%F %B/ircd.motd"; fi
+@sample etc/ircd-ratbox/ircd-efnet.conf.sample
+@sample etc/ircd-ratbox/ircd.conf.sample
+@sample etc/ircd-ratbox/ircd.motd.sample
 @dirrmtry etc/ircd-ratbox
 @cwd /
 @dirrmtry %%LOGDIR%%