kpriv/pkgsrc-wip
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- fix X11 library not linking properly

Browse source 
- install some useful files that were missed
This commit is contained in:
David Howland 2006-12-03 05:36:17 +00:00 committed by Thomas Klausner
parent 1b9b013870
commit 2e997c41e3
4 changed files with 42 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
vpr/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1.1.1 2006/12/03 00:38:43 dhowland Exp $
# $NetBSD: Makefile,v 1.2 2006/12/03 05:36:17 dhowland Exp $
#
DISTNAME= vpr-4.30
@ -15,6 +15,12 @@ EXTRACT_OPTS+= -d ${WRKSRC}
BUILD_DIRS= t-vpack vpr
MAKE_FILE= makefile
SUBST_CLASSES+= x11
SUBST_STAGE.x11= post-patch
SUBST_MESSAGE.x11= Fixing X11 LD flags.
SUBST_FILES.x11= vpr/makefile
SUBST_SED.x11= -e "s|@X11_LDFLAGS@|${X11_LDFLAGS}|g"
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/t-vpack/t-vpack ${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKSRC}/vpr/vpr ${PREFIX}/bin
@ -22,6 +28,10 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/README_430.txt ${PREFIX}/share/doc/vpr
${INSTALL_DATA} ${WRKSRC}/manual_430.pdf ${PREFIX}/share/doc/vpr
${INSTALL_DATA} ${WRKSRC}/manual_430.ps ${PREFIX}/share/doc/vpr
${INSTALL_DATA_DIR} ${PREFIX}/share/vpr
${INSTALL_DATA} ${WRKSRC}/t-vpack/*.blif ${PREFIX}/share/vpr
${INSTALL_DATA} ${WRKSRC}/vpr/*.arch ${PREFIX}/share/vpr
${INSTALL_DATA} ${WRKSRC}/vpr/*.net ${PREFIX}/share/vpr
.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

9
vpr/PLIST
View file

@ -1,7 +1,14 @@
@comment $NetBSD: PLIST,v 1.1.1.1 2006/12/03 00:38:43 dhowland Exp $
@comment $NetBSD: PLIST,v 1.2 2006/12/03 05:36:17 dhowland Exp $
bin/t-vpack
bin/vpr
share/doc/vpr/README_430.txt
share/doc/vpr/manual_430.pdf
share/doc/vpr/manual_430.ps
share/vpr/4lut_sanitized.arch
share/vpr/4x4lut_sanitized.arch
share/vpr/e64-4lut.net
share/vpr/e64-4x4lut.net
share/vpr/e64.blif
share/vpr/s1423.blif
@dirrm share/vpr
@dirrm share/doc/vpr

4
vpr/distinfo
View file

@ -1,10 +1,10 @@
$NetBSD: distinfo,v 1.1.1.1 2006/12/03 00:38:43 dhowland Exp $
$NetBSD: distinfo,v 1.2 2006/12/03 05:36:17 dhowland Exp $
SHA1 (vpr_430_tar.gz) = 016af8e213d2b1202d8a0764fcb7561440ba305b
RMD160 (vpr_430_tar.gz) = 6a9195ecc318133545f688fc3c6779abed4ccf91
Size (vpr_430_tar.gz) = 786596 bytes
SHA1 (patch-aa) = 77d55cf3aa8fd08795febb0d3b73449f3c303ecb
SHA1 (patch-ab) = f4319f2a51af6c93bd054c5f43f6866a29d06f67
SHA1 (patch-ab) = 7574d286629dab1fa1c6f3b1d9b7d20b62ba0c18
SHA1 (patch-ac) = f752af9402228623d20c9dd9650870471e6b6be0
SHA1 (patch-ad) = a09bbff58fd992ae23cb6558368aec2ee7747088
SHA1 (patch-ae) = 040ce11fe059dc95205b234d59df4eba6c2163bb

22
vpr/patches/patch-ab
View file

@ -1,7 +1,27 @@
$NetBSD: patch-ab,v 1.1.1.1 2006/12/03 00:38:43 dhowland Exp $
$NetBSD: patch-ab,v 1.2 2006/12/03 05:36:17 dhowland Exp $
--- vpr/makefile.orig 2000-03-26 14:34:20.000000000 -0500
+++ vpr/makefile
@@ -19,16 +19,16 @@ CC = gcc
# On many non-Solaris machines, use LIB_DIR = -L/usr/lib/X11R5
-LIB_DIR = -L/usr/openwin/lib
+#LIB_DIR = -L/usr/openwin/lib
# Sometimes get errors under Solaris if you don't use the -R option
# to (I think) put info about where the shared object libraries are
# right into the binary. Shouldn't be necessary, but it is on our machines.
-LIB = -lX11 -lm -R/usr/openwin/lib
+LIB = -lX11 -lm @X11_LDFLAGS@
-X11_INCLUDE = -I/usr/openwin/include
+#X11_INCLUDE = -I/usr/openwin/include
# Overly strict flags line below. Lots of useless warnings, but can
# let you look for redudant declarations.
@@ -73,7 +73,7 @@ H = util.h vpr_types.h globals.h graphic
# Add purify before $(CC) in the link line below to run purify on VPR.