Date: Sat, 12 Jun 2004 09:00:53 -0600 From: "Robin Schoonover" <end@endif.cjb.net> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/67879: update: www/winhelpcgi (update to 0.99) Message-ID: <1087052453.0@rogue> Resent-Message-ID: <200406121510.i5CFAYk5063003@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 67879
>Category: ports
>Synopsis: update: www/winhelpcgi (update to 0.99)
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Jun 12 15:10:34 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Robin Schoonover
>Release: FreeBSD 5.2.1-RELEASE i386
>Organization:
>Environment:
System: FreeBSD 5.2.1-RELEASE #0: Mon Feb 23 20:45:55 GMT 2004
root@wv1u.btc.adaptec.com:/usr/obj/usr/src/sys/GENERIC
>Description:
- Bring winhelpcgi up to 0.99
- Nuke the amd64 BROKENness, since amd64 should build now (hopefully)
- install into a more www-orientated place.
>How-To-Repeat:
>Fix:
--- winhelpcgi.diff begins here ---
diff -ruN winhelpcgi.orig/Makefile winhelpcgi/Makefile
--- winhelpcgi.orig/Makefile Mon Jun 7 22:14:41 2004
+++ winhelpcgi/Makefile Fri Jun 11 22:53:03 2004
@@ -6,36 +6,37 @@
#
PORTNAME= winhelpcgi
-PORTVERSION= 0.93.1
+PORTVERSION= 0.99
CATEGORIES= www textproc
MASTER_SITES= http://www.herdsoft.com/ftp/
-DISTNAME= ${PORTNAME}_0.93-1
+DISTNAME= ${PORTNAME}_0.99-3
MAINTAINER= endx7@users.sf.net
COMMENT= A winhelp converter cgi program
-LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
+ wmf.2:${PORTSDIR}/graphics/libwmf
-WRKSRC= ${WRKDIR}/${PORTNAME}
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
GNU_CONFIGURE= yes
USE_AUTOMAKE_VER= 14
-AUTOMAKE_ARGS= --add-missing
+USE_GETTEXT= yes
PKGMESSAGE= ${WRKDIR}/pkg-message
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64"
-BROKEN= "Does not compile on amd64"
-.endif
-
-# get rid of symlinks
pre-patch:
- (cd ${WRKSRC}; ${RM} INSTALL install-sh mkinstalldirs missing COPYING)
+ (cd ${WRKSRC}; ${TOUCH} config.h)
post-build:
@${CAT} ${PKGDIR}/pkg-message | ${SED} -e 's:%%PREFIX%%:${PREFIX}:' > ${PKGMESSAGE}
do-install:
- ${INSTALL_PROGRAM} ${WRKDIR}/winhelpcgi/winhelpcgi/winhelpcgi.cgi ${PREFIX}/bin
+ ${MKDIR} ${PREFIX}/www/winhelpcgi
+ ${INSTALL_PROGRAM} ${WRKSRC}/winhelpcgi/winhelpcgi.cgi ${PREFIX}/www/winhelpcgi
+
+post-install:
+.if !defined(BATCH)
+ @${CAT} ${PKGMESSAGE}
+.endif
+
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN winhelpcgi.orig/distinfo winhelpcgi/distinfo
--- winhelpcgi.orig/distinfo Tue May 4 11:49:15 2004
+++ winhelpcgi/distinfo Fri Jun 11 22:53:03 2004
@@ -1,2 +1,2 @@
-MD5 (winhelpcgi_0.93-1.tar.gz) = cf6df86cb484fbb506bc721f484ae896
-SIZE (winhelpcgi_0.93-1.tar.gz) = 239842
+MD5 (winhelpcgi_0.99-3.tar.gz) = 94cdc550d320a78a71293e4d71b8006f
+SIZE (winhelpcgi_0.99-3.tar.gz) = 305524
diff -ruN winhelpcgi.orig/files/patch-Makefile.am winhelpcgi/files/patch-Makefile.am
--- winhelpcgi.orig/files/patch-Makefile.am Tue May 4 11:49:15 2004
+++ winhelpcgi/files/patch-Makefile.am Fri Jun 11 22:53:03 2004
@@ -1,18 +1,10 @@
---- winhelpcgi/Makefile.am.orig Thu Apr 10 05:40:05 2003
-+++ winhelpcgi/Makefile.am Sat May 1 15:48:37 2004
-@@ -1,5 +1,5 @@
- ## Process this file using automake to create makefile.in
--INCLUDES = -I../include -I../include/linux
-+INCLUDES = -I../include -I../include/linux -I${LOCALBASE}/include
- #CFLAGS = -ggdb
-
- bin_PROGRAMS = winhelpcgi.cgi
-@@ -7,7 +7,7 @@
- winhelpcgi_cgi_SOURCES=dib2png.c wc_html.c wc_kwsrch.c winhelpcgi.c
- #winhelpcgi_cgi_LDFLAGS=-static
- #winhelpcgi_cgi_LDADD=-L../libhlpaccess -lhlpaccess -lpng -lz
--winhelpcgi_cgi_LDADD= \
-+winhelpcgi_cgi_LDADD= -L${LOCALBASE}/lib \
+--- winhelpcgi/Makefile.am.orig Fri Jun 11 22:31:21 2004
++++ winhelpcgi/Makefile.am Fri Jun 11 22:31:30 2004
+@@ -10,7 +10,7 @@
../libhlpaccess/libhlpaccess.a \
- -lpng -lz
+ -lpng -lz \
+ @LIBWMF_LIBS@ \
+- @INTLLIBS@
++ @INTLLIBS@ -lintl
+ noinst_HEADERS = dib2png.h winhelpcgi.h wmf2png.h
diff -ruN winhelpcgi.orig/pkg-message winhelpcgi/pkg-message
--- winhelpcgi.orig/pkg-message Tue May 4 11:49:15 2004
+++ winhelpcgi/pkg-message Fri Jun 11 22:53:03 2004
@@ -1,7 +1,18 @@
-----------------------------------------------------------------
-winhelpcgi.cgi has been installed into %%PREFIX%%/bin
+winhelpcgi.cgi has been installed into %%PREFIX%%/www/winhelpcgi/
+
+You now need to copy winhelp files into %%PREFIX%%/www/winhelpcgi/
+
+You also need to somehow make your webserver aware of winhelpcgi.
+For example, the following config fragment would make apache aware
+of winhelpcgi:
+
+Alias /winhelpcgi %%PREFIX%%/www/winhelpcgi
+<Directory /usr/local/www/winhelpcgi>
+ AddHandler cgi-script .cgi
+ AllowOverride All
+ Options ExecCGI
+</Directory>
-You now need to copy winhelpcgi.cgi along with all winhelp files
-you wish for it to handle into the cgi-bin/ (or a subdir in
-cgi-bin/) of a http server that can handle cgi (such as Apache).
-----------------------------------------------------------------
+
diff -ruN winhelpcgi.orig/pkg-plist winhelpcgi/pkg-plist
--- winhelpcgi.orig/pkg-plist Tue May 4 11:49:15 2004
+++ winhelpcgi/pkg-plist Fri Jun 11 22:53:03 2004
@@ -1 +1,2 @@
-bin/winhelpcgi.cgi
+www/winhelpcgi/winhelpcgi.cgi
+@unexec rmdir %D/www/winhelpcgi 2>/dev/null || true
--- winhelpcgi.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1087052453.0>