- Enable stage support

- Fix compilation with DEBUG option
- Move full package list to pkg-plist
- Minor cleanups

2 files changed, 23 insertions, 17 deletions

diff --git a/www/qdecoder/Makefile b/www/qdecoder/Makefile
index 5af53c620731..b96e79d79a4a 100644
--- a/www/qdecoder/Makefile
+++ b/www/qdecoder/Makefile
@@ -15,25 +15,17 @@ USE_LDCONFIG=	yes
 MAKE_ARGS=	exec_prefix="${PREFIX}"
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-OPTIONS_DEFINE=	DEBUG
-PORTEXAMPLES=	*
+OPTIONS_DEFINE=		DEBUG
+DEBUG_CONFIGURE_ENABLE=	debug
 
-PLIST_FILES=	include/qdecoder.h \
-		lib/libqdecoder.a \
-		lib/libqdecoder.so \
-		lib/libqdecoder.so.12
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+="--enable-debug"
-.endif
+post-patch:
+	${REINPLACE_CMD} 's/.{[A-Z]*DIR/$${DESTDIR}&/' ${WRKSRC}/src/Makefile.in
+	${REINPLACE_CMD} '/<limits/{p;s//<errno/;}' ${WRKSRC}/src/qcgireq.c
 
 post-install:
-.if ${PORT_OPTIONS:MEXAMPLES}
-	${MKDIR} ${EXAMPLESDIR}
-	(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} "Makefile *.c *.html" ${EXAMPLESDIR})
-.endif
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} "Makefile *.c *.html" \
+		${STAGEDIR}${EXAMPLESDIR}
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libqdecoder.so
 
 .include <bsd.port.mk>
diff --git a/www/qdecoder/pkg-plist b/www/qdecoder/pkg-plist
new file mode 100644
index 000000000000..c47b948888a0
--- /dev/null
+++ b/www/qdecoder/pkg-plist
@@ -0,0 +1,14 @@
+include/qdecoder.h
+lib/libqdecoder.a
+lib/libqdecoder.so
+lib/libqdecoder.so.12
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cookie.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/download.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/index.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multivalue.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/query.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/session.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/upload.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/uploadfile.c
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%